WIP fixing import after folder moves, wakunode2, tests compiling

logos_delivery/channels/events.nim

@@ -9,7 +9,7 @@
 ## no analogue in the lower layer (reassembled application payload,
 ## senderId, channelId), so it lives here.
 
-import waku/events/message_events as waku_message_events
+import logos_delivery/waku/events/message_events as waku_message_events
 import brokers/event_broker
 
 import ./types as channel_types

logos_delivery/channels/reliable_channel.nim

@@ -20,9 +20,9 @@ import bearssl/rand
 import stew/byteutils
 import libp2p/crypto/crypto as libp2p_crypto
 
-import waku/api/types
-import messaging/delivery_service/send_service
-import waku/waku_core/topics
+import logos_delivery/waku/api/types
+import logos_delivery/messaging/delivery_service/send_service
+import logos_delivery/waku/waku_core/topics
 
 import ./events
 import ./segmentation/segmentation

logos_delivery/channels/reliable_channel_manager.nim

@@ -12,9 +12,9 @@ import stew/byteutils
 
 import brokers/broker_context
 
-import waku/events/message_events as waku_message_events
-import messaging/messaging_client
-import waku/waku_core/topics
+import logos_delivery/waku/events/message_events as waku_message_events
+import logos_delivery/messaging/messaging_client
+import logos_delivery/waku/waku_core/topics
 
 import ./reliable_channel
 import ./encryption/noop_encryption

logos_delivery/channels/types.nim

@@ -1,7 +1,7 @@
 ## Core identifier types for the Reliable Channel API.
 
 import std/hashes
-import waku/api/types as api_types
+import logos_delivery/waku/api/types as api_types
 
 import ./scalable_data_sync/scalable_data_sync
 

logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim

@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import std/[tables, strutils, os], results, chronicles
-import waku/common/databases/db_sqlite, waku/common/databases/common
+import logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/common/databases/common
 
 logScope:
   topics = "waku node delivery_service"

logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim

@@ -9,7 +9,7 @@
 
 import results
 import
-  waku/common/databases/db_sqlite, waku/waku_core/message/message, ./migrations
+  logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/waku_core/message/message, ./migrations
 
 const NotDeliveredMessagesDbUrl = "not-delivered-messages.db"
 

logos_delivery/messaging/delivery_service/recv_service/recv_service.nim

@@ -6,7 +6,7 @@ import std/[tables, sequtils, options, sets]
 import chronos, chronicles, libp2p/utility
 import brokers/broker_context
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_core/topics,
     waku_store/client,

logos_delivery/messaging/delivery_service/send_service/delivery_task.nim

@@ -1,6 +1,6 @@
 import std/[options, times], chronos
 import brokers/broker_context
-import waku/waku_core, waku/api/types, waku/requests/node_requests
+import logos_delivery/waku/waku_core, logos_delivery/waku/api/types, logos_delivery/waku/requests/node_requests
 
 type DeliveryState* {.pure.} = enum
   Entry

logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim

@@ -1,7 +1,7 @@
 import chronicles, chronos, results
 import std/options
 import brokers/broker_context
-import waku/node/peer_manager, waku/waku_core, waku/waku_lightpush/[common, client, rpc]
+import logos_delivery/waku/node/peer_manager, logos_delivery/waku/waku_core, logos_delivery/waku/waku_lightpush/[common, client, rpc]
 
 import ./[delivery_task, send_processor]
 

logos_delivery/messaging/delivery_service/send_service/relay_processor.nim

@@ -1,9 +1,9 @@
 import std/options
 import chronos, chronicles
 import brokers/broker_context
-import waku/[waku_core], waku/waku_lightpush/[common, rpc]
-import waku/requests/health_requests
-import waku/api/types
+import logos_delivery/waku/[waku_core], logos_delivery/waku/waku_lightpush/[common, rpc]
+import logos_delivery/waku/requests/health_requests
+import logos_delivery/waku/api/types
 import ./[delivery_task, send_processor]
 
 logScope:

logos_delivery/messaging/delivery_service/send_service/send_service.nim

@@ -6,7 +6,7 @@ import chronos, chronicles, libp2p/utility
 import brokers/broker_context
 import
   ./[send_processor, relay_processor, lightpush_processor, delivery_task],
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     node/waku_node,
     node/subscription_manager,

logos_delivery/messaging/messaging_client.nim

@@ -1,10 +1,10 @@
 import results, chronos
 import chronicles
 import
-  waku/api/types,
-  waku/node/[waku_node, subscription_manager],
-  messaging/delivery_service/[recv_service, send_service],
-  messaging/delivery_service/send_service/delivery_task
+  logos_delivery/waku/api/types,
+  logos_delivery/waku/node/[waku_node, subscription_manager],
+  logos_delivery/messaging/delivery_service/[recv_service, send_service],
+  logos_delivery/messaging/delivery_service/send_service/delivery_task
 
 type MessagingClient* = ref object
   node: WakuNode

logos_delivery/waku/api/api.nim

@@ -1,12 +1,12 @@
 import chronicles, chronos, results
 
-import waku/factory/waku
-import messaging/messaging_client
-import waku/[requests/health_requests, waku_core, waku_node]
-import messaging/delivery_service/send_service
-import waku/node/subscription_manager
+import logos_delivery/waku/factory/waku
+import logos_delivery/messaging/messaging_client
+import logos_delivery/waku/[requests/health_requests, waku_core, waku_node]
+import logos_delivery/messaging/delivery_service/send_service
+import logos_delivery/waku/node/subscription_manager
 import libp2p/peerid
