Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename jrpc_sys module back to jsonmarshal #182

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Rename jrpc_sys module back to jsonmarshal #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions json_rpc/client.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import
std/[json, tables, macros],
chronos,
results,
./private/jrpc_conv,
./jsonmarshal,
./private/jrpc_sys,
./private/client_handler_wrapper,
./private/shared_wrapper,
Expand All @@ -22,7 +22,7 @@ from strutils import replace
export
chronos,
tables,
jrpc_conv,
jsonmarshal,
RequestParamsTx,
results

Expand Down
0 json_rpc/private/jrpc_conv.nim → json_rpc/jsonmarshal.nim
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion json_rpc/private/client_handler_wrapper.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

import
macros,
./shared_wrapper
./shared_wrapper,
./jrpc_sys

{.push gcsafe, raises: [].}

Expand Down
8 changes: 4 additions & 4 deletions json_rpc/private/server_handler_wrapper.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import
json_serialization,
json_serialization/std/[options],
./errors,
./jrpc_sys,
./jrpc_conv,
./shared_wrapper
./jrpc_sys,
./shared_wrapper,
../jsonmarshal

export
jrpc_conv
jsonmarshal

{.push gcsafe, raises: [].}

Expand Down
2 changes: 1 addition & 1 deletion json_rpc/private/shared_wrapper.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import
std/[json, macros],
./jrpc_sys,
./jrpc_conv
../jsonmarshal

iterator paramsIter*(params: NimNode): tuple[name, ntype: NimNode] =
## Forward iterator of handler parameters
Expand Down
5 changes: 3 additions & 2 deletions json_rpc/router.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ import
chronos,
./private/server_handler_wrapper,
./private/errors,
./private/jrpc_sys
./private/jrpc_sys,
./jsonmarshal

export
chronos,
jrpc_conv,
jsonmarshal,
json

type
Expand Down
4 changes: 2 additions & 2 deletions json_rpc/server.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import
std/json,
chronos,
./router,
./private/jrpc_conv,
./jsonmarshal,
./private/jrpc_sys,
./private/shared_wrapper,
./private/errors

export
chronos,
jrpc_conv,
jsonmarshal,
router

type
Expand Down
2 changes: 1 addition & 1 deletion tests/private/ethhexstrings.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ template hexQuantityStr*(value: string): HexQuantityStr = value.HexQuantityStr
# Converters

import json
import ../../json_rpc/private/jrpc_conv
import ../../json_rpc/jsonmarshal

proc `%`*(value: HexDataStr): JsonNode {.gcsafe, raises: [JsonRpcError].} =
if not value.validate:
Expand Down
2 changes: 1 addition & 1 deletion tests/private/stintjson.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import
std/json,
stint,
../../json_rpc/private/jrpc_conv
../../json_rpc/jsonmarshal

{.push gcsafe, raises: [].}

Expand Down