logos-storage/nim-json-rpc
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-json-rpc.git synced 2026-01-10 17:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Efficiency of checkGet improved

Browse Source
This commit is contained in:
coffeepots 2018-06-12 16:51:07 +01:00
parent 1212861547
commit 9613fe72a7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eth-rpc/client.nim
View File

@ -41,14 +41,15 @@ macro checkGet(node: JsonNode, fieldName: string,
"Message is missing required field \"" & `fieldName` & "\"")
if `n`.kind != `jKind`.JsonNodeKind:
raise newException(ValueError,
"Expected " & $(`jKind`.JsonNodeKind) & ", got " & $`node`[`fieldName`].kind)
"Expected " & $(`jKind`.JsonNodeKind) & ", got " & $`n`.kind)
case jKind
of JBool: result.add(quote do: `node`[`fieldName`].getBool)
of JInt: result.add(quote do: `node`[`fieldName`].getInt)
of JString: result.add(quote do: `node`[`fieldName`].getStr)
of JFloat: result.add(quote do: `node`[`fieldName`].getFloat)
of JObject: result.add(quote do: `node`[`fieldName`].getObject)
of JBool: result.add(quote do: `n`.getBool)
of JInt: result.add(quote do: `n`.getInt)
of JString: result.add(quote do: `n`.getStr)
of JFloat: result.add(quote do: `n`.getFloat)
of JObject: result.add(quote do: `n`.getObject)
else: discard
echo "!!!", result.repr
proc processMessage(self: RpcClient, line: string) =
let node = parseJson(line)
@ -63,7 +64,7 @@ proc processMessage(self: RpcClient, line: string) =
if not self.awaiting.hasKey(id):
raise newException(ValueError,
"Cannot find message id \"" & node["id"].str & "\"")
let errorNode = node{"error"}
if errorNode.isNil or errorNode.kind == JNull:
var res = node{"result"}