From e2dc11912cd249d45784f3f1f249a037dd76b8fb Mon Sep 17 00:00:00 2001 From: Lorenzo Delgado Date: Wed, 19 Apr 2023 13:29:23 +0200 Subject: [PATCH] chore(core): rename waku_message module to waku_core --- apps/chat2/chat2.nim | 4 ++-- apps/chat2/config_chat2.nim | 2 +- apps/chat2bridge/chat2bridge.nim | 2 +- apps/wakubridge/message_compat.nim | 2 +- apps/wakubridge/wakubridge.nim | 6 +++--- apps/wakunode2/wakunode2.nim | 2 +- examples/v2/publisher.nim | 2 +- examples/v2/subscriber.nim | 2 +- tests/all_tests_v2.nim | 6 +++--- tests/v2/test_message_cache.nim | 2 +- tests/v2/test_utils_compat.nim | 2 +- tests/v2/test_waku_discv5.nim | 2 +- tests/v2/test_waku_enr.nim | 2 +- tests/v2/test_waku_filter.nim | 2 +- tests/v2/test_waku_lightpush.nim | 2 +- tests/v2/test_waku_noise.nim | 2 +- tests/v2/test_waku_noise_sessions.nim | 2 +- tests/v2/test_wakunode.nim | 2 +- tests/v2/test_wakunode_filter.nim | 2 +- tests/v2/test_wakunode_lightpush.nim | 2 +- tests/v2/testlib/wakucore.nim | 6 +++--- tests/v2/waku_archive/test_driver_queue.nim | 2 +- tests/v2/waku_archive/test_driver_queue_index.nim | 2 +- .../v2/waku_archive/test_driver_queue_pagination.nim | 2 +- tests/v2/waku_archive/test_driver_queue_query.nim | 2 +- tests/v2/waku_archive/test_driver_sqlite.nim | 2 +- tests/v2/waku_archive/test_driver_sqlite_query.nim | 2 +- tests/v2/waku_archive/test_retention_policy.nim | 2 +- tests/v2/waku_archive/test_waku_archive.nim | 2 +- .../test_message_digest.nim} | 6 ++---- .../test_namespaced_topics.nim} | 2 +- tests/v2/waku_filter_v2/test_waku_filter.nim | 2 +- tests/v2/waku_filter_v2/test_waku_filter_protocol.nim | 2 +- tests/v2/waku_relay/test_waku_relay.nim | 2 +- tests/v2/waku_relay/test_wakunode_relay.nim | 2 +- tests/v2/waku_rln_relay/test_waku_rln_relay.nim | 2 +- tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim | 2 +- tests/v2/waku_store/test_resume.nim | 2 +- tests/v2/waku_store/test_waku_store.nim | 2 +- tests/v2/waku_store/test_wakunode_store.nim | 2 +- tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim | 2 +- tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim | 2 +- tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim | 2 +- tests/v2/wakunode_rest/test_rest_relay.nim | 2 +- tests/v2/wakunode_rest/test_rest_relay_serdes.nim | 2 +- tests/v2/wakunode_rest/test_rest_store.nim | 2 +- tests/wakubridge/test_message_compat.nim | 2 +- tests/wakubridge/test_wakubridge.nim | 2 +- tools/networkmonitor/networkmonitor.nim | 2 +- tools/simulation/quicksim2.nim | 2 +- waku/v2/node/jsonrpc/filter/client.nim | 2 +- waku/v2/node/jsonrpc/filter/handlers.nim | 2 +- waku/v2/node/jsonrpc/message.nim | 2 +- waku/v2/node/jsonrpc/relay/client.nim | 2 +- waku/v2/node/jsonrpc/relay/handlers.nim | 2 +- waku/v2/node/message_cache.nim | 2 +- waku/v2/node/rest/relay/client.nim | 2 +- waku/v2/node/rest/relay/topic_cache.nim | 2 +- waku/v2/node/rest/relay/types.nim | 2 +- waku/v2/node/rest/store/handlers.nim | 2 +- waku/v2/node/rest/store/types.nim | 4 +--- waku/v2/node/waku_node.nim | 2 +- waku/v2/utils/compat.nim | 2 +- waku/v2/utils/noise.nim | 2 +- waku/v2/waku_archive/archive.nim | 2 +- waku/v2/waku_archive/common.nim | 2 +- waku/v2/waku_archive/driver.nim | 2 +- waku/v2/waku_archive/driver/queue_driver/index.nim | 2 +- .../waku_archive/driver/queue_driver/queue_driver.nim | 2 +- waku/v2/waku_archive/driver/sqlite_driver/cursor.nim | 2 +- waku/v2/waku_archive/driver/sqlite_driver/queries.nim | 2 +- .../driver/sqlite_driver/sqlite_driver.nim | 2 +- waku/v2/waku_core.nim | 7 +++++++ waku/v2/waku_core/message.nim | 9 +++++++++ waku/v2/{waku_message => waku_core/message}/codec.nim | 6 +++--- .../v2/{waku_message => waku_core/message}/digest.nim | 2 +- .../{waku_message => waku_core/message}/message.nim | 4 ++-- waku/v2/{waku_message => waku_core}/topics.nim | 0 .../topics/content_topic.nim | 0 .../v2/{waku_message => waku_core}/topics/parsing.nim | 0 .../topics/pubsub_topic.nim | 0 waku/v2/waku_enr/sharding.nim | 2 +- waku/v2/waku_filter/client.nim | 2 +- waku/v2/waku_filter/protocol.nim | 2 +- waku/v2/waku_filter/rpc.nim | 2 +- waku/v2/waku_filter/rpc_codec.nim | 2 +- waku/v2/waku_filter_v2/client.nim | 2 +- waku/v2/waku_filter_v2/protocol.nim | 2 +- waku/v2/waku_filter_v2/rpc.nim | 2 +- waku/v2/waku_filter_v2/rpc_codec.nim | 2 +- waku/v2/waku_filter_v2/subscriptions.nim | 2 +- waku/v2/waku_lightpush/client.nim | 2 +- waku/v2/waku_lightpush/protocol.nim | 2 +- waku/v2/waku_lightpush/rpc.nim | 2 +- waku/v2/waku_lightpush/rpc_codec.nim | 2 +- waku/v2/waku_message.nim | 11 ----------- waku/v2/waku_peer_exchange/protocol.nim | 2 +- waku/v2/waku_relay/protocol.nim | 2 +- waku/v2/waku_relay/validators.nim | 2 +- waku/v2/waku_rln_relay/protocol_types.nim | 4 ++-- waku/v2/waku_rln_relay/rln_relay.nim | 2 +- waku/v2/waku_store/common.nim | 2 +- waku/v2/waku_store/rpc.nim | 2 +- waku/v2/waku_store/rpc_codec.nim | 2 +- 104 files changed, 125 insertions(+), 124 deletions(-) rename tests/v2/{test_waku_message_digest.nim => waku_core/test_message_digest.nim} (97%) rename tests/v2/{test_waku_message_topics.nim => waku_core/test_namespaced_topics.nim} (99%) create mode 100644 waku/v2/waku_core.nim create mode 100644 waku/v2/waku_core/message.nim rename waku/v2/{waku_message => waku_core/message}/codec.nim (96%) rename waku/v2/{waku_message => waku_core/message}/digest.nim (98%) rename waku/v2/{waku_message => waku_core/message}/message.nim (97%) rename waku/v2/{waku_message => waku_core}/topics.nim (100%) rename waku/v2/{waku_message => waku_core}/topics/content_topic.nim (100%) rename waku/v2/{waku_message => waku_core}/topics/parsing.nim (100%) rename waku/v2/{waku_message => waku_core}/topics/pubsub_topic.nim (100%) delete mode 100644 waku/v2/waku_message.nim diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim index 45de2e262..cf6f5ebed 100644 --- a/apps/chat2/chat2.nim +++ b/apps/chat2/chat2.nim @@ -23,7 +23,7 @@ import libp2p/[switch, # manage transports, a single entry poi protocols/secure/secio, # define the protocol of secure input / output, allows encrypted communication that uses public keys to validate signed messages instead of a certificate authority like in TLS nameresolving/dnsresolver]# define DNS resolution import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_lightpush, ../../waku/v2/waku_lightpush/rpc, ../../waku/v2/waku_filter, @@ -72,7 +72,7 @@ type Chat = ref object type PrivateKey* = crypto.PrivateKey - Topic* = waku_message.PubsubTopic + Topic* = waku_core.PubsubTopic ##################### ## chat2 protobufs ## diff --git a/apps/chat2/config_chat2.nim b/apps/chat2/config_chat2.nim index 579ef09c9..269b47962 100644 --- a/apps/chat2/config_chat2.nim +++ b/apps/chat2/config_chat2.nim @@ -7,7 +7,7 @@ import nimcrypto/utils, eth/keys import - ../../../waku/v2/waku_message + ../../../waku/v2/waku_core type Fleet* = enum diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index 8c84b5730..fa82e1803 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -14,7 +14,7 @@ import # Waku v2 imports libp2p/crypto/crypto, libp2p/errors, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_node, ../../../waku/v2/utils/peers, ../../../waku/v2/node/peer_manager, diff --git a/apps/wakubridge/message_compat.nim b/apps/wakubridge/message_compat.nim index a4e63610d..b1c75cb54 100644 --- a/apps/wakubridge/message_compat.nim +++ b/apps/wakubridge/message_compat.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto import ../../waku/v1/protocol/waku_protocol, - ../../waku/v2/waku_message + ../../waku/v2/waku_core const diff --git a/apps/wakubridge/wakubridge.nim b/apps/wakubridge/wakubridge.nim index 38b07437a..597859a6e 100644 --- a/apps/wakubridge/wakubridge.nim +++ b/apps/wakubridge/wakubridge.nim @@ -25,7 +25,7 @@ import libp2p/crypto/crypto, libp2p/nameresolving/nameresolver, ../../waku/v2/utils/time, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_store, ../../waku/v2/waku_filter, ../../waku/v2/node/message_cache, @@ -63,7 +63,7 @@ type WakuBridge* = ref object of RootObj nodev1*: EthereumNode nodev2*: WakuNode - nodev2PubsubTopic: waku_message.PubsubTopic # Pubsub topic to bridge to/from + nodev2PubsubTopic: waku_core.PubsubTopic # Pubsub topic to bridge to/from seen: seq[hashes.Hash] # FIFO queue of seen WakuMessages. Used for deduplication. rng: ref HmacDrbgContext v1Pool: seq[Node] # Pool of v1 nodes for possible connections @@ -204,7 +204,7 @@ proc new*(T: type WakuBridge, nodev2ExtIp = none[ValidIpAddress](), nodev2ExtPort = none[Port](), nameResolver: NameResolver = nil, # Bridge configuration - nodev2PubsubTopic: waku_message.PubsubTopic, + nodev2PubsubTopic: waku_core.PubsubTopic, v1Pool: seq[Node] = @[], targetV1Peers = 0): T {.raises: [Defect,IOError, TLSStreamProtocolError, LPError].} = diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim index 2290053f8..db61141d2 100644 --- a/apps/wakunode2/wakunode2.nim +++ b/apps/wakunode2/wakunode2.nim @@ -28,6 +28,7 @@ import ../../waku/v2/node/peer_manager, ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, ../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations, + ../../waku/v2/waku_core, ../../waku/v2/waku_node, ../../waku/v2/node/waku_metrics, ../../waku/v2/waku_archive, @@ -43,7 +44,6 @@ import ../../waku/v2/waku_enr, ../../waku/v2/waku_dnsdisc, ../../waku/v2/waku_discv5, - ../../waku/v2/waku_message/topics/pubsub_topic, ../../waku/v2/waku_peer_exchange, ../../waku/v2/waku_relay/validators, ../../waku/v2/utils/peers, diff --git a/examples/v2/publisher.nim b/examples/v2/publisher.nim index 0efd6154f..6aa14ce75 100644 --- a/examples/v2/publisher.nim +++ b/examples/v2/publisher.nim @@ -13,7 +13,7 @@ import ../../../waku/common/logging, ../../../waku/v2/node/peer_manager, ../../../waku/v2/waku_node, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_enr, ../../../waku/v2/waku_discv5, ../../../waku/v2/utils/time diff --git a/examples/v2/subscriber.nim b/examples/v2/subscriber.nim index 1662e06a6..2ab802f00 100644 --- a/examples/v2/subscriber.nim +++ b/examples/v2/subscriber.nim @@ -13,7 +13,7 @@ import ../../../waku/common/logging, ../../../waku/v2/node/peer_manager, ../../../waku/v2/waku_node, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_enr, ../../../waku/v2/waku_discv5 diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim index 9ce4b56ab..9ba6aaaae 100644 --- a/tests/all_tests_v2.nim +++ b/tests/all_tests_v2.nim @@ -1,9 +1,9 @@ ## Waku v2 -# Waku message test suite +# Waku core test suite import - ./v2/test_waku_message_topics, - ./v2/test_waku_message_digest + ./v2/waku_core/test_namespaced_topics, + ./v2/waku_core/test_message_digest # Waku archive test suite import diff --git a/tests/v2/test_message_cache.nim b/tests/v2/test_message_cache.nim index 326a8b77f..f18901f75 100644 --- a/tests/v2/test_message_cache.nim +++ b/tests/v2/test_message_cache.nim @@ -5,7 +5,7 @@ import testutils/unittests, chronicles import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/node/message_cache, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_utils_compat.nim b/tests/v2/test_utils_compat.nim index aa69c6eeb..831f02482 100644 --- a/tests/v2/test_utils_compat.nim +++ b/tests/v2/test_utils_compat.nim @@ -3,7 +3,7 @@ import testutils/unittests import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/utils/compat, ../../waku/v2/utils/time, ./testlib/common diff --git a/tests/v2/test_waku_discv5.nim b/tests/v2/test_waku_discv5.nim index 71d020090..9d7c53d3a 100644 --- a/tests/v2/test_waku_discv5.nim +++ b/tests/v2/test_waku_discv5.nim @@ -11,7 +11,7 @@ import eth/p2p/discoveryv5/enr import ../../waku/v2/waku_node, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_discv5, ./testlib/common, ./testlib/wakucore, diff --git a/tests/v2/test_waku_enr.nim b/tests/v2/test_waku_enr.nim index 9472eb90a..6a7a17ede 100644 --- a/tests/v2/test_waku_enr.nim +++ b/tests/v2/test_waku_enr.nim @@ -5,7 +5,7 @@ import stew/results, testutils/unittests import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_enr, ./testlib/wakucore diff --git a/tests/v2/test_waku_filter.nim b/tests/v2/test_waku_filter.nim index 9e08c751d..960672a4a 100644 --- a/tests/v2/test_waku_filter.nim +++ b/tests/v2/test_waku_filter.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto import ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_filter, ../../waku/v2/waku_filter/client, ./testlib/common, diff --git a/tests/v2/test_waku_lightpush.nim b/tests/v2/test_waku_lightpush.nim index b8920afe4..d92c08437 100644 --- a/tests/v2/test_waku_lightpush.nim +++ b/tests/v2/test_waku_lightpush.nim @@ -7,7 +7,7 @@ import libp2p/crypto/crypto import ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_lightpush, ../../waku/v2/waku_lightpush/client, ./testlib/common, diff --git a/tests/v2/test_waku_noise.nim b/tests/v2/test_waku_noise.nim index 6f2e88ac4..87751a34b 100644 --- a/tests/v2/test_waku_noise.nim +++ b/tests/v2/test_waku_noise.nim @@ -14,7 +14,7 @@ import ../../waku/v2/waku_noise/noise_utils, ../../waku/v2/waku_noise/noise, ../../waku/v2/waku_noise/noise_handshake_processing, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ./testlib/common diff --git a/tests/v2/test_waku_noise_sessions.nim b/tests/v2/test_waku_noise_sessions.nim index d10604ac4..6faf73a88 100644 --- a/tests/v2/test_waku_noise_sessions.nim +++ b/tests/v2/test_waku_noise_sessions.nim @@ -10,7 +10,7 @@ import ../../waku/v2/waku_noise/noise_types, ../../waku/v2/waku_noise/noise_utils, ../../waku/v2/waku_noise/noise_handshake_processing, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ./testlib/common procSuite "Waku Noise Sessions": diff --git a/tests/v2/test_wakunode.nim b/tests/v2/test_wakunode.nim index cded0ad0c..efe745d41 100644 --- a/tests/v2/test_wakunode.nim +++ b/tests/v2/test_wakunode.nim @@ -19,7 +19,7 @@ import import ../../waku/v2/waku_node, ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_relay, ../../waku/v2/waku_peer_exchange, ../../waku/v2/utils/peers, diff --git a/tests/v2/test_wakunode_filter.nim b/tests/v2/test_wakunode_filter.nim index e14411acf..29d62a4ef 100644 --- a/tests/v2/test_wakunode_filter.nim +++ b/tests/v2/test_wakunode_filter.nim @@ -9,7 +9,7 @@ import import ../../waku/v2/node/peer_manager, ../../waku/v2/waku_node, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/utils/peers, ./testlib/common, ./testlib/wakucore, diff --git a/tests/v2/test_wakunode_lightpush.nim b/tests/v2/test_wakunode_lightpush.nim index d88bcbb8b..b89280045 100644 --- a/tests/v2/test_wakunode_lightpush.nim +++ b/tests/v2/test_wakunode_lightpush.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto, libp2p/switch import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_lightpush, ../../waku/v2/node/peer_manager, ../../waku/v2/utils/peers, diff --git a/tests/v2/testlib/wakucore.nim b/tests/v2/testlib/wakucore.nim index bd86910b3..2befcb9eb 100644 --- a/tests/v2/testlib/wakucore.nim +++ b/tests/v2/testlib/wakucore.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ./common export switch @@ -38,8 +38,8 @@ proc newTestSwitch*(key=none(libp2p_keys.PrivateKey), address=none(MultiAddress) # Waku message export - waku_message.DefaultPubsubTopic, - waku_message.DefaultContentTopic + waku_core.DefaultPubsubTopic, + waku_core.DefaultContentTopic proc fakeWakuMessage*( diff --git a/tests/v2/waku_archive/test_driver_queue.nim b/tests/v2/waku_archive/test_driver_queue.nim index 9e59fa5f5..6d63eb69b 100644 --- a/tests/v2/waku_archive/test_driver_queue.nim +++ b/tests/v2/waku_archive/test_driver_queue.nim @@ -8,7 +8,7 @@ import ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, ../../../waku/v2/waku_archive/driver/queue_driver/index, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/utils/time diff --git a/tests/v2/waku_archive/test_driver_queue_index.nim b/tests/v2/waku_archive/test_driver_queue_index.nim index a63b0a577..c24dc63eb 100644 --- a/tests/v2/waku_archive/test_driver_queue_index.nim +++ b/tests/v2/waku_archive/test_driver_queue_index.nim @@ -6,7 +6,7 @@ import testutils/unittests, nimcrypto import - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_archive/driver/queue_driver/index, ../../../waku/v2/utils/time diff --git a/tests/v2/waku_archive/test_driver_queue_pagination.nim b/tests/v2/waku_archive/test_driver_queue_pagination.nim index 12ed2c43d..e8ab004c4 100644 --- a/tests/v2/waku_archive/test_driver_queue_pagination.nim +++ b/tests/v2/waku_archive/test_driver_queue_pagination.nim @@ -8,7 +8,7 @@ import ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, ../../../waku/v2/waku_archive/driver/queue_driver/index, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/utils/time, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_queue_query.nim b/tests/v2/waku_archive/test_driver_queue_query.nim index 1141a8f41..dacb2c4f4 100644 --- a/tests/v2/waku_archive/test_driver_queue_query.nim +++ b/tests/v2/waku_archive/test_driver_queue_query.nim @@ -8,7 +8,7 @@ import import ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/queue_driver, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_sqlite.nim b/tests/v2/waku_archive/test_driver_sqlite.nim index a39895cbe..6f5d99946 100644 --- a/tests/v2/waku_archive/test_driver_sqlite.nim +++ b/tests/v2/waku_archive/test_driver_sqlite.nim @@ -8,7 +8,7 @@ import ../../../waku/common/sqlite, ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_sqlite_query.nim b/tests/v2/waku_archive/test_driver_sqlite_query.nim index 7aae376e0..57c30ac28 100644 --- a/tests/v2/waku_archive/test_driver_sqlite_query.nim +++ b/tests/v2/waku_archive/test_driver_sqlite_query.nim @@ -9,7 +9,7 @@ import ../../../waku/common/sqlite, ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_retention_policy.nim b/tests/v2/waku_archive/test_retention_policy.nim index a4b331e91..188078eaa 100644 --- a/tests/v2/waku_archive/test_retention_policy.nim +++ b/tests/v2/waku_archive/test_retention_policy.nim @@ -11,7 +11,7 @@ import ../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/v2/waku_archive/retention_policy, ../../../waku/v2/waku_archive/retention_policy/retention_policy_capacity, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/utils/time, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_waku_archive.nim b/tests/v2/waku_archive/test_waku_archive.nim index a24da0c92..1f3e88686 100644 --- a/tests/v2/waku_archive/test_waku_archive.nim +++ b/tests/v2/waku_archive/test_waku_archive.nim @@ -7,7 +7,7 @@ import libp2p/crypto/crypto import ../../../waku/common/sqlite, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/v2/waku_archive, ../../../waku/v2/utils/time, diff --git a/tests/v2/test_waku_message_digest.nim b/tests/v2/waku_core/test_message_digest.nim similarity index 97% rename from tests/v2/test_waku_message_digest.nim rename to tests/v2/waku_core/test_message_digest.nim index b4d1330c5..93efcc6f1 100644 --- a/tests/v2/test_waku_message_digest.nim +++ b/tests/v2/waku_core/test_message_digest.nim @@ -5,10 +5,8 @@ import stew/byteutils, testutils/unittests import - ../../waku/v2/waku_message, - ../../waku/v2/waku_message/codec, - ../../waku/v2/waku_message/digest, - ./testlib/wakucore + ../../../waku/v2/waku_core, + ../testlib/wakucore suite "Waku Message - Deterministic hashing": diff --git a/tests/v2/test_waku_message_topics.nim b/tests/v2/waku_core/test_namespaced_topics.nim similarity index 99% rename from tests/v2/test_waku_message_topics.nim rename to tests/v2/waku_core/test_namespaced_topics.nim index f0675d487..08920dfaf 100644 --- a/tests/v2/test_waku_message_topics.nim +++ b/tests/v2/waku_core/test_namespaced_topics.nim @@ -4,7 +4,7 @@ import stew/results, testutils/unittests import - ../../waku/v2/waku_message/topics + ../../../waku/v2/waku_core/topics suite "Waku Message - Content topics namespacing": diff --git a/tests/v2/waku_filter_v2/test_waku_filter.nim b/tests/v2/waku_filter_v2/test_waku_filter.nim index 22368a047..2aac7607f 100644 --- a/tests/v2/waku_filter_v2/test_waku_filter.nim +++ b/tests/v2/waku_filter_v2/test_waku_filter.nim @@ -11,7 +11,7 @@ import ../../../waku/v2/waku_filter_v2, ../../../waku/v2/waku_filter_v2/client, ../../../waku/v2/waku_filter_v2/rpc, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim b/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim index cb344d8f9..3b6327ce2 100644 --- a/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim +++ b/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim @@ -11,7 +11,7 @@ import ../../../waku/v2/waku_filter_v2, ../../../waku/v2/waku_filter_v2/rpc, ../../../waku/v2/waku_filter_v2/subscriptions, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_relay/test_waku_relay.nim b/tests/v2/waku_relay/test_waku_relay.nim index 32dbe0124..9e2b4a4a0 100644 --- a/tests/v2/waku_relay/test_waku_relay.nim +++ b/tests/v2/waku_relay/test_waku_relay.nim @@ -10,7 +10,7 @@ import libp2p/protocols/pubsub/rpc/messages import ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_relay, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_relay/test_wakunode_relay.nim b/tests/v2/waku_relay/test_wakunode_relay.nim index f864012a2..279ddcfa9 100644 --- a/tests/v2/waku_relay/test_wakunode_relay.nim +++ b/tests/v2/waku_relay/test_wakunode_relay.nim @@ -18,7 +18,7 @@ import libp2p/multihash, secp256k1 import - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/node/peer_manager, ../../waku/v2/utils/peers, ../../waku/v2/waku_node, diff --git a/tests/v2/waku_rln_relay/test_waku_rln_relay.nim b/tests/v2/waku_rln_relay/test_waku_rln_relay.nim index 684443957..1991de525 100644 --- a/tests/v2/waku_rln_relay/test_waku_rln_relay.nim +++ b/tests/v2/waku_rln_relay/test_waku_rln_relay.nim @@ -11,7 +11,7 @@ import stint, libp2p/crypto/crypto import - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_rln_relay, ../../../waku/v2/waku_rln_relay/rln, ../../../waku/v2/waku_rln_relay/protocol_metrics, diff --git a/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim index 1f2da7ab1..001414825 100644 --- a/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim +++ b/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim @@ -15,7 +15,7 @@ import eth/keys import ../../../waku/v2/waku_node, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_rln_relay, ../../../waku/v2/waku_keystore, ../../../waku/v2/utils/peers, diff --git a/tests/v2/waku_store/test_resume.nim b/tests/v2/waku_store/test_resume.nim index 71545b6e6..28b41d407 100644 --- a/tests/v2/waku_store/test_resume.nim +++ b/tests/v2/waku_store/test_resume.nim @@ -10,7 +10,7 @@ import ../../waku/common/sqlite, ../../waku/v2/node/message_store/sqlite_store, ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_store, ./testlib/common, ./testlib/switch diff --git a/tests/v2/waku_store/test_waku_store.nim b/tests/v2/waku_store/test_waku_store.nim index 323db8623..f9689c6d0 100644 --- a/tests/v2/waku_store/test_waku_store.nim +++ b/tests/v2/waku_store/test_waku_store.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto import ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_store, ../../../waku/v2/waku_store/client, ../testlib/common, diff --git a/tests/v2/waku_store/test_wakunode_store.nim b/tests/v2/waku_store/test_wakunode_store.nim index 864461202..de45282ee 100644 --- a/tests/v2/waku_store/test_wakunode_store.nim +++ b/tests/v2/waku_store/test_wakunode_store.nim @@ -15,7 +15,7 @@ import import ../../../waku/common/sqlite, ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/v2/waku_store, diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim b/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim index a4fea5b8d..5ff1ed6fa 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim +++ b/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim @@ -13,7 +13,7 @@ import ../../../waku/v2/node/message_cache, ../../../waku/v2/node/jsonrpc/filter/handlers as filter_api, ../../../waku/v2/node/jsonrpc/filter/client as filter_api_client, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_filter, ../../../waku/v2/waku_filter/rpc, ../../../waku/v2/waku_filter/client, diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim b/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim index 569f39f43..09fadc904 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim +++ b/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim @@ -14,7 +14,7 @@ import ../../../waku/v2/waku_node, ../../../waku/v2/node/jsonrpc/relay/handlers as relay_api, ../../../waku/v2/node/jsonrpc/relay/client as relay_api_client, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_relay, ../../../waku/v2/utils/compat, ../../../waku/v2/utils/peers, diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim b/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim index 5ab323863..b20d55089 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim +++ b/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim @@ -12,7 +12,7 @@ import ../../../waku/v2/waku_node, ../../../waku/v2/node/jsonrpc/store/handlers as store_api, ../../../waku/v2/node/jsonrpc/store/client as store_api_client, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/queue_driver, ../../../waku/v2/waku_store, diff --git a/tests/v2/wakunode_rest/test_rest_relay.nim b/tests/v2/wakunode_rest/test_rest_relay.nim index 7e6e10f32..1cb6c13fb 100644 --- a/tests/v2/wakunode_rest/test_rest_relay.nim +++ b/tests/v2/wakunode_rest/test_rest_relay.nim @@ -17,7 +17,7 @@ import ../../waku/v2/node/rest/relay/handlers as relay_api, ../../waku/v2/node/rest/relay/client as relay_api_client, ../../waku/v2/node/rest/relay/topic_cache, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_relay, ../../waku/v2/utils/time, ../testlib/wakucore, diff --git a/tests/v2/wakunode_rest/test_rest_relay_serdes.nim b/tests/v2/wakunode_rest/test_rest_relay_serdes.nim index e503d0049..0ab26fb1a 100644 --- a/tests/v2/wakunode_rest/test_rest_relay_serdes.nim +++ b/tests/v2/wakunode_rest/test_rest_relay_serdes.nim @@ -9,7 +9,7 @@ import ../../waku/common/base64, ../../waku/v2/node/rest/serdes, ../../waku/v2/node/rest/relay/types, - ../../waku/v2/waku_message + ../../waku/v2/waku_core diff --git a/tests/v2/wakunode_rest/test_rest_store.nim b/tests/v2/wakunode_rest/test_rest_store.nim index 455fd6e0c..2367c849f 100644 --- a/tests/v2/wakunode_rest/test_rest_store.nim +++ b/tests/v2/wakunode_rest/test_rest_store.nim @@ -17,7 +17,7 @@ import ../../../waku/v2/node/rest/store/handlers as store_api, ../../../waku/v2/node/rest/store/client as store_api_client, ../../../waku/v2/node/rest/store/types, - ../../../waku/v2/waku_message, + ../../../waku/v2/waku_core, ../../../waku/v2/waku_archive, ../../../waku/v2/waku_archive/driver/queue_driver, ../../../waku/v2/waku_store as waku_store, diff --git a/tests/wakubridge/test_message_compat.nim b/tests/wakubridge/test_message_compat.nim index ced0e4af6..ea11e94df 100644 --- a/tests/wakubridge/test_message_compat.nim +++ b/tests/wakubridge/test_message_compat.nim @@ -7,7 +7,7 @@ import chronos, libp2p/switch import - ../../waku/v2/waku_message + ../../waku/v2/waku_core import ../../apps/wakubridge/message_compat diff --git a/tests/wakubridge/test_wakubridge.nim b/tests/wakubridge/test_wakubridge.nim index a59003f27..cbb1a8581 100644 --- a/tests/wakubridge/test_wakubridge.nim +++ b/tests/wakubridge/test_wakubridge.nim @@ -17,7 +17,7 @@ import eth/keys import ../../waku/v1/protocol/waku_protocol, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_node, ../../waku/v2/utils/compat, ../../waku/v2/utils/peers, diff --git a/tools/networkmonitor/networkmonitor.nim b/tools/networkmonitor/networkmonitor.nim index a04963b58..8cddab00e 100644 --- a/tools/networkmonitor/networkmonitor.nim +++ b/tools/networkmonitor/networkmonitor.nim @@ -22,7 +22,7 @@ import ../../apps/wakunode2/wakunode2, ../../waku/v2/node/peer_manager, ../../waku/v2/waku_node, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/waku_enr, ../../waku/v2/waku_discv5, ../../waku/v2/waku_dnsdisc, diff --git a/tools/simulation/quicksim2.nim b/tools/simulation/quicksim2.nim index 9c71c4055..c72410919 100644 --- a/tools/simulation/quicksim2.nim +++ b/tools/simulation/quicksim2.nim @@ -8,7 +8,7 @@ import import ../../waku/v2/waku_filter/rpc, ../../waku/v2/waku_store/rpc, - ../../waku/v2/waku_message, + ../../waku/v2/waku_core, ../../waku/v2/utils/time, ../../waku/v2/waku_node, ../../waku/v2/node/waku_payload, diff --git a/waku/v2/node/jsonrpc/filter/client.nim b/waku/v2/node/jsonrpc/filter/client.nim index 17b9fb743..c27803844 100644 --- a/waku/v2/node/jsonrpc/filter/client.nim +++ b/waku/v2/node/jsonrpc/filter/client.nim @@ -7,7 +7,7 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../waku_message, + ../../../waku_core, ../../../waku_filter/rpc template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0] diff --git a/waku/v2/node/jsonrpc/filter/handlers.nim b/waku/v2/node/jsonrpc/filter/handlers.nim index e05f3cd13..457c2e74a 100644 --- a/waku/v2/node/jsonrpc/filter/handlers.nim +++ b/waku/v2/node/jsonrpc/filter/handlers.nim @@ -8,7 +8,7 @@ import chronicles, json_rpc/rpcserver import - ../../../waku_message, + ../../../waku_core, ../../../waku_filter, ../../../waku_filter/rpc, ../../../waku_filter/client, diff --git a/waku/v2/node/jsonrpc/message.nim b/waku/v2/node/jsonrpc/message.nim index 07cefee7e..2c397b440 100644 --- a/waku/v2/node/jsonrpc/message.nim +++ b/waku/v2/node/jsonrpc/message.nim @@ -4,7 +4,7 @@ import json_rpc/rpcserver import ../../../common/base64, - ../../waku_message, + ../../waku_core, ../../utils/time diff --git a/waku/v2/node/jsonrpc/relay/client.nim b/waku/v2/node/jsonrpc/relay/client.nim index 830a3f75b..7d24becd7 100644 --- a/waku/v2/node/jsonrpc/relay/client.nim +++ b/waku/v2/node/jsonrpc/relay/client.nim @@ -7,7 +7,7 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../waku_message, + ../../../waku_core, ../../../utils/compat, ./types diff --git a/waku/v2/node/jsonrpc/relay/handlers.nim b/waku/v2/node/jsonrpc/relay/handlers.nim index 5d1f2f17e..5f2cd0608 100644 --- a/waku/v2/node/jsonrpc/relay/handlers.nim +++ b/waku/v2/node/jsonrpc/relay/handlers.nim @@ -11,7 +11,7 @@ import nimcrypto/sysrand import ../../../../common/base64, - ../../../waku_message, + ../../../waku_core, ../../../waku_relay, ../../../utils/compat, ../../../utils/time, diff --git a/waku/v2/node/message_cache.nim b/waku/v2/node/message_cache.nim index 9035f4a04..9d801ea78 100644 --- a/waku/v2/node/message_cache.nim +++ b/waku/v2/node/message_cache.nim @@ -10,7 +10,7 @@ import chronos, libp2p/protocols/pubsub import - ../waku_message + ../waku_core logScope: topics = "waku node message_cache" diff --git a/waku/v2/node/rest/relay/client.nim b/waku/v2/node/rest/relay/client.nim index 48be881d9..a0be015ae 100644 --- a/waku/v2/node/rest/relay/client.nim +++ b/waku/v2/node/rest/relay/client.nim @@ -11,7 +11,7 @@ import json_serialization/std/options, presto/[route, client, common] import - ../../../waku_message, + ../../../waku_core, ../serdes, ../responses, ./types diff --git a/waku/v2/node/rest/relay/topic_cache.nim b/waku/v2/node/rest/relay/topic_cache.nim index b8318ec86..2d2feb67a 100644 --- a/waku/v2/node/rest/relay/topic_cache.nim +++ b/waku/v2/node/rest/relay/topic_cache.nim @@ -8,7 +8,7 @@ import chronicles import ../../../waku_relay, - ../../../waku_message, + ../../../waku_core, ../../message_cache export message_cache diff --git a/waku/v2/node/rest/relay/types.nim b/waku/v2/node/rest/relay/types.nim index c6ebd46ea..680ff2f03 100644 --- a/waku/v2/node/rest/relay/types.nim +++ b/waku/v2/node/rest/relay/types.nim @@ -11,7 +11,7 @@ import presto/[route, client, common] import ../../../../common/base64, - ../../../waku_message, + ../../../waku_core, ../serdes diff --git a/waku/v2/node/rest/store/handlers.nim b/waku/v2/node/rest/store/handlers.nim index 3c845903f..ced0776dd 100644 --- a/waku/v2/node/rest/store/handlers.nim +++ b/waku/v2/node/rest/store/handlers.nim @@ -11,7 +11,7 @@ import presto/route import ../../../../common/base64, - ../../../waku_message/topics/content_topic, + ../../../waku_core, ../../../waku_store/common, ../../../utils/time, ../../waku_node, diff --git a/waku/v2/node/rest/store/types.nim b/waku/v2/node/rest/store/types.nim index a4291e222..3bd642d72 100644 --- a/waku/v2/node/rest/store/types.nim +++ b/waku/v2/node/rest/store/types.nim @@ -14,9 +14,7 @@ import ../../../waku_store/common as waku_store_common, ../../../../common/base64, ../../../utils/time, - ../../../waku_message/topics/content_topic, - ../../../waku_message/topics/pubsub_topic, - ../../../waku_message/message, + ../../../waku_core, ../serdes diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim index 4b8745820..b57f1593c 100644 --- a/waku/v2/node/waku_node.nim +++ b/waku/v2/node/waku_node.nim @@ -24,7 +24,7 @@ import libp2p/transports/tcptransport, libp2p/transports/wstransport import - ../waku_message, + ../waku_core, ../waku_relay, ../waku_archive, ../waku_store, diff --git a/waku/v2/utils/compat.nim b/waku/v2/utils/compat.nim index f3b7cf2fc..087ee5ccf 100644 --- a/waku/v2/utils/compat.nim +++ b/waku/v2/utils/compat.nim @@ -10,7 +10,7 @@ import eth/keys import ../../whisper/whisper_types, - ../waku_message + ../waku_core export whisper_types, keys, options diff --git a/waku/v2/utils/noise.nim b/waku/v2/utils/noise.nim index 0e030ebce..2da3943c5 100644 --- a/waku/v2/utils/noise.nim +++ b/waku/v2/utils/noise.nim @@ -6,7 +6,7 @@ else: import stew/results import - ../waku_message, + ../waku_core, ../waku_noise/noise_types, ../waku_noise/noise_utils diff --git a/waku/v2/waku_archive/archive.nim b/waku/v2/waku_archive/archive.nim index 4837507ce..58515b482 100644 --- a/waku/v2/waku_archive/archive.nim +++ b/waku/v2/waku_archive/archive.nim @@ -12,7 +12,7 @@ import metrics import ../utils/time, - ../waku_message, + ../waku_core, ./common, ./archive_metrics, ./retention_policy, diff --git a/waku/v2/waku_archive/common.nim b/waku/v2/waku_archive/common.nim index 70514df7b..926ff4ab9 100644 --- a/waku/v2/waku_archive/common.nim +++ b/waku/v2/waku_archive/common.nim @@ -10,7 +10,7 @@ import nimcrypto/sha2 import ../utils/time, - ../waku_message + ../waku_core ## Waku message digest diff --git a/waku/v2/waku_archive/driver.nim b/waku/v2/waku_archive/driver.nim index d44061a99..74cc61828 100644 --- a/waku/v2/waku_archive/driver.nim +++ b/waku/v2/waku_archive/driver.nim @@ -8,7 +8,7 @@ import stew/results import ../utils/time, - ../waku_message, + ../waku_core, ./common diff --git a/waku/v2/waku_archive/driver/queue_driver/index.nim b/waku/v2/waku_archive/driver/queue_driver/index.nim index 68446092a..955e3d4bb 100644 --- a/waku/v2/waku_archive/driver/queue_driver/index.nim +++ b/waku/v2/waku_archive/driver/queue_driver/index.nim @@ -7,7 +7,7 @@ import stew/byteutils, nimcrypto/sha2 import - ../../../waku_message, + ../../../waku_core, ../../../utils/time, ../../common diff --git a/waku/v2/waku_archive/driver/queue_driver/queue_driver.nim b/waku/v2/waku_archive/driver/queue_driver/queue_driver.nim index 6b9994d19..52543cd21 100644 --- a/waku/v2/waku_archive/driver/queue_driver/queue_driver.nim +++ b/waku/v2/waku_archive/driver/queue_driver/queue_driver.nim @@ -9,7 +9,7 @@ import stew/sorted_set, chronicles import - ../../../waku_message, + ../../../waku_core, ../../../utils/time, ../../common, ../../driver, diff --git a/waku/v2/waku_archive/driver/sqlite_driver/cursor.nim b/waku/v2/waku_archive/driver/sqlite_driver/cursor.nim index ce87f791a..4e1646c61 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/cursor.nim +++ b/waku/v2/waku_archive/driver/sqlite_driver/cursor.nim @@ -5,7 +5,7 @@ else: import - ../../../waku_message, + ../../../waku_core, ../../../utils/time, ../../common diff --git a/waku/v2/waku_archive/driver/sqlite_driver/queries.nim b/waku/v2/waku_archive/driver/sqlite_driver/queries.nim index 7fff1310d..fd27481ff 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/queries.nim +++ b/waku/v2/waku_archive/driver/sqlite_driver/queries.nim @@ -10,7 +10,7 @@ import sqlite3_abi import ../../../../common/sqlite, - ../../../waku_message, + ../../../waku_core, ../../../utils/time, ./cursor diff --git a/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim b/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim index d72199365..52584ff6c 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim +++ b/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim @@ -11,7 +11,7 @@ import chronicles import ../../../../common/sqlite, - ../../../waku_message, + ../../../waku_core, ../../../utils/time, ../../common, ../../driver, diff --git a/waku/v2/waku_core.nim b/waku/v2/waku_core.nim new file mode 100644 index 000000000..0b75e571f --- /dev/null +++ b/waku/v2/waku_core.nim @@ -0,0 +1,7 @@ +import + ./waku_core/topics, + ./waku_core/message + +export + topics, + message diff --git a/waku/v2/waku_core/message.nim b/waku/v2/waku_core/message.nim new file mode 100644 index 000000000..8b57cd7bb --- /dev/null +++ b/waku/v2/waku_core/message.nim @@ -0,0 +1,9 @@ +import + ./message/message, + ./message/codec, + ./message/digest + +export + message, + codec, + digest diff --git a/waku/v2/waku_message/codec.nim b/waku/v2/waku_core/message/codec.nim similarity index 96% rename from waku/v2/waku_message/codec.nim rename to waku/v2/waku_core/message/codec.nim index e46ad1c58..985ff196d 100644 --- a/waku/v2/waku_message/codec.nim +++ b/waku/v2/waku_core/message/codec.nim @@ -9,9 +9,9 @@ else: import - ../../common/protobuf, - ../utils/time, - ./topics, + ../../../common/protobuf, + ../../utils/time, + ../topics, ./message diff --git a/waku/v2/waku_message/digest.nim b/waku/v2/waku_core/message/digest.nim similarity index 98% rename from waku/v2/waku_message/digest.nim rename to waku/v2/waku_core/message/digest.nim index cd5beb0cb..602ff213f 100644 --- a/waku/v2/waku_message/digest.nim +++ b/waku/v2/waku_core/message/digest.nim @@ -9,7 +9,7 @@ import stew/byteutils, nimcrypto/sha2 import - ./topics, + ../topics, ./message diff --git a/waku/v2/waku_message/message.nim b/waku/v2/waku_core/message/message.nim similarity index 97% rename from waku/v2/waku_message/message.nim rename to waku/v2/waku_core/message/message.nim index 6cc9623cc..3f6191687 100644 --- a/waku/v2/waku_message/message.nim +++ b/waku/v2/waku_core/message/message.nim @@ -10,8 +10,8 @@ else: import - ../utils/time, - ./topics + ../../utils/time, + ../topics const MaxMetaAttrLength* = 64 # 64 bytes diff --git a/waku/v2/waku_message/topics.nim b/waku/v2/waku_core/topics.nim similarity index 100% rename from waku/v2/waku_message/topics.nim rename to waku/v2/waku_core/topics.nim diff --git a/waku/v2/waku_message/topics/content_topic.nim b/waku/v2/waku_core/topics/content_topic.nim similarity index 100% rename from waku/v2/waku_message/topics/content_topic.nim rename to waku/v2/waku_core/topics/content_topic.nim diff --git a/waku/v2/waku_message/topics/parsing.nim b/waku/v2/waku_core/topics/parsing.nim similarity index 100% rename from waku/v2/waku_message/topics/parsing.nim rename to waku/v2/waku_core/topics/parsing.nim diff --git a/waku/v2/waku_message/topics/pubsub_topic.nim b/waku/v2/waku_core/topics/pubsub_topic.nim similarity index 100% rename from waku/v2/waku_message/topics/pubsub_topic.nim rename to waku/v2/waku_core/topics/pubsub_topic.nim diff --git a/waku/v2/waku_enr/sharding.nim b/waku/v2/waku_enr/sharding.nim index db2c768de..672907576 100644 --- a/waku/v2/waku_enr/sharding.nim +++ b/waku/v2/waku_enr/sharding.nim @@ -13,7 +13,7 @@ import libp2p/crypto/crypto import ../../common/enr, - ../waku_message + ../waku_core logScope: topics = "waku enr sharding" diff --git a/waku/v2/waku_filter/client.nim b/waku/v2/waku_filter/client.nim index 4beeaccb8..e2f431d9a 100644 --- a/waku/v2/waku_filter/client.nim +++ b/waku/v2/waku_filter/client.nim @@ -12,7 +12,7 @@ import bearssl/rand, libp2p/protocols/protocol as libp2p_protocol import - ../waku_message, + ../waku_core, ../node/peer_manager, ../utils/requests, ./rpc, diff --git a/waku/v2/waku_filter/protocol.nim b/waku/v2/waku_filter/protocol.nim index 2e5ef9ce0..9ad6818a0 100644 --- a/waku/v2/waku_filter/protocol.nim +++ b/waku/v2/waku_filter/protocol.nim @@ -8,7 +8,7 @@ import libp2p/protocols/protocol, libp2p/crypto/crypto import - ../waku_message, + ../waku_core, ../node/peer_manager, ./rpc, ./rpc_codec, diff --git a/waku/v2/waku_filter/rpc.nim b/waku/v2/waku_filter/rpc.nim index 28b975a9d..0cd3744e1 100644 --- a/waku/v2/waku_filter/rpc.nim +++ b/waku/v2/waku_filter/rpc.nim @@ -6,7 +6,7 @@ else: import std/options import - ../waku_message + ../waku_core type diff --git a/waku/v2/waku_filter/rpc_codec.nim b/waku/v2/waku_filter/rpc_codec.nim index 94756d84b..8b82a471c 100644 --- a/waku/v2/waku_filter/rpc_codec.nim +++ b/waku/v2/waku_filter/rpc_codec.nim @@ -7,7 +7,7 @@ import std/options import ../../common/protobuf, - ../waku_message, + ../waku_core, ./rpc diff --git a/waku/v2/waku_filter_v2/client.nim b/waku/v2/waku_filter_v2/client.nim index 8360b1a7f..5a7d86d90 100644 --- a/waku/v2/waku_filter_v2/client.nim +++ b/waku/v2/waku_filter_v2/client.nim @@ -13,7 +13,7 @@ import bearssl/rand import ../node/peer_manager, - ../waku_message, + ../waku_core, ./common, ./protocol_metrics, ./rpc_codec, diff --git a/waku/v2/waku_filter_v2/protocol.nim b/waku/v2/waku_filter_v2/protocol.nim index 42ef73ff5..0b99df310 100644 --- a/waku/v2/waku_filter_v2/protocol.nim +++ b/waku/v2/waku_filter_v2/protocol.nim @@ -13,7 +13,7 @@ import libp2p/protocols/protocol import ../node/peer_manager, - ../waku_message, + ../waku_core, ./common, ./protocol_metrics, ./rpc_codec, diff --git a/waku/v2/waku_filter_v2/rpc.nim b/waku/v2/waku_filter_v2/rpc.nim index a15801989..e6718dfa9 100644 --- a/waku/v2/waku_filter_v2/rpc.nim +++ b/waku/v2/waku_filter_v2/rpc.nim @@ -6,7 +6,7 @@ else: import std/options import - ../waku_message + ../waku_core type FilterSubscribeType* {.pure.} = enum diff --git a/waku/v2/waku_filter_v2/rpc_codec.nim b/waku/v2/waku_filter_v2/rpc_codec.nim index 9be22a7d8..3d5ce0db5 100644 --- a/waku/v2/waku_filter_v2/rpc_codec.nim +++ b/waku/v2/waku_filter_v2/rpc_codec.nim @@ -7,7 +7,7 @@ import std/options import ../../common/protobuf, - ../waku_message, + ../waku_core, ./rpc const diff --git a/waku/v2/waku_filter_v2/subscriptions.nim b/waku/v2/waku_filter_v2/subscriptions.nim index 5c5cab42a..68ae9e4d4 100644 --- a/waku/v2/waku_filter_v2/subscriptions.nim +++ b/waku/v2/waku_filter_v2/subscriptions.nim @@ -8,7 +8,7 @@ import chronicles, libp2p/peerid import - ../waku_message + ../waku_core logScope: topics = "waku filter subscriptions" diff --git a/waku/v2/waku_lightpush/client.nim b/waku/v2/waku_lightpush/client.nim index 6dd01adae..7e898ca9e 100644 --- a/waku/v2/waku_lightpush/client.nim +++ b/waku/v2/waku_lightpush/client.nim @@ -13,7 +13,7 @@ import import ../node/peer_manager, ../utils/requests, - ../waku_message, + ../waku_core, ./protocol, ./protocol_metrics, ./rpc, diff --git a/waku/v2/waku_lightpush/protocol.nim b/waku/v2/waku_lightpush/protocol.nim index e3af16026..65a7b7685 100644 --- a/waku/v2/waku_lightpush/protocol.nim +++ b/waku/v2/waku_lightpush/protocol.nim @@ -12,7 +12,7 @@ import bearssl/rand import ../node/peer_manager, - ../waku_message, + ../waku_core, ./rpc, ./rpc_codec, ./protocol_metrics diff --git a/waku/v2/waku_lightpush/rpc.nim b/waku/v2/waku_lightpush/rpc.nim index b276867ee..fc8e8b660 100644 --- a/waku/v2/waku_lightpush/rpc.nim +++ b/waku/v2/waku_lightpush/rpc.nim @@ -6,7 +6,7 @@ else: import std/options import - ../waku_message + ../waku_core type PushRequest* = object diff --git a/waku/v2/waku_lightpush/rpc_codec.nim b/waku/v2/waku_lightpush/rpc_codec.nim index 4cb4ac8a7..caa146269 100644 --- a/waku/v2/waku_lightpush/rpc_codec.nim +++ b/waku/v2/waku_lightpush/rpc_codec.nim @@ -8,7 +8,7 @@ import std/options import ../../common/protobuf, - ../waku_message, + ../waku_core, ./rpc diff --git a/waku/v2/waku_message.nim b/waku/v2/waku_message.nim deleted file mode 100644 index 642776715..000000000 --- a/waku/v2/waku_message.nim +++ /dev/null @@ -1,11 +0,0 @@ -import - ./waku_message/topics, - ./waku_message/message, - ./waku_message/codec, - ./waku_message/digest - -export - topics, - message, - codec, - digest diff --git a/waku/v2/waku_peer_exchange/protocol.nim b/waku/v2/waku_peer_exchange/protocol.nim index d3413683f..8a034cd8e 100644 --- a/waku/v2/waku_peer_exchange/protocol.nim +++ b/waku/v2/waku_peer_exchange/protocol.nim @@ -9,7 +9,7 @@ import eth/p2p/discoveryv5/enr import ../node/peer_manager, - ../waku_message, + ../waku_core, ../waku_discv5, ./rpc, ./rpc_codec diff --git a/waku/v2/waku_relay/protocol.nim b/waku/v2/waku_relay/protocol.nim index c2f01a90d..aad03741b 100644 --- a/waku/v2/waku_relay/protocol.nim +++ b/waku/v2/waku_relay/protocol.nim @@ -19,7 +19,7 @@ import libp2p/stream/connection, libp2p/switch import - ../waku_message, + ../waku_core, ./message_id diff --git a/waku/v2/waku_relay/validators.nim b/waku/v2/waku_relay/validators.nim index 146f40298..8b82c8445 100644 --- a/waku/v2/waku_relay/validators.nim +++ b/waku/v2/waku_relay/validators.nim @@ -15,7 +15,7 @@ import import ./protocol, - ../waku_message + ../waku_core # Application level message hash proc msgHash*(pubSubTopic: string, msg: WakuMessage): array[32, byte] = diff --git a/waku/v2/waku_rln_relay/protocol_types.nim b/waku/v2/waku_rln_relay/protocol_types.nim index e617315c5..e836cab32 100644 --- a/waku/v2/waku_rln_relay/protocol_types.nim +++ b/waku/v2/waku_rln_relay/protocol_types.nim @@ -10,13 +10,13 @@ import web3, eth/keys import - ../waku_message, + ../waku_core, ../waku_keystore, ../../common/protobuf export waku_keystore, - waku_message + waku_core type RlnRelayResult*[T] = Result[T, string] diff --git a/waku/v2/waku_rln_relay/rln_relay.nim b/waku/v2/waku_rln_relay/rln_relay.nim index 415bfe2dc..46fc3788a 100644 --- a/waku/v2/waku_rln_relay/rln_relay.nim +++ b/waku/v2/waku_rln_relay/rln_relay.nim @@ -77,7 +77,7 @@ proc calcEpoch*(t: float64): Epoch = type WakuRLNRelay* = ref object of RootObj pubsubTopic*: string # the pubsub topic for which rln relay is mounted - # contentTopic should be of type waku_message.ContentTopic, however, due to recursive module dependency, the underlying type of ContentTopic is used instead + # contentTopic should be of type waku_core.ContentTopic, however, due to recursive module dependency, the underlying type of ContentTopic is used instead # TODO a long-term solution is to place types with recursive dependency inside one file contentTopic*: string # the log of nullifiers and Shamir shares of the past messages grouped per epoch diff --git a/waku/v2/waku_store/common.nim b/waku/v2/waku_store/common.nim index b95484912..13e5b3dd1 100644 --- a/waku/v2/waku_store/common.nim +++ b/waku/v2/waku_store/common.nim @@ -10,7 +10,7 @@ import nimcrypto/sha2 import ../utils/time, - ../waku_message + ../waku_core const diff --git a/waku/v2/waku_store/rpc.nim b/waku/v2/waku_store/rpc.nim index e68ad38b8..ec0c2c867 100644 --- a/waku/v2/waku_store/rpc.nim +++ b/waku/v2/waku_store/rpc.nim @@ -8,7 +8,7 @@ import stew/results import ../utils/time, - ../waku_message, + ../waku_core, ./common diff --git a/waku/v2/waku_store/rpc_codec.nim b/waku/v2/waku_store/rpc_codec.nim index e9368bddd..47c372f6f 100644 --- a/waku/v2/waku_store/rpc_codec.nim +++ b/waku/v2/waku_store/rpc_codec.nim @@ -8,7 +8,7 @@ import nimcrypto/hash import ../../common/protobuf, - ../waku_message, + ../waku_core, ./common, ./rpc