chore: flatten waku v2 protocols folder

apps/chat2/chat2.nim

@@ -23,12 +23,12 @@ 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/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/waku_lightpush,
-  ../../waku/v2/protocol/waku_lightpush/rpc,
+  ../../waku/v2/waku_lightpush/rpc,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
-  ../../waku/v2/protocol/waku_dnsdisc,
+  ../../waku/v2/waku_dnsdisc,
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_metrics,
   ../../waku/v2/node/peer_manager,
@@ -43,7 +43,7 @@ when defined(rln):
     libp2p/protocols/pubsub/rpc/messages,
     libp2p/protocols/pubsub/pubsub
   import
-    ../../waku/v2/protocol/waku_rln_relay
+    ../../waku/v2/waku_rln_relay
 
 const Help = """
   Commands: /[?|help|connect|nick|exit]

apps/chat2/config_chat2.nim

@@ -7,7 +7,7 @@ import
   nimcrypto/utils,
   eth/keys
 import
-  ../../../waku/v2/protocol/waku_message
+  ../../../waku/v2/waku_message
 
 type
   Fleet* =  enum

apps/chat2bridge/chat2bridge.nim

@@ -14,12 +14,12 @@ import
   # Waku v2 imports
   libp2p/crypto/crypto,
   libp2p/errors,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../../../waku/v2/waku_node,
   ../../../waku/v2/utils/peers,
   ../../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   # Chat 2 imports
   ../chat2/chat2,
   # Common cli config

apps/wakubridge/message_compat.nim

@@ -8,7 +8,7 @@ import
   libp2p/crypto/crypto
 import
   ../../waku/v1/protocol/waku_protocol,
-  ../../waku/v2/protocol/waku_message
+  ../../waku/v2/waku_message
 
 
 const

apps/wakubridge/wakubridge.nim

@@ -25,9 +25,9 @@ import
   libp2p/crypto/crypto,
   libp2p/nameresolving/nameresolver,
   ../../waku/v2/utils/time,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
   ../../waku/v2/node/message_cache,
   ../../waku/v2/waku_node,
   ../../waku/v2/node/peer_manager,

apps/wakunode2/wakunode2.nim

@@ -30,22 +30,22 @@ import
   ../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_metrics,
-  ../../waku/v2/protocol/waku_archive,
+  ../../waku/v2/waku_archive,
-  ../../waku/v2/protocol/waku_archive/driver/queue_driver,
+  ../../waku/v2/waku_archive/driver/queue_driver,
-  ../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../waku/v2/protocol/waku_archive/driver/sqlite_driver/migrations as archive_driver_sqlite_migrations,
+  ../../waku/v2/waku_archive/driver/sqlite_driver/migrations as archive_driver_sqlite_migrations,
-  ../../waku/v2/protocol/waku_archive/retention_policy,
+  ../../waku/v2/waku_archive/retention_policy,
-  ../../waku/v2/protocol/waku_archive/retention_policy/retention_policy_capacity,
+  ../../waku/v2/waku_archive/retention_policy/retention_policy_capacity,
-  ../../waku/v2/protocol/waku_archive/retention_policy/retention_policy_time,
+  ../../waku/v2/waku_archive/retention_policy/retention_policy_time,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/waku_lightpush,
-  ../../waku/v2/protocol/waku_enr,
+  ../../waku/v2/waku_enr,
-  ../../waku/v2/protocol/waku_dnsdisc,
+  ../../waku/v2/waku_dnsdisc,
-  ../../waku/v2/protocol/waku_discv5,
+  ../../waku/v2/waku_discv5,
-  ../../waku/v2/protocol/waku_message/topics/pubsub_topic,
+  ../../waku/v2/waku_message/topics/pubsub_topic,
-  ../../waku/v2/protocol/waku_peer_exchange,
+  ../../waku/v2/waku_peer_exchange,
-  ../../waku/v2/protocol/waku_relay/validators,
+  ../../waku/v2/waku_relay/validators,
   ../../waku/v2/utils/peers,
   ./wakunode2_setup_rest,
   ./wakunode2_setup_rpc,
@@ -53,7 +53,7 @@ import
 
 when defined(rln):
   import
-    ../../waku/v2/protocol/waku_rln_relay
+    ../../waku/v2/waku_rln_relay
 
 
 logScope:

examples/v2/publisher.nim

@@ -13,9 +13,9 @@ import
   ../../../waku/common/logging,
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/waku_node,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_enr,
+  ../../../waku/v2/waku_enr,
-  ../../../waku/v2/protocol/waku_discv5,
+  ../../../waku/v2/waku_discv5,
   ../../../waku/v2/utils/time
 
 proc now*(): Timestamp =

examples/v2/subscriber.nim

@@ -13,9 +13,9 @@ import
   ../../../waku/common/logging,
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/waku_node,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_enr,
+  ../../../waku/v2/waku_enr,
-  ../../../waku/v2/protocol/waku_discv5
+  ../../../waku/v2/waku_discv5
 
 # An accesible bootstrap node. See wakuv2.prod fleets.status.im
 const bootstrapNode = "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZl" &

tests/v2/test_message_cache.nim

@@ -5,7 +5,7 @@ import
   testutils/unittests,
   chronicles
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/node/message_cache,
   ./testlib/common,
   ./testlib/wakucore

tests/v2/test_peer_manager.nim

@@ -21,11 +21,11 @@ import
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage,
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_relay,
+  ../../waku/v2/waku_relay,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/waku_lightpush,
-  ../../waku/v2/protocol/waku_peer_exchange,
+  ../../waku/v2/waku_peer_exchange,
   ./testlib/common,
   ./testlib/testutils,
   ./testlib/wakucore,

tests/v2/test_utils_compat.nim

@@ -3,7 +3,7 @@
 import
   testutils/unittests
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/utils/compat,
   ../../waku/v2/utils/time,
   ./testlib/common

tests/v2/test_waku_discv5.nim

@@ -11,8 +11,8 @@ import
   eth/p2p/discoveryv5/enr
 import
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_discv5,
+  ../../waku/v2/waku_discv5,
   ./testlib/common,
   ./testlib/wakucore,
   ./testlib/wakunode

tests/v2/test_waku_dnsdisc.nim

@@ -13,7 +13,7 @@ import
 import
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_dnsdisc,
+  ../../waku/v2/waku_dnsdisc,
   ./testlib/common,
   ./testlib/wakucore,
   ./testlib/wakunode

tests/v2/test_waku_enr.nim

@@ -5,8 +5,8 @@ import
   stew/results,
   testutils/unittests
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_enr,
+  ../../waku/v2/waku_enr,
   ./testlib/wakucore
 
 

tests/v2/test_waku_filter.nim

@@ -8,9 +8,9 @@ import
   libp2p/crypto/crypto
 import
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_filter/client,
+  ../../waku/v2/waku_filter/client,
   ./testlib/common,
   ./testlib/wakucore
 

tests/v2/test_waku_keystore.nim

@@ -4,10 +4,10 @@ import
   std/[algorithm, json, options, os],
   testutils/unittests, chronos, stint
 import
-  ../../waku/v2/protocol/waku_keystore,
+  ../../waku/v2/waku_keystore,
   ./testlib/common
 
-from  ../../waku/v2/protocol/waku_noise/noise_utils import randomSeqByte
+from  ../../waku/v2/waku_noise/noise_utils import randomSeqByte
 
 procSuite "Credentials test suite":
 

tests/v2/test_waku_keystore_keyfile.nim

@@ -6,10 +6,10 @@ import
   testutils/unittests, chronos,
   eth/keys
 import
-  ../../waku/v2/protocol/waku_keystore,
+  ../../waku/v2/waku_keystore,
   ./testlib/common
 
-from ../../waku/v2/protocol/waku_noise/noise_utils import randomSeqByte
+from ../../waku/v2/waku_noise/noise_utils import randomSeqByte
 
 suite "KeyFile test suite":
 

tests/v2/test_waku_lightpush.nim

@@ -7,9 +7,9 @@ import
   libp2p/crypto/crypto
 import
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/waku_lightpush,
-  ../../waku/v2/protocol/waku_lightpush/client,
+  ../../waku/v2/waku_lightpush/client,
   ./testlib/common,
   ./testlib/wakucore
 

tests/v2/test_waku_message_digest.nim

@@ -5,9 +5,9 @@ import
   stew/byteutils,
   testutils/unittests
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_message/codec,
+  ../../waku/v2/waku_message/codec,
-  ../../waku/v2/protocol/waku_message/digest,
+  ../../waku/v2/waku_message/digest,
   ./testlib/wakucore
 
 suite "Waku Message - Deterministic hashing":

tests/v2/test_waku_message_topics.nim

@@ -4,7 +4,7 @@ import
   stew/results,
   testutils/unittests
 import
-  ../../waku/v2/protocol/waku_message/topics
+  ../../waku/v2/waku_message/topics
 
 suite "Waku Message - Content topics namespacing":
 

tests/v2/test_waku_noise.nim

@@ -10,11 +10,11 @@ import
   stew/endians2
 import
   ../../waku/v2/utils/noise as waku_message_utils,
-  ../../waku/v2/protocol/waku_noise/noise_types,
+  ../../waku/v2/waku_noise/noise_types,
-  ../../waku/v2/protocol/waku_noise/noise_utils,
+  ../../waku/v2/waku_noise/noise_utils,
-  ../../waku/v2/protocol/waku_noise/noise,
+  ../../waku/v2/waku_noise/noise,
-  ../../waku/v2/protocol/waku_noise/noise_handshake_processing,
+  ../../waku/v2/waku_noise/noise_handshake_processing,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ./testlib/common
 
 

tests/v2/test_waku_noise_sessions.nim

@@ -7,10 +7,10 @@ import
 import
   ../../waku/common/protobuf,
   ../../waku/v2/utils/noise as waku_message_utils,
-  ../../waku/v2/protocol/waku_noise/noise_types,
+  ../../waku/v2/waku_noise/noise_types,
-  ../../waku/v2/protocol/waku_noise/noise_utils,
+  ../../waku/v2/waku_noise/noise_utils,
-  ../../waku/v2/protocol/waku_noise/noise_handshake_processing,
+  ../../waku/v2/waku_noise/noise_handshake_processing,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ./testlib/common
 
 procSuite "Waku Noise Sessions":

tests/v2/test_waku_peer_exchange.nim

@@ -14,10 +14,10 @@ import
 import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_discv5,
+  ../../waku/v2/waku_discv5,
-  ../../waku/v2/protocol/waku_peer_exchange,
+  ../../waku/v2/waku_peer_exchange,
-  ../../waku/v2/protocol/waku_peer_exchange/rpc,
+  ../../waku/v2/waku_peer_exchange/rpc,
-  ../../waku/v2/protocol/waku_peer_exchange/rpc_codec,
+  ../../waku/v2/waku_peer_exchange/rpc_codec,
   ./testlib/wakucore,
   ./testlib/wakunode
 

tests/v2/test_wakunode.nim

@@ -19,9 +19,9 @@ import
 import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_relay,
+  ../../waku/v2/waku_relay,
-  ../../waku/v2/protocol/waku_peer_exchange,
+  ../../waku/v2/waku_peer_exchange,
   ../../waku/v2/utils/peers,
   ./testlib/wakucore,
   ./testlib/wakunode

tests/v2/test_wakunode_filter.nim

@@ -9,7 +9,7 @@ import
 import
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/utils/peers,
   ./testlib/common,
   ./testlib/wakucore,

tests/v2/test_wakunode_lightpush.nim

@@ -8,8 +8,8 @@ import
   libp2p/crypto/crypto,
   libp2p/switch
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/waku_lightpush,
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/waku_node,

tests/v2/testlib/wakucore.nim

@@ -8,7 +8,7 @@ import
   libp2p/crypto/crypto as libp2p_keys,
   eth/keys as eth_keys
 import
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ./common
 
 export switch

tests/v2/testlib/wakunode.nim

@@ -11,8 +11,8 @@ import
 import
   ../../../waku/v2/waku_node,
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_enr,
+  ../../../waku/v2/waku_enr,
-  ../../../waku/v2/protocol/waku_discv5,
+  ../../../waku/v2/waku_discv5,
   ./common
 
 

tests/v2/waku_archive/test_driver_queue.nim

@@ -5,10 +5,10 @@ import
   stew/results,
   testutils/unittests
 import
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver/queue_driver {.all.},
+  ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.},
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver/index,
+  ../../../waku/v2/waku_archive/driver/queue_driver/index,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../../../waku/v2/utils/time
 
 

tests/v2/waku_archive/test_driver_queue_index.nim

@@ -6,8 +6,8 @@ import
   testutils/unittests,
   nimcrypto
 import
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver/index,
+  ../../../waku/v2/waku_archive/driver/queue_driver/index,
   ../../../waku/v2/utils/time
 
 

tests/v2/waku_archive/test_driver_queue_pagination.nim

@@ -5,10 +5,10 @@ import
   testutils/unittests,
   libp2p/protobuf/minprotobuf
 import
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver/queue_driver {.all.},
+  ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.},
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver/index,
+  ../../../waku/v2/waku_archive/driver/queue_driver/index,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../../../waku/v2/utils/time,
   ../testlib/common,
   ../testlib/wakucore

tests/v2/waku_archive/test_driver_queue_query.nim

@@ -6,9 +6,9 @@ import
   chronos,
   chronicles
 import
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver,
+  ../../../waku/v2/waku_archive/driver/queue_driver,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_archive/test_driver_sqlite.nim

@@ -6,9 +6,9 @@ import
   chronos
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_archive/test_driver_sqlite_query.nim

@@ -7,9 +7,9 @@ import
   chronicles
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_archive/test_retention_policy.nim

@@ -7,11 +7,11 @@ import
   chronos
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../../waku/v2/protocol/waku_archive/retention_policy,
+  ../../../waku/v2/waku_archive/retention_policy,
-  ../../../waku/v2/protocol/waku_archive/retention_policy/retention_policy_capacity,
+  ../../../waku/v2/waku_archive/retention_policy/retention_policy_capacity,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../../../waku/v2/utils/time,
   ../testlib/common,
   ../testlib/wakucore

tests/v2/waku_archive/test_waku_archive.nim

@@ -7,9 +7,9 @@ import
   libp2p/crypto/crypto
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
   ../../../waku/v2/utils/time,
   ../testlib/common,
   ../testlib/wakucore

tests/v2/waku_filter_v2/test_waku_filter.nim

@@ -8,10 +8,10 @@ import
   libp2p/peerstore
 import
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_filter_v2,
+  ../../../waku/v2/waku_filter_v2,
-  ../../../waku/v2/protocol/waku_filter_v2/client,
+  ../../../waku/v2/waku_filter_v2/client,
-  ../../../waku/v2/protocol/waku_filter_v2/rpc,
+  ../../../waku/v2/waku_filter_v2/rpc,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_filter_v2/test_waku_filter_protocol.nim

@@ -8,10 +8,10 @@ import
   libp2p/peerstore
 import
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_filter_v2,
+  ../../../waku/v2/waku_filter_v2,
-  ../../../waku/v2/protocol/waku_filter_v2/rpc,
+  ../../../waku/v2/waku_filter_v2/rpc,
-  ../../../waku/v2/protocol/waku_filter_v2/subscriptions,
+  ../../../waku/v2/waku_filter_v2/subscriptions,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_relay/test_waku_relay.nim

@@ -10,8 +10,8 @@ import
   libp2p/protocols/pubsub/rpc/messages
 import
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_relay,
+  ../../../waku/v2/waku_relay,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_relay/test_wakunode_relay.nim

@@ -18,12 +18,12 @@ import
   libp2p/multihash,
   secp256k1
 import
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_relay,
+  ../../waku/v2/waku_relay,
-  ../../waku/v2/protocol/waku_relay/validators,
+  ../../waku/v2/waku_relay/validators,
   ../testlib/testutils,
   ../testlib/common,
   ../testlib/wakucore,

tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim

@@ -18,12 +18,12 @@ import
   libp2p/crypto/crypto,
   eth/keys
 import
-  ../../../waku/v2/protocol/waku_rln_relay/protocol_types,
+  ../../../waku/v2/waku_rln_relay/protocol_types,
-  ../../../waku/v2/protocol/waku_rln_relay/constants,
+  ../../../waku/v2/waku_rln_relay/constants,
-  ../../../waku/v2/protocol/waku_rln_relay/contract,
+  ../../../waku/v2/waku_rln_relay/contract,
-  ../../../waku/v2/protocol/waku_rln_relay/rln,
+  ../../../waku/v2/waku_rln_relay/rln,
-  ../../../waku/v2/protocol/waku_rln_relay/conversion_utils,
+  ../../../waku/v2/waku_rln_relay/conversion_utils,
-  ../../../waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager,
+  ../../../waku/v2/waku_rln_relay/group_manager/on_chain/group_manager,
   ../testlib/common,
   ./utils
 

tests/v2/waku_rln_relay/test_rln_group_manager_static.nim

@@ -9,10 +9,10 @@ import
   testutils/unittests,
   stew/results,
   options,
-  ../../../waku/v2/protocol/waku_rln_relay/protocol_types,
+  ../../../waku/v2/waku_rln_relay/protocol_types,
-  ../../../waku/v2/protocol/waku_rln_relay/rln,
+  ../../../waku/v2/waku_rln_relay/rln,
-  ../../../waku/v2/protocol/waku_rln_relay/conversion_utils,
+  ../../../waku/v2/waku_rln_relay/conversion_utils,
-  ../../../waku/v2/protocol/waku_rln_relay/group_manager/static/group_manager
+  ../../../waku/v2/waku_rln_relay/group_manager/static/group_manager
 
 import
   stew/shims/net,

tests/v2/waku_rln_relay/test_waku_rln_relay.nim

@@ -11,11 +11,11 @@ import
   stint,
   libp2p/crypto/crypto
 import
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_rln_relay,
+  ../../../waku/v2/waku_rln_relay,
-  ../../../waku/v2/protocol/waku_rln_relay/rln,
+  ../../../waku/v2/waku_rln_relay/rln,
-  ../../../waku/v2/protocol/waku_rln_relay/protocol_metrics,
+  ../../../waku/v2/waku_rln_relay/protocol_metrics,
-  ../../../waku/v2/protocol/waku_keystore,
+  ../../../waku/v2/waku_keystore,
   ../testlib/common
 
 const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto"

tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim

@@ -15,9 +15,9 @@ import
   eth/keys
 import
   ../../../waku/v2/waku_node,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_rln_relay,
+  ../../../waku/v2/waku_rln_relay,
-  ../../../waku/v2/protocol/waku_keystore,
+  ../../../waku/v2/waku_keystore,
   ../../../waku/v2/utils/peers,
   ../testlib/wakucore,
   ../testlib/wakunode

tests/v2/waku_store/test_resume.nim

@@ -10,8 +10,8 @@ import
   ../../waku/common/sqlite,
   ../../waku/v2/node/message_store/sqlite_store,
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   ./testlib/common,
   ./testlib/switch
 

tests/v2/waku_store/test_rpc_codec.nim

@@ -6,8 +6,8 @@ import
   chronos
 import
   ../../../waku/common/protobuf,
-  ../../../waku/v2/protocol/waku_store/rpc,
+  ../../../waku/v2/waku_store/rpc,
-  ../../../waku/v2/protocol/waku_store/rpc_codec,
+  ../../../waku/v2/waku_store/rpc_codec,
   ../../../waku/v2/utils/time,
   ../testlib/common,
   ../testlib/wakucore

tests/v2/waku_store/test_waku_store.nim

@@ -8,9 +8,9 @@ import
   libp2p/crypto/crypto
 import
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/waku_store,
-  ../../../waku/v2/protocol/waku_store/client,
+  ../../../waku/v2/waku_store/client,
   ../testlib/common,
   ../testlib/wakucore
 

tests/v2/waku_store/test_wakunode_store.nim

@@ -15,11 +15,11 @@ import
 import
   ../../../waku/common/sqlite,
   ../../../waku/v2/node/peer_manager,
-  ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
+  ../../../waku/v2/waku_archive/driver/sqlite_driver,
-  ../../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/waku_store,
-  ../../../waku/v2/protocol/waku_filter,
+  ../../../waku/v2/waku_filter,
   ../../../waku/v2/utils/peers,
   ../../../waku/v2/waku_node,
   ../testlib/common,

tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim

@@ -14,11 +14,11 @@ import
   ../../../waku/v2/waku_node,
   ../../../waku/v2/node/jsonrpc/admin/handlers as admin_api,
   ../../../waku/v2/node/jsonrpc/admin/client as admin_api_client,
-  ../../../waku/v2/protocol/waku_relay,
+  ../../../waku/v2/waku_relay,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver,
+  ../../../waku/v2/waku_archive/driver/queue_driver,
-  ../../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/waku_store,
-  ../../../waku/v2/protocol/waku_filter,
+  ../../../waku/v2/waku_filter,
   ../../../waku/v2/utils/peers,
   ../testlib/wakucore,
   ../testlib/wakunode

tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim

@@ -13,10 +13,10 @@ 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/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_filter,
+  ../../../waku/v2/waku_filter,
-  ../../../waku/v2/protocol/waku_filter/rpc,
+  ../../../waku/v2/waku_filter/rpc,
-  ../../../waku/v2/protocol/waku_filter/client,
+  ../../../waku/v2/waku_filter/client,
   ../../../waku/v2/utils/peers,
   ../testlib/wakucore,
   ../testlib/wakunode

tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim

@@ -14,8 +14,8 @@ 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/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_relay,
+  ../../../waku/v2/waku_relay,
   ../../../waku/v2/utils/compat,
   ../../../waku/v2/utils/peers,
   ../testlib/common,

tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim

@@ -12,11 +12,11 @@ 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/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver,
+  ../../../waku/v2/waku_archive/driver/queue_driver,
-  ../../../waku/v2/protocol/waku_store,
+  ../../../waku/v2/waku_store,
-  ../../../waku/v2/protocol/waku_store/rpc,
+  ../../../waku/v2/waku_store/rpc,
   ../../../waku/v2/utils/peers,
   ../../../waku/v2/utils/time,
   ../../v2/testlib/common,

tests/v2/wakunode_rest/test_rest_relay.nim

@@ -17,8 +17,8 @@ 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/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_relay,
+  ../../waku/v2/waku_relay,
   ../../waku/v2/utils/time,
   ../testlib/wakucore,
   ../testlib/wakunode

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/protocol/waku_message
+  ../../waku/v2/waku_message
 
 
 

tests/v2/wakunode_rest/test_rest_store.nim

@@ -17,10 +17,10 @@ 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/protocol/waku_message,
+  ../../../waku/v2/waku_message,
-  ../../../waku/v2/protocol/waku_archive,
+  ../../../waku/v2/waku_archive,
-  ../../../waku/v2/protocol/waku_archive/driver/queue_driver,
+  ../../../waku/v2/waku_archive/driver/queue_driver,
-  ../../../waku/v2/protocol/waku_store as waku_store,
+  ../../../waku/v2/waku_store as waku_store,
   ../../../waku/v2/utils/peers,
   ../../../waku/v2/utils/time,
   ../../v2/testlib/common,

tests/wakubridge/test_message_compat.nim

@@ -7,7 +7,7 @@ import
   chronos,
   libp2p/switch
 import
-  ../../waku/v2/protocol/waku_message
+  ../../waku/v2/waku_message
 
 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/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/waku_node,
   ../../waku/v2/utils/compat,
   ../../waku/v2/utils/peers,

tools/networkmonitor/networkmonitor.nim

@@ -22,10 +22,10 @@ import
   ../../apps/wakunode2/wakunode2,
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/waku_node,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
-  ../../waku/v2/protocol/waku_enr,
+  ../../waku/v2/waku_enr,
-  ../../waku/v2/protocol/waku_discv5,
+  ../../waku/v2/waku_discv5,
-  ../../waku/v2/protocol/waku_dnsdisc,
+  ../../waku/v2/waku_dnsdisc,
   ../../waku/v2/utils/peers,
   ./networkmonitor_metrics,
   ./networkmonitor_config,

tools/scripts/rpc_info.nim

@@ -9,8 +9,8 @@ import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/node/jsonrpc/jsonrpc_types,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   ../../waku/v1/node/rpc/hexstrings
 
 from strutils import rsplit

tools/scripts/rpc_publish.nim

@@ -9,8 +9,8 @@ import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/node/jsonrpc/jsonrpc_types,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   ../../waku/v1/node/rpc/hexstrings
 
 from strutils import rsplit

tools/scripts/rpc_query.nim

@@ -9,8 +9,8 @@ import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/node/jsonrpc/jsonrpc_types,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store/rpc,
+  ../../waku/v2/waku_store/rpc,
   ../../waku/v1/node/rpc/hexstrings
 
 

tools/scripts/rpc_subscribe.nim

@@ -8,8 +8,8 @@ import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/node/jsonrpc/jsonrpc_types,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   ../../waku/v1/node/rpc/hexstrings
 
 

tools/scripts/rpc_subscribe_filter.nim

@@ -9,8 +9,8 @@ import
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/node/jsonrpc/jsonrpc_types,
-  ../../waku/v2/protocol/waku_filter,
+  ../../waku/v2/waku_filter,
-  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/waku_store,
   ../../waku/v1/node/rpc/hexstrings
 
 from strutils import rsplit

tools/simulation/quicksim2.nim

@@ -6,9 +6,9 @@ import
   json_rpc/[rpcclient, rpcserver],
   libp2p/protobuf/minprotobuf
 import
-  ../../waku/v2/protocol/waku_filter/rpc,
+  ../../waku/v2/waku_filter/rpc,
-  ../../waku/v2/protocol/waku_store/rpc,
+  ../../waku/v2/waku_store/rpc,
-  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/waku_message,
   ../../waku/v2/utils/time,
   ../../waku/v2/waku_node,
   ../../waku/v2/node/waku_payload,

waku/v2/node/builder.nim

@@ -12,8 +12,8 @@ import
   libp2p/builders,
   libp2p/nameresolving/nameresolver
 import
-  ../protocol/waku_enr,
+  ../waku_enr,
-  ../protocol/waku_discv5,
+  ../waku_discv5,
   ./config,
   ./peer_manager,
   ./waku_node

waku/v2/node/config.nim

@@ -9,7 +9,7 @@ import
   stew/shims/net,
   libp2p/multiaddress
 import
-  ../protocol/waku_enr
+  ../waku_enr
 
 
 type NetConfig* = object

waku/v2/node/jsonrpc/admin/handlers.nim

@@ -9,9 +9,9 @@ import
   json_rpc/rpcserver,
   libp2p/[peerinfo, switch]
 import
-  ../../../protocol/waku_store,
+  ../../../waku_store,
-  ../../../protocol/waku_filter,
+  ../../../waku_filter,
-  ../../../protocol/waku_relay,
+  ../../../waku_relay,
   ../../peer_manager,
   ../../waku_node,
   ./types

waku/v2/node/jsonrpc/filter/client.nim

@@ -7,8 +7,8 @@ import
   std/[os, strutils],
   json_rpc/rpcclient
 import
-  ../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../protocol/waku_filter/rpc
+  ../../../waku_filter/rpc
 
 template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0]
 

waku/v2/node/jsonrpc/filter/handlers.nim

@@ -8,10 +8,10 @@ import
   chronicles,
   json_rpc/rpcserver
 import
-  ../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../protocol/waku_filter,
+  ../../../waku_filter,
-  ../../../protocol/waku_filter/rpc,
+  ../../../waku_filter/rpc,
-  ../../../protocol/waku_filter/client,
+  ../../../waku_filter/client,
   ../../message_cache,
   ../../peer_manager,
   ../../waku_node

waku/v2/node/jsonrpc/message.nim

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

waku/v2/node/jsonrpc/relay/client.nim

@@ -7,7 +7,7 @@ import
   std/[os, strutils],
   json_rpc/rpcclient
 import
-  ../../../protocol/waku_message,
+  ../../../waku_message,
   ../../../utils/compat,
   ./types
 

waku/v2/node/jsonrpc/relay/handlers.nim

@@ -11,8 +11,8 @@ import
   nimcrypto/sysrand
 import
   ../../../../common/base64,
-  ../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../protocol/waku_relay,
+  ../../../waku_relay,
   ../../../utils/compat,
   ../../../utils/time,
   ../../waku_node,

waku/v2/node/jsonrpc/store/client.nim

@@ -7,7 +7,7 @@ import
   std/[os, strutils],
   json_rpc/rpcclient
 import
-  ../../../protocol/waku_store/rpc,
+  ../../../waku_store/rpc,
   ../../../utils/time,
   ./types
 

waku/v2/node/jsonrpc/store/handlers.nim

@@ -8,8 +8,8 @@ import
   chronicles,
   json_rpc/rpcserver
 import
-  ../../../protocol/waku_store,
+  ../../../waku_store,
-  ../../../protocol/waku_store/rpc,
+  ../../../waku_store/rpc,
   ../../../utils/time,
   ../../waku_node,
   ../../peer_manager,

waku/v2/node/jsonrpc/store/types.nim

@@ -6,7 +6,7 @@ else:
 import
   std/options
 import
-  ../../../protocol/waku_store/rpc,
+  ../../../waku_store/rpc,
   ../message
 
 export message

waku/v2/node/message_cache.nim

@@ -10,9 +10,9 @@ import
   chronos,
   libp2p/protocols/pubsub
 import
-  ../protocol/waku_message
+  ../waku_message
 
-logScope: 
+logScope:
   topics = "waku node message_cache"
 
 const DefaultMessageCacheCapacity*: uint = 30 # Max number of messages cached per topic @TODO make this configurable
@@ -27,7 +27,7 @@ type MessageCache*[K] = ref object
 func init*[K](T: type MessageCache[K], capacity=DefaultMessageCacheCapacity): T =
   MessageCache[K](
     capacity: capacity,
-    table: initTable[K, seq[WakuMessage]]() 
+    table: initTable[K, seq[WakuMessage]]()
   )
 
 
@@ -39,7 +39,7 @@ proc subscribe*[K](t: MessageCache[K], topic: K) =
     return
   t.table[topic] = @[]
 
-proc unsubscribe*[K](t: MessageCache[K], topic: K) = 
+proc unsubscribe*[K](t: MessageCache[K], topic: K) =
   if not t.isSubscribed(topic):
     return
   t.table.del(topic)
@@ -55,10 +55,10 @@ proc addMessage*[K](t: MessageCache, topic: K, msg: WakuMessage) =
   if messages.len >= t.capacity.int:
     trace "Topic cache capacity reached", topic=topic
     # Message cache on this topic exceeds maximum. Delete oldest.
-    # TODO: this may become a bottle neck if called as the norm rather than 
+    # TODO: this may become a bottle neck if called as the norm rather than
     #  exception when adding messages. Performance profile needed.
     messages.delete(0,0)
-  
+
   messages.add(msg)
 
   # Replace indexed entry with copy

waku/v2/node/peer_manager/peer_manager.nim

@@ -12,7 +12,7 @@ import
   libp2p/multistream,
   libp2p/muxers/muxer
 import
-  ../../protocol/waku_relay,
+  ../../waku_relay,
   ../../utils/peers,
   ../../utils/heartbeat,
   ./peer_store/peer_storage,

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

@@ -11,7 +11,7 @@ import
   json_serialization/std/options,
   presto/[route, client, common]
 import
-  ../../../protocol/waku_message,
+  ../../../waku_message,
   ../serdes,
   ../responses,
   ./types

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

@@ -7,8 +7,8 @@ import
   chronos,
   chronicles
 import
-  ../../../protocol/waku_relay,
+  ../../../waku_relay,
-  ../../../protocol/waku_message,
+  ../../../waku_message,
   ../../message_cache
 
 export message_cache

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

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

waku/v2/node/rest/store/client.nim

@@ -9,7 +9,7 @@ import
   json_serialization/std/options,
   presto/[route, client]
 import
-  ../../../protocol/waku_store/common,
+  ../../../waku_store/common,
   ../serdes,
   ../responses,
   ./types

waku/v2/node/rest/store/handlers.nim

@@ -11,8 +11,8 @@ import
   presto/route
 import
   ../../../../common/base64,
-  ../../../protocol/waku_message/topics/content_topic,
+  ../../../waku_message/topics/content_topic,
-  ../../../protocol/waku_store/common,
+  ../../../waku_store/common,
   ../../../utils/time,
   ../../waku_node,
   ../../peer_manager,

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

@@ -11,12 +11,12 @@ import
   json_serialization/std/options,
   presto/[route, client, common]
 import
-  ../../../protocol/waku_store/common as waku_store_common,
+  ../../../waku_store/common as waku_store_common,
   ../../../../common/base64,
   ../../../utils/time,
-  ../../../protocol/waku_message/topics/content_topic,
+  ../../../waku_message/topics/content_topic,
-  ../../../protocol/waku_message/topics/pubsub_topic,
+  ../../../waku_message/topics/pubsub_topic,
-  ../../../protocol/waku_message/message,
+  ../../../waku_message/message,
   ../serdes
 
 
@@ -30,7 +30,7 @@ type
     digest*: MessageDigest
 
   StoreRequestRest* = object
-    # inspired by https://github.com/waku-org/nwaku/blob/f95147f5b7edfd45f914586f2d41cd18fb0e0d18/waku/v2/protocol/waku_store/common.nim#L52
+    # inspired by https://github.com/waku-org/nwaku/blob/f95147f5b7edfd45f914586f2d41cd18fb0e0d18/waku/v2//waku_store/common.nim#L52
     pubsubTopic*: Option[PubsubTopic]
     contentTopics*: seq[ContentTopic]
     cursor*: Option[HistoryCursorRest]
@@ -71,7 +71,7 @@ proc parseMsgDigest*(input: Option[string]):
     return err(base64Decoded.error)
 
   let base64DecodedArr = base64Decoded.get()
-  # Next snippet inspired by "nwaku/waku/v2/protocol/waku_archive/archive.nim"
+  # Next snippet inspired by "nwaku/waku/v2/waku_archive/archive.nim"
   # TODO: Improve coherence of MessageDigest type
   messageDigest = block:
       var data: array[32, byte]

waku/v2/node/waku_metrics.nim

@@ -10,13 +10,13 @@ import
   metrics,
   metrics/chronos_httpserver
 import
-  ../protocol/waku_filter/protocol_metrics as filter_metrics,
+  ../waku_filter/protocol_metrics as filter_metrics,
   ../utils/collector,
   ./peer_manager,
   ./waku_node
 
 when defined(rln):
-  import ../protocol/waku_rln_relay/protocol_metrics as rln_metrics
+  import ../waku_rln_relay/protocol_metrics as rln_metrics
 
 
 const LogInterval = 30.seconds

waku/v2/node/waku_node.nim

@@ -24,20 +24,20 @@ import
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport
 import
-  ../protocol/waku_message,
+  ../waku_message,
-  ../protocol/waku_relay,
+  ../waku_relay,
-  ../protocol/waku_archive,
+  ../waku_archive,
-  ../protocol/waku_store,
+  ../waku_store,
-  ../protocol/waku_store/client as store_client,
+  ../waku_store/client as store_client,
-  ../protocol/waku_filter as legacy_filter,  #TODO: support for legacy filter protocol will be removed
+  ../waku_filter as legacy_filter,  #TODO: support for legacy filter protocol will be removed
-  ../protocol/waku_filter/client as filter_client, #TODO: support for legacy filter protocol will be removed
+  ../waku_filter/client as filter_client, #TODO: support for legacy filter protocol will be removed
-  ../protocol/waku_filter_v2,
+  ../waku_filter_v2,
-  ../protocol/waku_lightpush,
+  ../waku_lightpush,
-  ../protocol/waku_lightpush/client as lightpush_client,
+  ../waku_lightpush/client as lightpush_client,
-  ../protocol/waku_enr,
+  ../waku_enr,
-  ../protocol/waku_dnsdisc,
+  ../waku_dnsdisc,
-  ../protocol/waku_discv5,
+  ../waku_discv5,
-  ../protocol/waku_peer_exchange,
+  ../waku_peer_exchange,
   ../utils/peers,
   ../utils/time,
   ./config,
@@ -46,7 +46,7 @@ import
 
 when defined(rln):
   import
-    ../protocol/waku_rln_relay
+    ../waku_rln_relay
 
 declarePublicGauge waku_version, "Waku version info (in git describe format)", ["version"]
 declarePublicCounter waku_node_messages, "number of messages received", ["type"]

waku/v2/protocol/README.md

@@ -1,3 +0,0 @@
-# Waku v2 protocol
-
-This folder contains implementations of [Waku v2 protocols](https://specs.vac.dev/specs/waku/v2/waku-v2.html).

waku/v2/utils/compat.nim

@@ -10,7 +10,7 @@ import
   eth/keys
 import
   ../../whisper/whisper_types,
-  ../protocol/waku_message
+  ../waku_message
 
 export whisper_types, keys, options
 

waku/v2/utils/noise.nim

@@ -6,9 +6,9 @@ else:
 import
   stew/results
 import
-  ../protocol/waku_message,
+  ../waku_message,
-  ../protocol/waku_noise/noise_types,
+  ../waku_noise/noise_types,
-  ../protocol/waku_noise/noise_utils
+  ../waku_noise/noise_utils
 
 
 # Decodes a WakuMessage to a PayloadV2

waku/v2/waku_archive/archive.nim

@@ -11,7 +11,7 @@ import
   chronos,
   metrics
 import
-  ../../utils/time,
+  ../utils/time,
   ../waku_message,
   ./common,
   ./archive_metrics,

waku/v2/waku_archive/common.nim

@@ -9,7 +9,7 @@ import
   stew/byteutils,
   nimcrypto/sha2
 import
-  ../../utils/time,
+  ../utils/time,
   ../waku_message
 
 

waku/v2/waku_archive/driver.nim

@@ -7,7 +7,7 @@ import
   std/options,
   stew/results
 import
-  ../../utils/time,
+  ../utils/time,
   ../waku_message,
   ./common
 

waku/v2/waku_archive/driver/queue_driver/index.nim

@@ -7,8 +7,8 @@ import
   stew/byteutils,
   nimcrypto/sha2
 import
-  ../../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../../utils/time,
+  ../../../utils/time,
   ../../common
 
 

waku/v2/waku_archive/driver/queue_driver/queue_driver.nim

@@ -9,8 +9,8 @@ import
   stew/sorted_set,
   chronicles
 import
-  ../../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../../utils/time,
+  ../../../utils/time,
   ../../common,
   ../../driver,
   ./index

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

@@ -5,8 +5,8 @@ else:
 
 
 import
-  ../../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../../utils/time,
+  ../../../utils/time,
   ../../common
 
 type DbCursor* = (Timestamp, seq[byte], PubsubTopic)

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

@@ -5,17 +5,17 @@ import
   stew/results,
   chronicles
 import
-  ../../../../../common/sqlite,
+  ../../../../common/sqlite,
-  ../../../../../common/sqlite/migrations
+  ../../../../common/sqlite/migrations
 
 
 logScope:
-  topics = "message_store.migration"
+  topics = "waku archive migration"
 
 
 const SchemaVersion* = 7 # increase this when there is an update in the database schema
 
-template projectRoot: string = currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / ".." / ".." / ".."
+template projectRoot: string = currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / ".." / ".."
 const MessageStoreMigrationPath: string = projectRoot / "migrations" / "message_store"
 
 

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

@@ -9,9 +9,9 @@ import
   stew/[results, byteutils],
   sqlite3_abi
 import
-  ../../../../../common/sqlite,
+  ../../../../common/sqlite,
-  ../../../../protocol/waku_message,
+  ../../../waku_message,
-  ../../../../utils/time,
+  ../../../utils/time,
   ./cursor