-import ../../tools/confutils/cli_args
+import tools/confutils/cli_args
 import ./[api_conf, types]
 
 export cli_args

logos_delivery/waku/api/api_conf.nim

@@ -4,11 +4,11 @@ import results
 import json_serialization, json_serialization/std/options as json_options
 
 import
-  waku/common/utils/parse_size_units,
-  waku/common/logging,
-  waku/factory/waku_conf,
-  waku/factory/conf_builder/conf_builder,
-  waku/factory/networks_config,
+  logos_delivery/waku/common/utils/parse_size_units,
+  logos_delivery/waku/common/logging,
+  logos_delivery/waku/factory/waku_conf,
+  logos_delivery/waku/factory/conf_builder/conf_builder,
+  logos_delivery/waku/factory/networks_config,
   tools/confutils/entry_nodes
 
 export json_serialization, json_options

logos_delivery/waku/api/types.nim

@@ -2,9 +2,9 @@
 
 import bearssl/rand, std/times, chronos
 import stew/byteutils
-import waku/utils/requests as request_utils
-import waku/waku_core/[topics/content_topic, message/message, time]
-import waku/requests/requests
+import logos_delivery/waku/utils/requests as request_utils
+import logos_delivery/waku/waku_core/[topics/content_topic, message/message, time]
+import logos_delivery/waku/requests/requests
 
 type
   MessageEnvelope* = object

logos_delivery/waku/common/callbacks.nim

@@ -1,4 +1,4 @@
-import waku/waku_enr/capabilities, waku/waku_rendezvous/waku_peer_record
+import logos_delivery/waku/waku_enr/capabilities, logos_delivery/waku/waku_rendezvous/waku_peer_record
 
 type GetShards* = proc(): seq[uint16] {.closure, gcsafe, raises: [].}
 

logos_delivery/waku/discovery/waku_discv5.nim

@@ -10,7 +10,7 @@ import
   eth/keys as eth_keys,
   eth/p2p/discoveryv5/node,
   eth/p2p/discoveryv5/protocol
-import waku/[net/auto_port, node/peer_manager/peer_manager, waku_core, waku_enr]
+import logos_delivery/waku/[net/auto_port, node/peer_manager/peer_manager, waku_core, waku_enr]
 
 export protocol, waku_enr
 

logos_delivery/waku/discovery/waku_kademlia.nim

@@ -13,7 +13,7 @@ import
   libp2p/protocols/kademlia_discovery/types as kad_types,
   libp2p/protocols/mix/mix_protocol
 
-import waku/waku_core, waku/node/peer_manager
+import logos_delivery/waku/waku_core, logos_delivery/waku/node/peer_manager
 
 logScope:
   topics = "waku extended kademlia discovery"

logos_delivery/waku/events/delivery_events.nim

@@ -1,5 +1,5 @@
 import brokers/event_broker
-import waku/waku_core/[message/message, message/digest]
+import logos_delivery/waku/waku_core/[message/message, message/digest]
 
 EventBroker:
   type OnFilterSubscribeEvent* = object

logos_delivery/waku/events/health_events.nim

@@ -1,8 +1,8 @@
 import brokers/event_broker
 
-import waku/api/types
-import waku/node/health_monitor/[protocol_health, topic_health]
-import waku/waku_core/topics
+import logos_delivery/waku/api/types
+import logos_delivery/waku/node/health_monitor/[protocol_health, topic_health]
+import logos_delivery/waku/waku_core/topics
 
 export protocol_health, topic_health
 

logos_delivery/waku/events/message_events.nim

@@ -1,5 +1,5 @@
 import brokers/event_broker
-import waku/[api/types, waku_core/message, waku_core/topics]
+import logos_delivery/waku/[api/types, waku_core/message, waku_core/topics]
 export types
 
 EventBroker:

logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim

@@ -1,6 +1,6 @@
 import chronicles, std/options, results
 import libp2p/[peerid, multiaddress, peerinfo]
-import waku/factory/waku_conf
+import logos_delivery/waku/factory/waku_conf
 
 logScope:
   topics = "waku conf builder kademlia discovery"

logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim

@@ -1,6 +1,6 @@
 import chronicles, std/options, results
 import libp2p/crypto/crypto, libp2p/crypto/curve25519, libp2p/protocols/mix/curve25519
-import ../waku_conf, waku/waku_mix
+import ../waku_conf, logos_delivery/waku/waku_mix
 
 logScope:
   topics = "waku conf builder mix"

logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim

@@ -1,5 +1,5 @@
 import chronicles, std/[net, options], results
-import waku/common/rate_limit/setting
+import logos_delivery/waku/common/rate_limit/setting
 
 logScope:
   topics = "waku conf builder rate limit"

logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim

@@ -8,7 +8,7 @@ import
   results
 
 import
