chore(core): rename waku_message module to waku_core

waku-org · Apr 19, 2023 · c9b6b23 · c9b6b23
1 parent edd8419
commit c9b6b23
Show file tree

Hide file tree

Showing 104 changed files with 125 additions and 124 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → tests/v2/waku_core/test_message_digest.nim b/tests/v2/test_waku_message_digest.nim → 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 → ...s/v2/waku_core/test_namespaced_topics.nim b/tests/v2/test_waku_message_topics.nim → ...s/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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