status-im
/
nim-json-rpc
mirror of https://github.com/status-im/nim-json-rpc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix gcsafe error in debug, use getOrDefault instead of {}

This commit is contained in:
coffeepots 2018-07-12 09:23:38 +01:00
parent 49085bbd28
commit 3da2738e27
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
json_rpc/router.nim
View File

@ -159,8 +159,8 @@ proc tryRoute*(router: RpcRouter, data: JsonNode, fut: var Future[JsonNode]): bo
## Route to RPC, returns false if the method or params cannot be found.
## Expects json input and returns json output.
let
jPath = data{methodField}
jParams = data{paramsField}
jPath = data.getOrDefault(methodField)
jParams = data.getOrDefault(paramsField)
if jPath.isEmpty or jParams.isEmpty:
return false
@ -232,20 +232,20 @@ macro rpc*(server: RpcRouter, path: string, body: untyped): untyped =
if returnType == ident"JsonNode":
# `JsonNode` results don't need conversion
result.add( quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async, gcsafe.} =
trap(`pathStr`):
`res` = `doMain`(`paramsIdent`)
)
else:
result.add(quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async, gcsafe.} =
trap(`pathStr`):
`res` = %`doMain`(`paramsIdent`)
)
else:
# no return types, inline contents
result.add(quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async, gcsafe.} =
`setup`
trap(`pathStr`):
`procBody`