diff --git a/json_rpc/client.nim b/json_rpc/client.nim index f432306..3df1e10 100644 --- a/json_rpc/client.nim +++ b/json_rpc/client.nim @@ -15,7 +15,7 @@ import ./private/jrpc_sys, ./private/client_handler_wrapper, ./private/shared_wrapper, - ./private/errors + ./errors from strutils import replace diff --git a/json_rpc/clients/httpclient.nim b/json_rpc/clients/httpclient.nim index 1d136c1..0ea37bf 100644 --- a/json_rpc/clients/httpclient.nim +++ b/json_rpc/clients/httpclient.nim @@ -14,7 +14,7 @@ import chronos/apps/http/httpclient as chronosHttpClient, chronicles, httputils, json_serialization/std/net, ../client, - ../private/errors, + ../errors, ../private/jrpc_sys export diff --git a/json_rpc/clients/socketclient.nim b/json_rpc/clients/socketclient.nim index 6d2c34a..f765062 100644 --- a/json_rpc/clients/socketclient.nim +++ b/json_rpc/clients/socketclient.nim @@ -13,7 +13,7 @@ import results, chronos, ../client, - ../private/errors, + ../errors, ../private/jrpc_sys export client diff --git a/json_rpc/clients/websocketclientimpl.nim b/json_rpc/clients/websocketclientimpl.nim index 67c7598..16d0073 100644 --- a/json_rpc/clients/websocketclientimpl.nim +++ b/json_rpc/clients/websocketclientimpl.nim @@ -12,7 +12,7 @@ import pkg/websock/[websock, extensions/compression/deflate], pkg/[chronos, chronos/apps/http/httptable, chronicles], stew/byteutils, - ../private/errors + ../errors # avoid clash between Json.encode and Base64Pad.encode import ../client except encode diff --git a/json_rpc/private/errors.nim b/json_rpc/errors.nim similarity index 100% rename from json_rpc/private/errors.nim rename to json_rpc/errors.nim diff --git a/json_rpc/private/server_handler_wrapper.nim b/json_rpc/private/server_handler_wrapper.nim index 8a773d2..f73a77a 100644 --- a/json_rpc/private/server_handler_wrapper.nim +++ b/json_rpc/private/server_handler_wrapper.nim @@ -12,8 +12,8 @@ import stew/[byteutils, objects], json_serialization, json_serialization/std/[options], - ./errors, - ./jrpc_sys, + ../errors, + ./jrpc_sys, ./shared_wrapper, ../jsonmarshal diff --git a/json_rpc/router.nim b/json_rpc/router.nim index 071d552..6b44ffe 100644 --- a/json_rpc/router.nim +++ b/json_rpc/router.nim @@ -12,7 +12,7 @@ import chronicles, chronos, ./private/server_handler_wrapper, - ./private/errors, + ./errors, ./private/jrpc_sys, ./jsonmarshal diff --git a/json_rpc/server.nim b/json_rpc/server.nim index 8c0b5ed..501264f 100644 --- a/json_rpc/server.nim +++ b/json_rpc/server.nim @@ -14,7 +14,7 @@ import ./jsonmarshal, ./private/jrpc_sys, ./private/shared_wrapper, - ./private/errors + ./errors export chronos, diff --git a/json_rpc/servers/httpserver.nim b/json_rpc/servers/httpserver.nim index 1c4fe57..6cf3cc6 100644 --- a/json_rpc/servers/httpserver.nim +++ b/json_rpc/servers/httpserver.nim @@ -11,7 +11,7 @@ import stew/byteutils, chronicles, httputils, chronos, chronos/apps/http/[httpserver, shttpserver], - ../private/errors, + ../errors, ../server export diff --git a/json_rpc/servers/socketserver.nim b/json_rpc/servers/socketserver.nim index 2c4aaf4..dfb9df9 100644 --- a/json_rpc/servers/socketserver.nim +++ b/json_rpc/servers/socketserver.nim @@ -10,7 +10,7 @@ import chronicles, json_serialization/std/net, - ../private/errors, + ../errors, ../server export errors, server diff --git a/tests/private/ethhexstrings.nim b/tests/private/ethhexstrings.nim index ccad4a0..14a3e8c 100644 --- a/tests/private/ethhexstrings.nim +++ b/tests/private/ethhexstrings.nim @@ -1,5 +1,5 @@ import - ../../json_rpc/private/errors + ../../json_rpc/errors type HexQuantityStr* = distinct string