From ddbc57bc88afc1bcbb9919af4d9a613f8273acd7 Mon Sep 17 00:00:00 2001
From: Lorenzo Delgado <lorenzo@status.im>
Date: Wed, 7 Sep 2022 00:18:56 +0200
Subject: [PATCH] refactor(wakunode): remove waku message export from wakunode

---
 examples/v2/matterbridge/chat2bridge.nim | 1 +
 tests/v2/test_jsonrpc_waku.nim           | 1 +
 tests/v2/test_rest_relay_api.nim         | 1 +
 tests/v2/test_waku_discv5.nim            | 1 +
 tests/v2/test_waku_rln_relay.nim         | 1 +
 tests/v2/test_wakunode_lightpush.nim     | 1 +
 waku/common/wakubridge.nim               | 1 +
 waku/v2/node/jsonrpc/relay_api.nim       | 1 +
 waku/v2/node/wakunode2.nim               | 1 -
 waku/v2/node/wakunode2_setup_rpc.nim     | 1 +
 10 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/v2/matterbridge/chat2bridge.nim b/examples/v2/matterbridge/chat2bridge.nim
index d174ea5b1..ca21756da 100644
--- a/examples/v2/matterbridge/chat2bridge.nim
+++ b/examples/v2/matterbridge/chat2bridge.nim
@@ -11,6 +11,7 @@ import
   # Waku v2 imports
   libp2p/crypto/crypto,
   libp2p/errors,
+  ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/node/wakunode2,
   # Chat 2 imports
   ../chat2,
diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim
index 0273ccabb..b8806c5e6 100644
--- a/tests/v2/test_jsonrpc_waku.nim
+++ b/tests/v2/test_jsonrpc_waku.nim
@@ -20,6 +20,7 @@ import
                               filter_api,
                               admin_api,
                               private_api],
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_relay,
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/protocol/waku_swap/waku_swap,
diff --git a/tests/v2/test_rest_relay_api.nim b/tests/v2/test_rest_relay_api.nim
index 510054a4b..44028a639 100644
--- a/tests/v2/test_rest_relay_api.nim
+++ b/tests/v2/test_rest_relay_api.nim
@@ -10,6 +10,7 @@ import
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/pubsub
 import
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/node/wakunode2,
   ../../waku/v2/node/rest/[server, client, base64, utils],
   ../../waku/v2/node/rest/relay/[api_types, relay_api, topic_cache]
diff --git a/tests/v2/test_waku_discv5.nim b/tests/v2/test_waku_discv5.nim
index a05a41a41..83942c18e 100644
--- a/tests/v2/test_waku_discv5.nim
+++ b/tests/v2/test_waku_discv5.nim
@@ -10,6 +10,7 @@ import
   libp2p/crypto/crypto,
   eth/keys,
   eth/p2p/discoveryv5/enr,
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/node/wakunode2,
   ../test_helpers
diff --git a/tests/v2/test_waku_rln_relay.nim b/tests/v2/test_waku_rln_relay.nim
index f3783fc59..1c1b618d1 100644
--- a/tests/v2/test_waku_rln_relay.nim
+++ b/tests/v2/test_waku_rln_relay.nim
@@ -7,6 +7,7 @@ import
   stew/byteutils, stew/shims/net as stewNet,
   libp2p/crypto/crypto,
   json,
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_rln_relay/[rln, waku_rln_relay_utils,
       waku_rln_relay_types],
   ../../waku/v2/node/wakunode2,
diff --git a/tests/v2/test_wakunode_lightpush.nim b/tests/v2/test_wakunode_lightpush.nim
index e8fb459ea..f977c70b9 100644
--- a/tests/v2/test_wakunode_lightpush.nim
+++ b/tests/v2/test_wakunode_lightpush.nim
@@ -8,6 +8,7 @@ import
   chronos, 
   libp2p/crypto/crypto,
   libp2p/switch,
+  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_lightpush,
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/utils/peers,
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index e21d19c00..83b6acb8c 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -18,6 +18,7 @@ import
   libp2p/nameresolving/nameresolver,
   ../v2/utils/namespacing,
   ../v2/utils/time,
+  ../v2/protocol/waku_message,
   ../v2/node/wakunode2,
   # Common cli config
   ./config_bridge
diff --git a/waku/v2/node/jsonrpc/relay_api.nim b/waku/v2/node/jsonrpc/relay_api.nim
index b75b7021b..047e2dc83 100644
--- a/waku/v2/node/jsonrpc/relay_api.nim
+++ b/waku/v2/node/jsonrpc/relay_api.nim
@@ -5,6 +5,7 @@ import
   chronicles,
   json_rpc/rpcserver,
   libp2p/protocols/pubsub/pubsub,
+  ../../protocol/waku_message,
   ../wakunode2,
   ./jsonrpc_types,
   ./jsonrpc_utils
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index c66af4fec..3ba1e3abc 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -31,7 +31,6 @@ import
   ./wakunode2_types
 
 export
-  waku_message,
   waku_rln_relay_types,
   wakunode2_types
 
diff --git a/waku/v2/node/wakunode2_setup_rpc.nim b/waku/v2/node/wakunode2_setup_rpc.nim
index 352879667..58789c1aa 100644
--- a/waku/v2/node/wakunode2_setup_rpc.nim
+++ b/waku/v2/node/wakunode2_setup_rpc.nim
@@ -7,6 +7,7 @@ import
   json_rpc/rpcserver
 import
   ./config,
+  ../protocol/waku_message,
   ./wakunode2,
   ./jsonrpc/[admin_api,
              debug_api,