From 383654f1f5e1eecb3a40ddbe60a5af31158cf41d Mon Sep 17 00:00:00 2001
From: coffeepots <coffeepotsgh@gmail.com>
Date: Tue, 5 Jun 2018 13:29:33 +0100
Subject: [PATCH] `wrapReply` now returns string, includes terminator

---
 eth-rpc/server/asyncutils.nim | 11 +++++------
 eth-rpc/server/server.nim     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/eth-rpc/server/asyncutils.nim b/eth-rpc/server/asyncutils.nim
index 49382ea..d8e5827 100644
--- a/eth-rpc/server/asyncutils.nim
+++ b/eth-rpc/server/asyncutils.nim
@@ -1,15 +1,14 @@
 import json, asyncdispatch, asyncnet, jsonutils, private / debugutils
 
-proc wrapReply*(id: JsonNode, value: JsonNode, error: JsonNode): JsonNode =
-  return %{"jsonrpc": %"2.0", "result": value, "error": error, "id": id}
+proc wrapReply*(id: JsonNode, value: JsonNode, error: JsonNode): string =
+  let node = %{"jsonrpc": %"2.0", "result": value, "error": error, "id": id}
+  return $node & "\c\l" 
 
 proc sendError*(client: AsyncSocket, code: int, msg: string, id: JsonNode, data: JsonNode = newJNull()) {.async.} =
   ## Send error message to client
   let error = %{"code": %(code), "message": %msg, "data": data}
-  ifDebug: echo "Send error json: ", wrapReply(newJNull(), error, id).pretty, "\c\l"
-  # REVIEW: prefer in-place appending instead of string concatenation
-  # (see the similar comment in clientdispatch.nim)
-  result = client.send($wrapReply(id, newJNull(), error) & "\c\l")
+  ifDebug: echo "Send error json: ", wrapReply(newJNull(), error, id)
+  result = client.send(wrapReply(id, newJNull(), error))
 
 proc sendJsonError*(state: RpcJsonError, client: AsyncSocket, id: JsonNode, data = newJNull()) {.async.} =
   ## Send client response for invalid json state
diff --git a/eth-rpc/server/server.nim b/eth-rpc/server/server.nim
index 75d16c7..3522874 100644
--- a/eth-rpc/server/server.nim
+++ b/eth-rpc/server/server.nim
@@ -21,7 +21,7 @@ proc processMessage(server: RpcServer, client: AsyncSocket, line: string) {.asyn
       await client.sendError(METHOD_NOT_FOUND, "Method not found", id, %(methodName & " is not a registered method."))
     else:
       let callRes = await server.procs[methodName](node["params"])
-      await client.send($wrapReply(id, callRes, newJNull()) & "\c\l")
+      await client.send(wrapReply(id, callRes, newJNull()))
 
 proc processClient(server: RpcServer, client: AsyncSocket) {.async.} =
   while true: