chore(core): rename waku_message module to waku_core

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 ##

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

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,

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

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].} =

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,

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

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
 

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/waku_core/test_namespaced_topics,
-  ./v2/test_waku_message_digest
+  ./v2/waku_core/test_message_digest
 
 # Waku archive test suite
 import

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

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

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,

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
 

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,

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,

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
 
 

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":

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,

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,

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,

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_core.DefaultPubsubTopic,
-  waku_message.DefaultContentTopic
+  waku_core.DefaultContentTopic
 
 
 proc fakeWakuMessage*(

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
 
 

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
 

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

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
 

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
 

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
 

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

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,

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_core,
-  ../../waku/v2/waku_message/codec,
+  ../testlib/wakucore
-  ../../waku/v2/waku_message/digest,
-  ./testlib/wakucore
 
 suite "Waku Message - Deterministic hashing":
 

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":
 

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
 

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
 

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

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,

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,

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,

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

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,

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,

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,

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,

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,

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,

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
 
 
 

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,

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

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,

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,

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,

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]

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,

waku/v2/node/jsonrpc/message.nim

@@ -4,7 +4,7 @@ import
   json_rpc/rpcserver
 import
   ../../../common/base64,
-  ../../waku_message,
+  ../../waku_core,
   ../../utils/time
 
 

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
 

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,

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"

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

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

waku/v2/node/rest/relay/types.nim

@@ -11,7 +11,7 @@ import
   presto/[route, client, common]
 import
   ../../../../common/base64,
-  ../../../waku_message,
+  ../../../waku_core,
   ../serdes
 
 

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,

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_core,
-  ../../../waku_message/topics/pubsub_topic,
-  ../../../waku_message/message,
   ../serdes
 
 

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,

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
 

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
 

waku/v2/waku_archive/archive.nim

@@ -12,7 +12,7 @@ import
   metrics
 import
   ../utils/time,
-  ../waku_message,
+  ../waku_core,
   ./common,
   ./archive_metrics,
   ./retention_policy,

waku/v2/waku_archive/common.nim

@@ -10,7 +10,7 @@ import
   nimcrypto/sha2
 import
   ../utils/time,
-  ../waku_message
+  ../waku_core
 
 
 ## Waku message digest

waku/v2/waku_archive/driver.nim

@@ -8,7 +8,7 @@ import
   stew/results
 import
   ../utils/time,
-  ../waku_message,
+  ../waku_core,
   ./common
 
 

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
 

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,

waku/v2/waku_archive/driver/sqlite_driver/cursor.nim

@@ -5,7 +5,7 @@ else:
 
 
 import
-  ../../../waku_message,
+  ../../../waku_core,
   ../../../utils/time,
   ../../common
 

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
 

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,

waku/v2/waku_core.nim

@@ -0,0 +1,7 @@
+import
+  ./waku_core/topics,
+  ./waku_core/message
+
+export
+  topics,
+  message

waku/v2/waku_core/message.nim

@@ -0,0 +1,9 @@
+import
+  ./message/message,
+  ./message/codec,
+  ./message/digest
+
+export
+  message,
+  codec,
+  digest

waku/v2/waku_core/message/codec.nim

@@ -9,9 +9,9 @@ else:
 
 
 import
-  ../../common/protobuf,
+  ../../../common/protobuf,
-  ../utils/time,
+  ../../utils/time,
-  ./topics,
+  ../topics,
   ./message
 
 

waku/v2/waku_core/message/digest.nim

@@ -9,7 +9,7 @@ import
   stew/byteutils,
   nimcrypto/sha2
 import
-  ./topics,
+  ../topics,
   ./message
 
 

waku/v2/waku_core/message/message.nim

@@ -10,8 +10,8 @@ else:
 
 
 import
-  ../utils/time,
+  ../../utils/time,
-  ./topics
+  ../topics
 
 const
   MaxMetaAttrLength* = 64 # 64 bytes

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"

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,

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,

waku/v2/waku_filter/rpc.nim

@@ -6,7 +6,7 @@ else:
 import
   std/options
 import
-  ../waku_message
+  ../waku_core
 
 
 type

waku/v2/waku_filter/rpc_codec.nim

@@ -7,7 +7,7 @@ import
   std/options
 import
   ../../common/protobuf,
-  ../waku_message,
+  ../waku_core,
   ./rpc
 
 

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,

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,

waku/v2/waku_filter_v2/rpc.nim

@@ -6,7 +6,7 @@ else:
 import
   std/options
 import
-  ../waku_message
+  ../waku_core
 
 type
   FilterSubscribeType* {.pure.} = enum

waku/v2/waku_filter_v2/rpc_codec.nim

@@ -7,7 +7,7 @@ import
   std/options
 import
   ../../common/protobuf,
-  ../waku_message,
+  ../waku_core,
   ./rpc
 
 const

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"

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,

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

waku/v2/waku_lightpush/rpc.nim

@@ -6,7 +6,7 @@ else:
 import
   std/options
 import
-  ../waku_message
+  ../waku_core
 
 type
   PushRequest* = object

waku/v2/waku_lightpush/rpc_codec.nim

@@ -8,7 +8,7 @@ import
   std/options
 import
   ../../common/protobuf,
-  ../waku_message,
+  ../waku_core,
   ./rpc
 
 

waku/v2/waku_message.nim

@@ -1,11 +0,0 @@
-import
-  ./waku_message/topics,
-  ./waku_message/message,
-  ./waku_message/codec,
-  ./waku_message/digest
-
-export
-  topics,
-  message,
-  codec,
-  digest

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

waku/v2/waku_relay/protocol.nim

@@ -19,7 +19,7 @@ import
   libp2p/stream/connection,
   libp2p/switch
 import
-  ../waku_message,
+  ../waku_core,
   ./message_id
 
 

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] =

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]