-  waku/[
+  logos_delivery/waku/[
     factory/waku_conf,
     factory/networks_config,
     common/logging,

logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim

@@ -1,5 +1,5 @@
 import chronicles, std/[net, options], results
-import waku/factory/waku_conf
+import logos_delivery/waku/factory/waku_conf
 
 logScope:
   topics = "waku conf builder websocket"

logos_delivery/waku/factory/internal_config.nim

@@ -8,7 +8,7 @@ import
   std/[options, sequtils, net],
   results
 
-import waku/[common/utils/nat, net/net_config, waku_enr, waku_core], ./waku_conf
+import logos_delivery/waku/[common/utils/nat, net/net_config, waku_enr, waku_core], ./waku_conf
 
 proc tryBuildEnrRecord(
     conf: WakuConf, netConfig: NetConfig, multiaddrs: seq[MultiAddress]

logos_delivery/waku/factory/waku.nim

@@ -19,7 +19,7 @@ import
   metrics,
   metrics/chronos_httpserver,
   brokers/broker_context,
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_node,
     waku_archive,
@@ -48,8 +48,8 @@ import
     factory/app_callbacks,
     persistency/persistency,
   ],
-  channels/reliable_channel_manager,
-  messaging/messaging_client,
+  logos_delivery/channels/reliable_channel_manager,
+  logos_delivery/messaging/messaging_client,
   ./waku_conf,
   ./waku_state_info
 

logos_delivery/waku/factory/waku_state_info.nim

@@ -6,7 +6,7 @@
 
 import std/[tables, sequtils, strutils]
 import metrics, eth/p2p/discoveryv5/enr, libp2p/peerid, stew/byteutils
-import waku/[waku_node, net/bound_ports]
+import logos_delivery/waku/[waku_node, net/bound_ports]
 
 type
   NodeInfoId* {.pure.} = enum

logos_delivery/waku/incentivization/common.nim

@@ -1,6 +1,6 @@
 import std/options
 
-import waku/incentivization/rpc
+import logos_delivery/waku/incentivization/rpc
 
 proc init*(T: type EligibilityStatus, isEligible: bool): T =
   if isEligible:

logos_delivery/waku/incentivization/eligibility_manager.nim

@@ -1,6 +1,6 @@
 import std/[options, sets], chronos, web3, stew/byteutils, stint, results, chronicles
 
-import waku/incentivization/rpc, tests/waku_rln_relay/utils_onchain
+import logos_delivery/waku/incentivization/rpc, tests/waku_rln_relay/utils_onchain
 
 const SimpleTransferGasUsed = Quantity(21000)
 const TxReceiptQueryTimeout = 3.seconds

logos_delivery/waku/node/health_monitor/node_health_monitor.nim

@@ -7,7 +7,7 @@ import
   libp2p/protocols/rendezvous,
   libp2p/protocols/pubsub,
   libp2p/protocols/pubsub/rpc/messages,
-  waku/[
+  logos_delivery/waku/[
     waku_relay,
     waku_rln_relay,
     api/types,

logos_delivery/waku/node/health_monitor/online_monitor.nim

@@ -1,7 +1,7 @@
 import std/sequtils
 import chronos, chronicles, libp2p/nameresolving/dnsresolver, libp2p/peerstore
 
-import ../peer_manager/waku_peer_store, waku/waku_core/peers
+import ../peer_manager/waku_peer_store, logos_delivery/waku/waku_core/peers
 
 type
   OnOnlineStateChange* = proc(online: bool) {.gcsafe, raises: [].}

logos_delivery/waku/node/health_monitor/protocol_health.nim

@@ -1,6 +1,6 @@
 import std/[options, strformat]
 import ./health_status
-import waku/common/waku_protocol
+import logos_delivery/waku/common/waku_protocol
 
 export waku_protocol
 

logos_delivery/waku/node/health_monitor/topic_health.nim

@@ -1,6 +1,6 @@
 import chronos
 
-import waku/waku_core
+import logos_delivery/waku/waku_core
 
 type TopicHealth* = enum
   UNHEALTHY

logos_delivery/waku/node/peer_manager/peer_manager.nim

@@ -11,7 +11,7 @@ import
   brokers/broker_context
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_relay,
     waku_metadata,

logos_delivery/waku/node/subscription_manager.nim

@@ -3,7 +3,7 @@ import libp2p/[peerid, peerinfo]
 import brokers/broker_context
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_core/topics/sharding,
     node/waku_node,

logos_delivery/waku/node/waku_metrics.nim

@@ -2,7 +2,7 @@
 
 import chronicles, chronos, metrics, metrics/chronos_httpserver
 import
-  waku/[net/auto_port, waku_rln_relay/protocol_metrics as rln_metrics, utils/collector],
+  logos_delivery/waku/[net/auto_port, waku_rln_relay/protocol_metrics as rln_metrics, utils/collector],
   ./peer_manager,
   ./node_telemetry,
   ./waku_node

logos_delivery/waku/node/waku_node.nim

@@ -29,7 +29,7 @@ import
   brokers/request_broker
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_core/topics/sharding,
     waku_relay,
@@ -62,8 +62,8 @@ import
     events/message_events,
     events/peer_events,
   ],
-  waku/discovery/waku_kademlia,
-  waku/net/[bound_ports, net_config],
+  logos_delivery/waku/discovery/waku_kademlia,
+  logos_delivery/waku/net/[bound_ports, net_config],
   ./peer_manager,
   ./health_monitor/health_status,
   ./health_monitor/topic_health,

logos_delivery/waku/node/waku_node/relay.nim

@@ -20,7 +20,7 @@ import
   brokers/broker_context
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_relay,
     waku_core,
     waku_core/topics/sharding,

logos_delivery/waku/requests/health_requests.nim

@@ -1,9 +1,9 @@
 import brokers/request_broker
 
-import waku/api/types
-import waku/node/health_monitor/[protocol_health, topic_health, health_report]
-import waku/waku_core/topics
-import waku/common/waku_protocol
+import logos_delivery/waku/api/types
+import logos_delivery/waku/node/health_monitor/[protocol_health, topic_health, health_report]
+import logos_delivery/waku/waku_core/topics
+import logos_delivery/waku/common/waku_protocol
 
 export protocol_health, topic_health
 

logos_delivery/waku/requests/node_requests.nim

@@ -1,6 +1,6 @@
 import std/options
 import brokers/[request_broker, multi_request_broker]
-import waku/waku_core/[topics]
+import logos_delivery/waku/waku_core/[topics]
 
 RequestBroker(sync):
   type RequestRelayShard* = object

logos_delivery/waku/requests/rln_requests.nim

@@ -1,5 +1,5 @@
 import brokers/request_broker
-import waku/waku_core/message/message
+import logos_delivery/waku/waku_core/message/message
 
 RequestBroker:
   type RequestGenerateRlnProof* = object

logos_delivery/waku/rest_api/endpoint/admin/handlers.nim

@@ -9,7 +9,7 @@ import
   libp2p/[peerinfo, switch, peerid, protocols/pubsub/pubsubpeer]
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_core/topics/pubsub_topic,
     waku_store/common,

logos_delivery/waku/rest_api/endpoint/admin/types.nim

@@ -7,7 +7,7 @@ import
   json_serialization/lexer,
   results,
   libp2p/protocols/pubsub/pubsubpeer
-import waku/[waku_core, node/peer_manager], ../serdes
+import logos_delivery/waku/[waku_core, node/peer_manager], ../serdes
 
 #### Types
 type WakuPeer* = object

logos_delivery/waku/rest_api/endpoint/builder.nim

@@ -3,22 +3,22 @@
 import net, tables
 import presto
 import
-  waku/waku_node,
-  waku/node/health_monitor,
-  waku/discovery/waku_discv5,
-  waku/rest_api/message_cache,
-  waku/rest_api/handlers,
-  waku/rest_api/endpoint/server,
-  waku/rest_api/endpoint/debug/handlers as rest_debug_endpoint,
-  waku/rest_api/endpoint/relay/handlers as rest_relay_endpoint,
-  waku/rest_api/endpoint/filter/handlers as rest_filter_endpoint,
-  waku/rest_api/endpoint/legacy_lightpush/handlers as rest_legacy_lightpush_endpoint,
-  waku/rest_api/endpoint/lightpush/handlers as rest_lightpush_endpoint,
-  waku/rest_api/endpoint/store/handlers as rest_store_endpoint,
-  waku/rest_api/endpoint/health/handlers as rest_health_endpoint,
-  waku/rest_api/endpoint/admin/handlers as rest_admin_endpoint,
-  waku/waku_core/topics,
-  waku/waku_relay/protocol
+  logos_delivery/waku/waku_node,
+  logos_delivery/waku/node/health_monitor,
+  logos_delivery/waku/discovery/waku_discv5,
+  logos_delivery/waku/rest_api/message_cache,
+  logos_delivery/waku/rest_api/handlers,
+  logos_delivery/waku/rest_api/endpoint/server,
+  logos_delivery/waku/rest_api/endpoint/debug/handlers as rest_debug_endpoint,
+  logos_delivery/waku/rest_api/endpoint/relay/handlers as rest_relay_endpoint,
+  logos_delivery/waku/rest_api/endpoint/filter/handlers as rest_filter_endpoint,
+  logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers as rest_legacy_lightpush_endpoint,
+  logos_delivery/waku/rest_api/endpoint/lightpush/handlers as rest_lightpush_endpoint,
+  logos_delivery/waku/rest_api/endpoint/store/handlers as rest_store_endpoint,
+  logos_delivery/waku/rest_api/endpoint/health/handlers as rest_health_endpoint,
+  logos_delivery/waku/rest_api/endpoint/admin/handlers as rest_admin_endpoint,
+  logos_delivery/waku/waku_core/topics,
+  logos_delivery/waku/waku_relay/protocol
 
 ## Monitoring and external interfaces
 

logos_delivery/waku/rest_api/endpoint/health/client.nim

@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import chronicles, json_serialization, presto/[route, client]
-import ./types, ../serdes, ../rest_serdes, waku/node/health_monitor
+import ./types, ../serdes, ../rest_serdes, logos_delivery/waku/node/health_monitor
 
 logScope:
   topics = "waku node rest health_api"

logos_delivery/waku/rest_api/endpoint/health/types.nim

@@ -3,7 +3,7 @@
 import results
 import chronicles, json_serialization, json_serialization/std/options
 import ../serdes
-import waku/[waku_node, api/types, node/health_monitor]
+import logos_delivery/waku/[waku_node, api/types, node/health_monitor]
 
 #### Serialization and deserialization
 

logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim

@@ -10,8 +10,8 @@ import
   presto/common
 
 import
-  waku/node/peer_manager,
-  waku/waku_lightpush_legacy/common,
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/waku_lightpush_legacy/common,
   ../../../waku_node,
   ../../handlers,
   ../serdes,

logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim

@@ -10,8 +10,8 @@ import
   presto/common
 
 import
-  waku/node/peer_manager,
-  waku/waku_lightpush/common,
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/waku_lightpush/common,
   ../../../waku_node,
   ../../handlers,
   ../serdes,

logos_delivery/waku/waku_archive/archive.nim

@@ -15,7 +15,7 @@ import
   ../waku_core/message/digest,
   ./common,
   ./archive_metrics,
-  waku/waku_archive/retention_policy/retention_policy_time
+  logos_delivery/waku/waku_archive/retention_policy/retention_policy_time
 
 logScope:
   topics = "waku archive"

logos_delivery/waku/waku_filter_v2/client.nim

@@ -12,7 +12,7 @@ import
   brokers/broker_context
 
 import
-  waku/[node/peer_manager, waku_core, events/delivery_events],
+  logos_delivery/waku/[node/peer_manager, waku_core, events/delivery_events],
   ./common,
   ./protocol_metrics,
   ./rpc_codec,

logos_delivery/waku/waku_mix/protocol.nim

@@ -14,10 +14,10 @@ import
   eth/common/keys
 
 import
-  waku/node/peer_manager,
-  waku/waku_core,
-  waku/waku_enr,
-  waku/node/peer_manager/waku_peer_store
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/waku_enr,
+  logos_delivery/waku/node/peer_manager/waku_peer_store
 
 logScope:
   topics = "waku mix"

logos_delivery/waku/waku_persistency.nim

@@ -1,3 +1,3 @@
-import waku/persistency/persistency
+import logos_delivery/waku/persistency/persistency
 
 export persistency

logos_delivery/waku/waku_relay.nim

@@ -1,4 +1,4 @@
 import ./waku_relay/protocol
-import waku/node/health_monitor/topic_health
+import logos_delivery/waku/node/health_monitor/topic_health
 
 export protocol, topic_health

logos_delivery/waku/waku_relay/protocol.nim

@@ -20,14 +20,14 @@ import
   brokers/broker_context
 
 import
-  waku/waku_core,
-  waku/node/health_monitor/topic_health,
-  waku/requests/health_requests,
-  waku/events/health_events,
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/node/health_monitor/topic_health,
+  logos_delivery/waku/requests/health_requests,
+  logos_delivery/waku/events/health_events,
   ./message_id,
-  waku/events/peer_events
+  logos_delivery/waku/events/peer_events
 
-from waku/waku_core/codecs import WakuRelayCodec
+from logos_delivery/waku/waku_core/codecs import WakuRelayCodec
 export WakuRelayCodec
 
 type ShardMetrics = object

logos_delivery/waku/waku_rendezvous/client.nim

@@ -13,9 +13,9 @@ import
 import metrics except collect
 
 import
-  waku/node/peer_manager,
-  waku/waku_core/peers,
-  waku/waku_core/codecs,
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/waku_core/peers,
+  logos_delivery/waku/waku_core/codecs,
   ./common,
   ./waku_peer_record
 

logos_delivery/waku/waku_rln_relay/rln_relay.nim

@@ -26,7 +26,7 @@ import
   ./nonce_manager
 
 import
-  waku/[
+  logos_delivery/waku/[
     common/error_handling,
     waku_relay, # for WakuRelayHandler
     waku_core,

tests/api/test_api_health.nim

@@ -6,14 +6,14 @@ import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
 
 import
-  waku,
-  waku/[waku_node, waku_core, waku_relay/protocol],
-  waku/node/health_monitor/[topic_health, health_status, protocol_health, health_report],
-  waku/requests/health_requests,
-  waku/requests/node_requests,
-  waku/events/health_events,
-  waku/common/waku_protocol,
-  waku/factory/waku_conf
+  logos_delivery,
+  logos_delivery/waku/[waku_node, waku_core, waku_relay/protocol],
+  logos_delivery/waku/node/health_monitor/[topic_health, health_status, protocol_health, health_report],
+  logos_delivery/waku/requests/health_requests,
+  logos_delivery/waku/requests/node_requests,
+  logos_delivery/waku/events/health_events,
+  logos_delivery/waku/common/waku_protocol,
+  logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
 
 const TestTimeout = chronos.seconds(10)

tests/api/test_api_receive.nim

@@ -6,12 +6,12 @@ import libp2p/[peerid, peerinfo, crypto/crypto]
 import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
 import ../waku_archive/archive_utils
-import messaging/messaging_client
-import messaging/delivery_service/recv_service
+import logos_delivery/messaging/messaging_client
+import logos_delivery/messaging/delivery_service/recv_service
 
 import
-  waku,
-  waku/[
+  logos_delivery,
+  logos_delivery/waku/[
     waku_node,
     waku_core,
     events/message_events,
@@ -19,7 +19,7 @@ import
     waku_archive,
     waku_archive/common as archive_common,
   ]
-import waku/factory/waku_conf
+import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
 
 const TestTimeout = chronos.seconds(60)

tests/api/test_api_send.nim

@@ -5,8 +5,8 @@ import chronos, testutils/unittests, stew/byteutils, libp2p/[switch, peerinfo]
 import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
 import ../waku_archive/archive_utils
-import waku, waku/[waku_node, waku_core, waku_relay/protocol]
-import waku/factory/waku_conf
+import logos_delivery, logos_delivery/waku/[waku_node, waku_core, waku_relay/protocol]
+import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
 
 type SendEventOutcome {.pure.} = enum

tests/api/test_api_subscription.nim

@@ -5,11 +5,11 @@ import chronos, testutils/unittests, stew/byteutils
 import libp2p/[peerid, peerinfo, multiaddress, crypto/crypto]
 import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
-import messaging/messaging_client
+import logos_delivery/messaging/messaging_client
 
 import
-  waku,
-  waku/[
+  logos_delivery,
+  logos_delivery/waku/[
     waku_node,
     waku_core,
     events/message_events,
@@ -17,7 +17,7 @@ import
     node/waku_node/filter,
     node/subscription_manager,
   ]
-import waku/factory/waku_conf
+import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
 
 const TestTimeout = chronos.seconds(10)

tests/api/test_node_conf.nim

@@ -4,11 +4,11 @@ import std/[options, json, strutils], results, stint, testutils/unittests
 import json_serialization, confutils, confutils/std/net
 import
   tools/confutils/cli_args,
-  waku/api/api_conf,
-  waku/factory/waku_conf,
-  waku/factory/networks_config,
-  waku/factory/conf_builder/conf_builder,
-  waku/common/logging
+  logos_delivery/waku/api/api_conf,
+  logos_delivery/waku/factory/waku_conf,
+  logos_delivery/waku/factory/networks_config,
+  logos_delivery/waku/factory/conf_builder/conf_builder,
+  logos_delivery/waku/common/logging
 
 # Helper: parse JSON into WakuNodeConf using fieldPairs (same as liblogosdelivery)
 proc parseWakuNodeConfFromJson(jsonStr: string): Result[WakuNodeConf, string] =
@@ -345,7 +345,7 @@ suite "WakuNodeConf JSON -> WakuConf integration":
 
 {.push warning[Deprecated]: off.}
 
-import waku/api/api_conf
+import logos_delivery/waku/api/api_conf
 
 suite "NodeConfig (deprecated) - toWakuConf":
   test "Minimal configuration":

tests/channels/test_reliable_channel_send_receive.nim

@@ -6,14 +6,14 @@ import brokers/broker_context
 
 import ../testlib/[common, wakucore, wakunode, testasync]
 
-import waku
-import waku/[waku_node, waku_core]
-import waku/factory/waku_conf
-import waku/events/message_events as waku_message_events
+import logos_delivery
+import logos_delivery/waku/[waku_node, waku_core]
+import logos_delivery/waku/factory/waku_conf
+import logos_delivery/waku/events/message_events as waku_message_events
 import tools/confutils/cli_args
 
-import channels/reliable_channel_manager
-import channels/encryption/noop_encryption
+import logos_delivery/channels/reliable_channel_manager
+import logos_delivery/channels/encryption/noop_encryption
 
 const TestTimeout = chronos.seconds(15)
 

tests/common/test_base64_codec.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import std/strutils, results, stew/byteutils, testutils/unittests
-import waku/common/base64
+import logos_delivery/waku/common/base64
 
 suite "Waku Common - stew base64 wrapper":
   const TestData = @[

tests/common/test_enr_builder.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import std/[options, net], results, testutils/unittests
-import waku/common/enr, ../testlib/wakucore
+import logos_delivery/waku/common/enr, ../testlib/wakucore
 
 suite "nim-eth ENR - builder and typed record":
   test "Non-supported private key (ECDSA)":

tests/common/test_parse_size.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import testutils/unittests, results
-import waku/common/utils/parse_size_units
+import logos_delivery/waku/common/utils/parse_size_units
 
 suite "Size serialization test":
   test "parse normal sizes":

tests/common/test_protobuf_validation.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import testutils/unittests
-import waku/common/protobuf
+import logos_delivery/waku/common/protobuf
 
 ## Fixtures
 

tests/common/test_ratelimit_setting.nim

@@ -12,8 +12,8 @@ import testutils/unittests
 import chronos, libp2p/stream/connection
 import std/[options, tables]
 
-import ../../waku/common/rate_limit/request_limiter
-import ../../waku/common/rate_limit/timed_map
+import ../../logos_delivery/waku/common/rate_limit/request_limiter
+import ../../logos_delivery/waku/common/rate_limit/timed_map
 
 let proto = "ProtocolDescriptor"
 

tests/common/test_requestratelimiter.nim

@@ -12,8 +12,8 @@ import testutils/unittests
 import chronos, libp2p/stream/connection
 import std/options
 
-import ../../waku/common/rate_limit/request_limiter
-import ../../waku/common/rate_limit/timed_map
+import ../../logos_delivery/waku/common/rate_limit/request_limiter
+import ../../logos_delivery/waku/common/rate_limit/timed_map
 
 let proto = "ProtocolDescriptor"
 

tests/common/test_sqlite_migrations.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import std/[strutils, os], results, testutils/unittests
-import waku/common/databases/db_sqlite {.all.}, ../waku_archive/archive_utils
+import logos_delivery/waku/common/databases/db_sqlite {.all.}, ../waku_archive/archive_utils
 
 template sourceDir(): string =
   currentSourcePath.rsplit(DirSep, 1)[0]

tests/common/test_timed_map.nim

@@ -2,7 +2,7 @@
 
 import unittest2
 import chronos/timer
-import ../../waku/common/rate_limit/timed_map
+import ../../logos_delivery/waku/common/rate_limit/timed_map
 
 suite "TimedMap":
   test "put/get":

tests/factory/test_node_factory.nim

@@ -11,7 +11,7 @@ import
 
 import
   tests/testlib/[wakunode, wakucore],
-  waku/[
+  logos_delivery/waku/[
     waku_node,
     net/net_config,
     waku_enr,
@@ -19,7 +19,7 @@ import
     discovery/waku_discv5,
     node/waku_metrics,
   ],
-  waku/factory/[
+  logos_delivery/waku/factory/[
     node_factory,
     internal_config,
     conf_builder/conf_builder,

tests/factory/test_waku_conf.nim

@@ -8,10 +8,10 @@ import
   results,
   testutils/unittests
 import
-  waku/factory/waku_conf,
-  waku/factory/conf_builder/conf_builder,
-  waku/factory/networks_config,
-  waku/common/utils/parse_size_units
+  logos_delivery/waku/factory/waku_conf,
+  logos_delivery/waku/factory/conf_builder/conf_builder,
+  logos_delivery/waku/factory/networks_config,
+  logos_delivery/waku/common/utils/parse_size_units
 
 suite "Waku Conf - build with cluster conf":
   test "Cluster Conf is passed and relay is enabled":

tests/incentivization/test_poc_eligibility.nim

@@ -3,8 +3,8 @@
 import std/options, testutils/unittests, chronos, web3, stint, tests/testlib/testasync
 
 import
-  waku/node/peer_manager,
-  waku/incentivization/[rpc, eligibility_manager],
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/incentivization/[rpc, eligibility_manager],
   ../waku_rln_relay/[utils_onchain, utils]
 
 const TxHashNonExisting =

tests/incentivization/test_poc_reputation.nim

@@ -1,6 +1,6 @@
 import std/options, testutils/unittests, chronos, web3
 
-import waku/incentivization/reputation_manager, waku/waku_lightpush_legacy/rpc
+import logos_delivery/waku/incentivization/reputation_manager, logos_delivery/waku/waku_lightpush_legacy/rpc
 
 suite "Waku Incentivization PoC Reputation":
   var manager {.threadvar.}: ReputationManager

tests/incentivization/test_rpc_codec.nim

@@ -1,6 +1,6 @@
 import std/options, testutils/unittests, chronos, libp2p/crypto/crypto, web3
 
-import waku/incentivization/[rpc, rpc_codec, common]
+import logos_delivery/waku/incentivization/[rpc, rpc_codec, common]
 
 suite "Waku Incentivization Eligibility Codec":
   asyncTest "encode eligibility proof from txid":

tests/node/peer_manager/peer_store/test_migrations.nim

@@ -1,13 +1,13 @@
 import std/[options], results, testutils/unittests
 
 import
-  waku/node/peer_manager/peer_store/migrations,
+  logos_delivery/waku/node/peer_manager/peer_store/migrations,
   ../../waku_archive/archive_utils,
   ../../testlib/[simple_mock]
 
 import std/[tables, strutils, os], results, chronicles
 
-import waku/common/databases/db_sqlite, waku/common/databases/common
+import logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/common/databases/common
 
 suite "Migrations":
   test "migrate ok":

tests/node/peer_manager/peer_store/test_peer_storage.nim

@@ -1,6 +1,6 @@
 import results, testutils/unittests
 
-import waku/node/peer_manager/peer_store/peer_storage, waku/waku_core/peers
+import logos_delivery/waku/node/peer_manager/peer_store/peer_storage, logos_delivery/waku/waku_core/peers
 
 suite "PeerStorage":
   var peerStorage {.threadvar.}: PeerStorage

tests/node/peer_manager/peer_store/test_waku_peer_storage.nim

@@ -7,7 +7,7 @@ import
   eth/p2p/discoveryv5/enr,
   nimcrypto/utils
 
-import waku/waku_core/peers, waku/node/peer_manager/peer_store/waku_peer_storage
+import logos_delivery/waku/waku_core/peers, logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage
 
 proc `==`(a, b: RemotePeerInfo): bool =
   let comparisons = @[

tests/node/peer_manager/peer_store/utils.nim

@@ -1,7 +1,7 @@
 import std/options, results
 
 import
-  waku/node/peer_manager/[waku_peer_store, peer_store/waku_peer_storage],
+  logos_delivery/waku/node/peer_manager/[waku_peer_store, peer_store/waku_peer_storage],
   ../../../waku_archive/archive_utils
 
 proc newTestWakuPeerStorage*(path: Option[string] = string.none()): WakuPeerStorage =

tests/node/peer_manager/test_peer_manager.nim

@@ -1,11 +1,11 @@
 import chronicles, std/[options, tables, strutils], chronos, testutils/unittests
 
 import
-  waku/node/waku_node,
-  waku/waku_core,
+  logos_delivery/waku/node/waku_node,
+  logos_delivery/waku/waku_core,
   ../../waku_lightpush/[lightpush_utils],
   ../../testlib/[wakucore, wakunode, futures, testasync],
-  waku/node/peer_manager/peer_manager
+  logos_delivery/waku/node/peer_manager/peer_manager
 
 suite "Peer Manager":
   suite "onPeerMetadata":

tests/node/test_wakunode_filter.nim

@@ -8,7 +8,7 @@ import
   libp2p/[peerstore, crypto/crypto]
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     node/peer_manager,
     waku_node,

tests/node/test_wakunode_health_monitor.nim

@@ -5,7 +5,7 @@ import
 import brokers/broker_context
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     common/waku_protocol,
     node/waku_node,
@@ -25,8 +25,8 @@ import
   ]
 
 import ../testlib/[wakunode, wakucore], ../waku_archive/archive_utils
-import waku/node/subscription_manager
-import messaging/messaging_client
+import logos_delivery/waku/node/subscription_manager
+import logos_delivery/messaging/messaging_client
 
 const MockDLow = 4 # Mocked GossipSub DLow value
 

tests/node/test_wakunode_legacy_lightpush.nim

@@ -8,7 +8,7 @@ import
   libp2p/crypto/crypto
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     node/peer_manager,
     waku_node,

tests/node/test_wakunode_lightpush.nim

@@ -8,7 +8,7 @@ import
   libp2p/crypto/crypto
 
 import
-  waku/[waku_core, node/peer_manager, waku_node, waku_lightpush, waku_rln_relay],
+  logos_delivery/waku/[waku_core, node/peer_manager, waku_node, waku_lightpush, waku_rln_relay],
   ../testlib/[wakucore, wakunode, testasync, futures],
   ../resources/payloads,
   ../waku_rln_relay/[rln/waku_rln_relay_utils, utils_onchain]

tests/node/test_wakunode_peer_exchange.nim

@@ -13,7 +13,7 @@ import
   brokers/broker_context
 
 import
-  waku/
+  logos_delivery/waku/
     [waku_node, discovery/waku_discv5, waku_peer_exchange, node/peer_manager, waku_core],
   ../waku_peer_exchange/utils,
   ../testlib/[wakucore, wakunode, testasync]

tests/node/test_wakunode_peer_manager.nim

@@ -13,7 +13,7 @@ import
 from times import getTime, toUnix
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     node/peer_manager,
     waku_node,

tests/node/test_wakunode_relay_rln.nim

@@ -12,7 +12,7 @@ import
 from std/times import epochTime
 
 import
-  ../../../waku/[
+  ../../../logos_delivery/waku/[
     node/peer_manager,
     waku_core,
     waku_node,
@@ -28,7 +28,7 @@ import
   ../resources/payloads,
   ../waku_rln_relay/[utils_static, utils_onchain]
 
-from ../../waku/waku_noise/noise_utils import randomSeqByte
+from ../../logos_delivery/waku/waku_noise/noise_utils import randomSeqByte
 
 proc buildRandomIdentityCredentials(): IdentityCredential =
   # We generate a random identity credential (inter-value constrains are not enforced, otherwise we need to load e.g. zerokit RLN keygen)

tests/node/test_wakunode_sharding.nim

@@ -11,7 +11,7 @@ import
   libp2p/protocols/pubsub/pubsub
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core/topics/pubsub_topic,
     waku_core/topics/sharding,
     waku_node,

tests/node/test_wakunode_store.nim

@@ -3,7 +3,7 @@
 import std/[options, sequtils, sets], testutils/unittests, chronos, libp2p/crypto/crypto
 
 import
-  waku/[
+  logos_delivery/waku/[
     common/paging,
     waku_node,
     node/peer_manager,

tests/node/utils.nim

@@ -1,6 +1,6 @@
 import std/options, results
 import
-  waku/[node/peer_manager, node/waku_node, waku_enr/sharding, common/enr/typed_record],
+  logos_delivery/waku/[node/peer_manager, node/waku_node, waku_enr/sharding, common/enr/typed_record],
   ../testlib/[wakucore]
 
 proc relayShards*(node: WakuNode): RelayShards =

tests/persistency/test_backend.nim

@@ -3,7 +3,7 @@
 import std/options
 import results
 import testutils/unittests
-import waku/persistency/[types, keys, backend_sqlite]
+import logos_delivery/waku/persistency/[types, keys, backend_sqlite]
 
 template str(b: seq[byte]): string =
   var s = newString(b.len)

tests/persistency/test_encoding.nim

@@ -3,7 +3,7 @@
 import std/[algorithm, options, os, times]
 import chronos, results
 import testutils/unittests
-import waku/persistency/persistency
+import logos_delivery/waku/persistency/persistency
 
 # Reusable byte-wise comparator (Key has its own `<`, but we sometimes
 # want to sort `seq[Key]` here without relying on it for double-checking).

tests/persistency/test_facade.nim

@@ -3,7 +3,7 @@
 import std/[options, os, strutils, times]
 import chronos, results
 import testutils/unittests
-import waku/persistency/persistency
+import logos_delivery/waku/persistency/persistency
 
 proc payload(s: string): seq[byte] =
   result = newSeq[byte](s.len)

tests/persistency/test_keys.nim

@@ -2,7 +2,7 @@
 
 import std/[algorithm, sequtils]
 import testutils/unittests
-import waku/persistency/[types, keys]
+import logos_delivery/waku/persistency/[types, keys]
 
 proc cmpBytes(a, b: Key): int =
   let ab = bytes(a)

tests/persistency/test_lifecycle.nim

@@ -4,8 +4,8 @@ import std/[options, os, times]
 import chronos, results
 import testutils/unittests
 import brokers/[event_broker, request_broker]
-import waku/persistency/persistency
-import waku/persistency/backend_comm
+import logos_delivery/waku/persistency/persistency
+import logos_delivery/waku/persistency/backend_comm
 
 proc payloadBytes(s: string): seq[byte] =
   result = newSeq[byte](s.len)

tests/persistency/test_sds_persistency.nim

@@ -10,9 +10,9 @@
 import std/[options, os, times]
 import chronos, results
 import testutils/unittests
-import waku/persistency/persistency
-import waku/persistency/keys
-import waku/persistency/sds_persistency
+import logos_delivery/waku/persistency/persistency
+import logos_delivery/waku/persistency/keys
+import logos_delivery/waku/persistency/sds_persistency
 
 proc tmpRoot(label: string): string =
   let p = getTempDir() / ("sds_persistency_test_" & label & "_" & $epochTime().int)

tests/persistency/test_singleton.nim

@@ -4,7 +4,7 @@ import std/[os, strutils, times]
 import chronos, results
 import testutils/unittests
 import brokers/multi_request_broker
-import waku/persistency/persistency
+import logos_delivery/waku/persistency/persistency
 
 proc tmpRoot(label: string): string =
   let p = getTempDir() / ("persistency_singleton_" & label & "_" & $epochTime().int)

tests/persistency/test_string_lookup.nim

@@ -3,7 +3,7 @@
 import std/[options, os, times]
 import chronos, results
 import testutils/unittests
-import waku/persistency/persistency
+import logos_delivery/waku/persistency/persistency
 
 proc payloadBytes(s: string): seq[byte] =
   result = newSeq[byte](s.len)