From c113c59a43e089366903f3f10e8c14fcd3c58adc Mon Sep 17 00:00:00 2001
From: Lorenzo Delgado <lorenzo@status.im>
Date: Wed, 16 Nov 2022 20:02:38 +0100
Subject: [PATCH] refactor(protocols): decouple protocol rpc types from api
 types

---
 apps/chat2/chat2.nim                    | 2 +-
 tests/v2/test_jsonrpc_waku.nim          | 1 +
 tests/v2/test_waku_peer_exchange.nim    | 2 ++
 tools/simulation/quicksim2.nim          | 2 +-
 waku/v2/node/jsonrpc/filter_api.nim     | 1 +
 waku/v2/protocol/waku_filter.nim        | 4 ----
 waku/v2/protocol/waku_lightpush.nim     | 8 ++------
 waku/v2/protocol/waku_peer_exchange.nim | 5 +----
 8 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 6acb72f1d..8fee78ae4 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -24,7 +24,7 @@ import libp2p/[switch,                   # manage transports, a single entry poi
                nameresolving/dnsresolver]# define DNS resolution
 import   
   ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/protocol/waku_lightpush/rpc,
   ../../waku/v2/protocol/waku_filter, 
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/node/[waku_node, waku_payload, waku_metrics],
diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim
index 17a7377ea..ef9a27dbd 100644
--- a/tests/v2/test_jsonrpc_waku.nim
+++ b/tests/v2/test_jsonrpc_waku.nim
@@ -28,6 +28,7 @@ import
   ../../waku/v2/protocol/waku_store/rpc,
   ../../waku/v2/protocol/waku_swap/waku_swap,
   ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/protocol/waku_filter/rpc,
   ../../waku/v2/protocol/waku_filter/client,
   ../../waku/v2/utils/peers,
   ../../waku/v2/utils/time,
diff --git a/tests/v2/test_waku_peer_exchange.nim b/tests/v2/test_waku_peer_exchange.nim
index eaa9f9412..d32ccb60a 100644
--- a/tests/v2/test_waku_peer_exchange.nim
+++ b/tests/v2/test_waku_peer_exchange.nim
@@ -15,6 +15,8 @@ import
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
+  ../../waku/v2/protocol/waku_peer_exchange/rpc,
+  ../../waku/v2/protocol/waku_peer_exchange/rpc_codec,
   ../test_helpers,
   ./utils
 
diff --git a/tools/simulation/quicksim2.nim b/tools/simulation/quicksim2.nim
index 7cc50b28a..ac86bbc9c 100644
--- a/tools/simulation/quicksim2.nim
+++ b/tools/simulation/quicksim2.nim
@@ -6,7 +6,7 @@ import
   json_rpc/[rpcclient, rpcserver],
   libp2p/protobuf/minprotobuf
 import
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/protocol/waku_filter/rpc,
   ../../waku/v2/protocol/waku_store/rpc,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/utils/time,
diff --git a/waku/v2/node/jsonrpc/filter_api.nim b/waku/v2/node/jsonrpc/filter_api.nim
index a46b92372..bc8429bf0 100644
--- a/waku/v2/node/jsonrpc/filter_api.nim
+++ b/waku/v2/node/jsonrpc/filter_api.nim
@@ -10,6 +10,7 @@ import
 import
   ../../protocol/waku_message,
   ../../protocol/waku_filter,
+  ../../protocol/waku_filter/rpc,
   ../../protocol/waku_filter/client,
   ../waku_node,
   ./jsonrpc_types
diff --git a/waku/v2/protocol/waku_filter.nim b/waku/v2/protocol/waku_filter.nim
index d59a63aa6..0d714e081 100644
--- a/waku/v2/protocol/waku_filter.nim
+++ b/waku/v2/protocol/waku_filter.nim
@@ -4,11 +4,7 @@ else:
   {.push raises: [].}
 
 import
-  ./waku_filter/rpc,
-  ./waku_filter/rpc_codec,
   ./waku_filter/protocol
 
 export
-  rpc,
-  rpc_codec,
   protocol
diff --git a/waku/v2/protocol/waku_lightpush.nim b/waku/v2/protocol/waku_lightpush.nim
index 100b45cf3..3cd68a015 100644
--- a/waku/v2/protocol/waku_lightpush.nim
+++ b/waku/v2/protocol/waku_lightpush.nim
@@ -1,9 +1,5 @@
 import
-  ./waku_lightpush/protocol,
-  ./waku_lightpush/rpc,
-  ./waku_lightpush/rpc_codec
+  ./waku_lightpush/protocol
 
 export
-  protocol,
-  rpc,
-  rpc_codec
\ No newline at end of file
+  protocol
\ No newline at end of file
diff --git a/waku/v2/protocol/waku_peer_exchange.nim b/waku/v2/protocol/waku_peer_exchange.nim
index d11ff7ca4..b0ac4576d 100644
--- a/waku/v2/protocol/waku_peer_exchange.nim
+++ b/waku/v2/protocol/waku_peer_exchange.nim
@@ -4,10 +4,7 @@ else:
   {.push raises: [].}
 
 import
-  ./waku_peer_exchange/rpc,
-  ./waku_peer_exchange/rpc_codec,
   ./waku_peer_exchange/protocol
+
 export
-  rpc,
-  rpc_codec,
   protocol