Merge pull request #61 from valesi/0.8.5-rpc-fix

Update RPC client for JSON rework and add missing arg in json_request_text

electrumx_rpc.py

@@ -25,7 +25,10 @@ class RPCClient(JSONRPC):
     async def send_and_wait(self, method, params, timeout=None):
         # Raise incoming buffer size - presumably connection is trusted
         self.max_buffer_size = 5000000
-        self.send_json_request(method, id_=method, params=params)
+        self.send_text(self.json_request_text(method,
+                                              id_=method,
+                                              params=params),
+                                              False)
 
         future = asyncio.ensure_future(self.messages.get())
         for f in asyncio.as_completed([future], timeout=timeout):

lib/jsonrpc.py

@@ -237,7 +237,7 @@ class JSONRPC(asyncio.Protocol, LoggedClass):
 
     def json_request_text(self, method, id_, params=None):
         '''Return the text of a JSON request.'''
-        return self.encode_payload(json_request_payload(method, params))
+        return self.encode_payload(json_request_payload(method, id_, params))
 
     def json_response_text(self, result, id_):
         '''Return the text of a JSON response.'''