Merge pull request #60 from status-im/fixes

Fixes

json_rpc/client.nim

@@ -62,7 +62,7 @@ proc processMessage*(self: RpcClient, line: string) =
 
     if not self.awaiting.hasKey(id):
       raise newException(ValueError,
-        "Cannot find message id \"" & node["id"].str & "\"")
+        "Cannot find message id \"" & $node["id"].getInt & "\"")
 
     let version = checkGet(node, "jsonrpc", JString)
     if version != "2.0":

json_rpc/clients/socketclient.nim

@@ -21,14 +21,16 @@ method call*(self: RpcSocketClient, name: string,
   if self.transport.isNil:
     raise newException(ValueError,
                     "Transport is not initialised (missing a call to connect?)")
-  let res = await self.transport.write(value)
-  # TODO: Add actions when not full packet was send, e.g. disconnect peer.
-  doAssert(res == len(value))
 
   # completed by processMessage.
   var newFut = newFuture[Response]()
   # add to awaiting responses
   self.awaiting[id] = newFut
+
+  let res = await self.transport.write(value)
+  # TODO: Add actions when not full packet was send, e.g. disconnect peer.
+  doAssert(res == len(value))    
+
   result = await newFut
 
 proc processData(client: RpcSocketClient) {.async.} =

json_rpc/clients/websocketclient.nim

@@ -23,12 +23,13 @@ method call*(self: RpcWebSocketClient, name: string,
     raise newException(ValueError,
                     "Transport is not initialised (missing a call to connect?)")
   # echo "Sent msg: ", value
-  await self.transport.send(value)
 
   # completed by processMessage.
   var newFut = newFuture[Response]()
   # add to awaiting responses
   self.awaiting[id] = newFut
+
+  await self.transport.send(value)
   result = await newFut
 
 proc processData(client: RpcWebSocketClient) {.async.} =