From 842cfb3476e8867ef44854e5198922388b2161f3 Mon Sep 17 00:00:00 2001
From: Lorenzo Delgado <lorenzo@status.im>
Date: Fri, 5 Aug 2022 16:38:00 +0200
Subject: [PATCH] refactor(waku-filter): remove wakunode2 waku_filter exports

---
 examples/v2/chat2.nim               | 3 ++-
 tests/v2/test_peer_manager.nim      | 2 ++
 waku/v2/node/jsonrpc/admin_api.nim  | 2 ++
 waku/v2/node/jsonrpc/filter_api.nim | 5 ++++-
 waku/v2/node/wakunode2.nim          | 1 -
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/v2/chat2.nim b/examples/v2/chat2.nim
index c4409af5e..8ab369d9c 100644
--- a/examples/v2/chat2.nim
+++ b/examples/v2/chat2.nim
@@ -23,10 +23,11 @@ import libp2p/[switch,                   # manage transports, a single entry poi
                muxers/muxer]             # define an interface for stream multiplexing, allowing peers to offer many protocols over a single connection
 import   ../../waku/v2/protocol/waku_message,
          ../../waku/v2/protocol/waku_lightpush,
+         ../../waku/v2/protocol/waku_filter, 
          ../../waku/v2/protocol/waku_store,
          ../../waku/v2/node/[wakunode2, waku_payload],
          ../../waku/v2/node/dnsdisc/waku_dnsdisc,
-         ../../waku/v2/utils/[peers,time],
+         ../../waku/v2/utils/[peers, time],
          ../../waku/common/utils/nat,
          ./config_chat2
 
diff --git a/tests/v2/test_peer_manager.nim b/tests/v2/test_peer_manager.nim
index b45974764..f0c6ef4cf 100644
--- a/tests/v2/test_peer_manager.nim
+++ b/tests/v2/test_peer_manager.nim
@@ -13,7 +13,9 @@ import
   libp2p/protocols/pubsub/pubsub,
   libp2p/protocols/pubsub/rpc/message
 import
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/storage/peer/waku_peer_storage,
   ../../waku/v2/node/wakunode2,
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index 25b56cff2..d61a6cf32 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -6,7 +6,9 @@ import
   json_rpc/rpcserver,
   libp2p/[peerinfo, switch]
 import
+  ../../protocol/waku_message,
   ../../protocol/waku_store,
+  ../../protocol/waku_filter,
   ../peer_manager/peer_manager,
   ../wakunode2,
   ./jsonrpc_types
diff --git a/waku/v2/node/jsonrpc/filter_api.nim b/waku/v2/node/jsonrpc/filter_api.nim
index 9d0ba174c..526aea59a 100644
--- a/waku/v2/node/jsonrpc/filter_api.nim
+++ b/waku/v2/node/jsonrpc/filter_api.nim
@@ -3,7 +3,10 @@
 import
   std/[tables,sequtils],
   chronicles,
-  json_rpc/rpcserver,
+  json_rpc/rpcserver
+import
+  ../../protocol/waku_message,
+  ../../protocol/waku_filter,
   ../wakunode2,
   ./jsonrpc_types
 
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 57737f96c..72cc79369 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -33,7 +33,6 @@ export
   builders,
   waku_relay, waku_message,
   waku_swap,
-  waku_filter,
   waku_rln_relay_types,
   wakunode2_types