From 3e507af8cc2bc0b0f064fb1703363d091ab2f937 Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Wed, 2 Feb 2022 17:00:12 +0100
Subject: [PATCH] Move JSON RPC related modules into providers/jsonrpc

---
 ethers/providers/jsonrpc.nim                          |  4 ++--
 ethers/providers/{ => jsonrpc}/conversions.nim        |  8 ++++----
 ethers/providers/jsonrpc/rpccalls.nim                 | 11 +++++++++++
 ethers/providers/{rpccalls => jsonrpc}/signatures.nim |  0
 ethers/providers/rpccalls.nim                         | 11 -----------
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename ethers/providers/{ => jsonrpc}/conversions.nim (95%)
 create mode 100644 ethers/providers/jsonrpc/rpccalls.nim
 rename ethers/providers/{rpccalls => jsonrpc}/signatures.nim (100%)
 delete mode 100644 ethers/providers/rpccalls.nim

diff --git a/ethers/providers/jsonrpc.nim b/ethers/providers/jsonrpc.nim
index 45169a3..8326b31 100644
--- a/ethers/providers/jsonrpc.nim
+++ b/ethers/providers/jsonrpc.nim
@@ -5,8 +5,8 @@ import pkg/json_rpc/rpcclient
 import ../basics
 import ../provider
 import ../signer
-import ./rpccalls
-import ./conversions
+import ./jsonrpc/rpccalls
+import ./jsonrpc/conversions
 
 export basics
 export provider
diff --git a/ethers/providers/conversions.nim b/ethers/providers/jsonrpc/conversions.nim
similarity index 95%
rename from ethers/providers/conversions.nim
rename to ethers/providers/jsonrpc/conversions.nim
index 1acd190..6e90886 100644
--- a/ethers/providers/conversions.nim
+++ b/ethers/providers/jsonrpc/conversions.nim
@@ -1,10 +1,10 @@
 import std/json
 import pkg/json_rpc/jsonmarshal
 import pkg/stew/byteutils
-import ../basics
-import ../transaction
-import ../blocktag
-import ../provider
+import ../../basics
+import ../../transaction
+import ../../blocktag
+import ../../provider
 
 export jsonmarshal
 
diff --git a/ethers/providers/jsonrpc/rpccalls.nim b/ethers/providers/jsonrpc/rpccalls.nim
new file mode 100644
index 0000000..9235591
--- /dev/null
+++ b/ethers/providers/jsonrpc/rpccalls.nim
@@ -0,0 +1,11 @@
+import std/os
+import pkg/json_rpc/rpcclient
+import ../../basics
+import ../../transaction
+import ../../blocktag
+import ../../provider
+import ./conversions
+
+const file = currentSourcePath.parentDir / "signatures.nim"
+
+createRpcSigs(RpcClient, file)
diff --git a/ethers/providers/rpccalls/signatures.nim b/ethers/providers/jsonrpc/signatures.nim
similarity index 100%
rename from ethers/providers/rpccalls/signatures.nim
rename to ethers/providers/jsonrpc/signatures.nim
diff --git a/ethers/providers/rpccalls.nim b/ethers/providers/rpccalls.nim
deleted file mode 100644
index c2b4c0f..0000000
--- a/ethers/providers/rpccalls.nim
+++ /dev/null
@@ -1,11 +0,0 @@
-import std/os
-import pkg/json_rpc/rpcclient
-import ../basics
-import ../transaction
-import ../blocktag
-import ../provider
-import ./conversions
-
-const file = currentSourcePath.parentDir / "rpccalls" / "signatures.nim"
-
-createRpcSigs(RpcClient, file)