From 62b6259a192541cea0088a0362e413b1ecd45c64 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Fri, 5 Jun 2026 16:04:04 +0200 Subject: [PATCH] WIP fixing import after folder moves, wakunode2, tests compiling --- logos_delivery/channels/events.nim | 2 +- logos_delivery/channels/reliable_channel.nim | 6 ++-- .../channels/reliable_channel_manager.nim | 6 ++-- logos_delivery/channels/types.nim | 2 +- .../not_delivered_storage/migrations.nim | 2 +- .../not_delivered_storage.nim | 2 +- .../recv_service/recv_service.nim | 2 +- .../send_service/delivery_task.nim | 2 +- .../send_service/lightpush_processor.nim | 2 +- .../send_service/relay_processor.nim | 6 ++-- .../send_service/send_service.nim | 2 +- logos_delivery/messaging/messaging_client.nim | 8 ++--- logos_delivery/waku/api/api.nim | 12 +++---- logos_delivery/waku/api/api_conf.nim | 10 +++--- logos_delivery/waku/api/types.nim | 6 ++-- logos_delivery/waku/common/callbacks.nim | 2 +- logos_delivery/waku/discovery/waku_discv5.nim | 2 +- .../waku/discovery/waku_kademlia.nim | 2 +- .../waku/events/delivery_events.nim | 2 +- logos_delivery/waku/events/health_events.nim | 6 ++-- logos_delivery/waku/events/message_events.nim | 2 +- .../kademlia_discovery_conf_builder.nim | 2 +- .../factory/conf_builder/mix_conf_builder.nim | 2 +- .../conf_builder/rate_limit_conf_builder.nim | 2 +- .../conf_builder/waku_conf_builder.nim | 2 +- .../conf_builder/web_socket_conf_builder.nim | 2 +- .../waku/factory/internal_config.nim | 2 +- logos_delivery/waku/factory/waku.nim | 6 ++-- .../waku/factory/waku_state_info.nim | 2 +- .../waku/incentivization/common.nim | 2 +- .../incentivization/eligibility_manager.nim | 2 +- .../health_monitor/node_health_monitor.nim | 2 +- .../node/health_monitor/online_monitor.nim | 2 +- .../node/health_monitor/protocol_health.nim | 2 +- .../waku/node/health_monitor/topic_health.nim | 2 +- .../waku/node/peer_manager/peer_manager.nim | 2 +- .../waku/node/subscription_manager.nim | 2 +- logos_delivery/waku/node/waku_metrics.nim | 2 +- logos_delivery/waku/node/waku_node.nim | 6 ++-- logos_delivery/waku/node/waku_node/relay.nim | 2 +- .../waku/requests/health_requests.nim | 8 ++--- .../waku/requests/node_requests.nim | 2 +- logos_delivery/waku/requests/rln_requests.nim | 2 +- .../waku/rest_api/endpoint/admin/handlers.nim | 2 +- .../waku/rest_api/endpoint/admin/types.nim | 2 +- .../waku/rest_api/endpoint/builder.nim | 32 +++++++++---------- .../waku/rest_api/endpoint/health/client.nim | 2 +- .../waku/rest_api/endpoint/health/types.nim | 2 +- .../endpoint/legacy_lightpush/handlers.nim | 4 +-- .../rest_api/endpoint/lightpush/handlers.nim | 4 +-- logos_delivery/waku/waku_archive/archive.nim | 2 +- logos_delivery/waku/waku_filter_v2/client.nim | 2 +- logos_delivery/waku/waku_mix/protocol.nim | 8 ++--- logos_delivery/waku/waku_persistency.nim | 2 +- logos_delivery/waku/waku_relay.nim | 2 +- logos_delivery/waku/waku_relay/protocol.nim | 12 +++---- .../waku/waku_rendezvous/client.nim | 6 ++-- .../waku/waku_rln_relay/rln_relay.nim | 2 +- tests/api/test_api_health.nim | 16 +++++----- tests/api/test_api_receive.nim | 10 +++--- tests/api/test_api_send.nim | 4 +-- tests/api/test_api_subscription.nim | 8 ++--- tests/api/test_node_conf.nim | 12 +++---- .../test_reliable_channel_send_receive.nim | 12 +++---- tests/common/test_base64_codec.nim | 2 +- tests/common/test_enr_builder.nim | 2 +- tests/common/test_parse_size.nim | 2 +- tests/common/test_protobuf_validation.nim | 2 +- tests/common/test_ratelimit_setting.nim | 4 +-- tests/common/test_requestratelimiter.nim | 4 +-- tests/common/test_sqlite_migrations.nim | 2 +- tests/common/test_timed_map.nim | 2 +- tests/factory/test_node_factory.nim | 4 +-- tests/factory/test_waku_conf.nim | 8 ++--- .../incentivization/test_poc_eligibility.nim | 4 +-- tests/incentivization/test_poc_reputation.nim | 2 +- tests/incentivization/test_rpc_codec.nim | 2 +- .../peer_store/test_migrations.nim | 4 +-- .../peer_store/test_peer_storage.nim | 2 +- .../peer_store/test_waku_peer_storage.nim | 2 +- tests/node/peer_manager/peer_store/utils.nim | 2 +- tests/node/peer_manager/test_peer_manager.nim | 6 ++-- tests/node/test_wakunode_filter.nim | 2 +- tests/node/test_wakunode_health_monitor.nim | 6 ++-- tests/node/test_wakunode_legacy_lightpush.nim | 2 +- tests/node/test_wakunode_lightpush.nim | 2 +- tests/node/test_wakunode_peer_exchange.nim | 2 +- tests/node/test_wakunode_peer_manager.nim | 2 +- tests/node/test_wakunode_relay_rln.nim | 4 +-- tests/node/test_wakunode_sharding.nim | 2 +- tests/node/test_wakunode_store.nim | 2 +- tests/node/utils.nim | 2 +- tests/persistency/test_backend.nim | 2 +- tests/persistency/test_encoding.nim | 2 +- tests/persistency/test_facade.nim | 2 +- tests/persistency/test_keys.nim | 2 +- tests/persistency/test_lifecycle.nim | 4 +-- tests/persistency/test_sds_persistency.nim | 6 ++-- tests/persistency/test_singleton.nim | 2 +- tests/persistency/test_string_lookup.nim | 2 +- tests/test_message_cache.nim | 2 +- tests/test_peer_manager.nim | 2 +- tests/test_peer_storage.nim | 2 +- tests/test_peer_store_extended.nim | 2 +- tests/test_relay_peer_exchange.nim | 2 +- tests/test_utils_compat.nim | 2 +- tests/test_waku.nim | 2 +- tests/test_waku_dnsdisc.nim | 6 ++-- tests/test_waku_enr.nim | 2 +- tests/test_waku_keepalive.nim | 6 ++-- tests/test_waku_keystore.nim | 4 +-- tests/test_waku_keystore_keyfile.nim | 4 +-- tests/test_waku_metadata.nim | 2 +- tests/test_waku_netconfig.nim | 8 ++--- tests/test_waku_noise.nim | 2 +- tests/test_waku_noise_sessions.nim | 2 +- tests/test_waku_protobufs.nim | 2 +- tests/test_waku_rendezvous.nim | 16 +++++----- tests/test_waku_switch.nim | 2 +- tests/test_wakunode.nim | 2 +- tests/testlib/futures.nim | 2 +- tests/testlib/postgres.nim | 2 +- tests/testlib/tables.nim | 2 +- tests/testlib/wakucore.nim | 2 +- tests/testlib/wakunode.nim | 2 +- tests/waku_archive/archive_utils.nim | 2 +- tests/waku_archive/test_driver_postgres.nim | 2 +- .../test_driver_postgres_query.nim | 2 +- tests/waku_archive/test_driver_queue.nim | 2 +- .../waku_archive/test_driver_queue_index.nim | 2 +- .../test_driver_queue_pagination.nim | 2 +- .../waku_archive/test_driver_queue_query.nim | 2 +- tests/waku_archive/test_driver_sqlite.nim | 2 +- .../waku_archive/test_driver_sqlite_query.nim | 2 +- tests/waku_archive/test_partition_manager.nim | 2 +- tests/waku_archive/test_retention_policy.nim | 2 +- tests/waku_archive/test_waku_archive.nim | 2 +- tests/waku_core/test_message_digest.nim | 2 +- tests/waku_core/test_namespaced_topics.nim | 2 +- tests/waku_core/test_peers.nim | 2 +- tests/waku_core/test_time.nim | 2 +- tests/waku_core/topics/test_pubsub_topic.nim | 2 +- tests/waku_core/topics/test_sharding.nim | 2 +- tests/waku_discv5/test_waku_discv5.nim | 2 +- tests/waku_discv5/utils.nim | 2 +- tests/waku_enr/test_sharding.nim | 2 +- tests/waku_enr/utils.nim | 2 +- tests/waku_filter_v2/test_waku_client.nim | 8 ++--- .../test_waku_filter_dos_protection.nim | 4 +-- tests/waku_filter_v2/waku_filter_utils.nim | 2 +- tests/waku_keystore/utils.nim | 2 +- tests/waku_lightpush/lightpush_utils.nim | 12 +++---- tests/waku_lightpush/test_client.nim | 2 +- tests/waku_lightpush/test_ratelimit.nim | 2 +- .../waku_lightpush_legacy/lightpush_utils.nim | 8 ++--- tests/waku_lightpush_legacy/test_client.nim | 2 +- .../waku_lightpush_legacy/test_ratelimit.nim | 2 +- tests/waku_peer_exchange/test_protocol.nim | 2 +- tests/waku_peer_exchange/test_rpc_codec.nim | 2 +- tests/waku_peer_exchange/utils.nim | 2 +- tests/waku_relay/test_message_id.nim | 2 +- tests/waku_relay/test_protocol.nim | 2 +- tests/waku_relay/test_wakunode_relay.nim | 2 +- tests/waku_relay/utils.nim | 2 +- .../waku_rln_relay/rln/test_rln_interface.nim | 4 +-- tests/waku_rln_relay/rln/test_wrappers.nim | 2 +- .../rln/waku_rln_relay_utils.nim | 4 +-- .../test_rln_contract_deployment.nim | 2 +- .../test_rln_group_manager_onchain.nim | 2 +- .../waku_rln_relay/test_rln_nonce_manager.nim | 2 +- tests/waku_rln_relay/test_waku_rln_relay.nim | 2 +- .../test_wakunode_rln_relay.nim | 2 +- tests/waku_rln_relay/utils_offchain.nim | 2 +- tests/waku_rln_relay/utils_onchain.nim | 2 +- tests/waku_store/store_utils.nim | 2 +- tests/waku_store/test_client.nim | 2 +- tests/waku_store/test_resume.nim | 2 +- tests/waku_store/test_rpc_codec.nim | 2 +- tests/waku_store/test_waku_store.nim | 2 +- tests/waku_store/test_wakunode_store.nim | 2 +- tests/waku_store_sync/sync_utils.nim | 2 +- tests/waku_store_sync/test_codec.nim | 10 +++--- tests/waku_store_sync/test_protocol.nim | 2 +- tests/waku_store_sync/test_range_split.nim | 10 +++--- .../waku_store_sync/test_state_transition.nim | 10 +++--- tests/waku_store_sync/test_storage.nim | 6 ++-- tests/wakunode2/test_app.nim | 4 +-- tests/wakunode2/test_cli_args.nim | 10 +++--- tests/wakunode2/test_validators.nim | 2 +- tests/wakunode_rest/test_rest_admin.nim | 2 +- tests/wakunode_rest/test_rest_cors.nim | 2 +- tests/wakunode_rest/test_rest_debug.nim | 2 +- .../wakunode_rest/test_rest_debug_serdes.nim | 2 +- tests/wakunode_rest/test_rest_filter.nim | 2 +- tests/wakunode_rest/test_rest_health.nim | 2 +- tests/wakunode_rest/test_rest_lightpush.nim | 2 +- .../test_rest_lightpush_legacy.nim | 2 +- tests/wakunode_rest/test_rest_relay.nim | 2 +- .../wakunode_rest/test_rest_relay_serdes.nim | 2 +- tests/wakunode_rest/test_rest_serdes.nim | 2 +- tests/wakunode_rest/test_rest_store.nim | 2 +- tools/confutils/cli_args.nim | 6 ++-- tools/confutils/entry_nodes.nim | 2 +- .../rln_keystore_generator.nim | 2 +- 204 files changed, 352 insertions(+), 352 deletions(-) diff --git a/logos_delivery/channels/events.nim b/logos_delivery/channels/events.nim index 3e271976e..5f69095e4 100644 --- a/logos_delivery/channels/events.nim +++ b/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 diff --git a/logos_delivery/channels/reliable_channel.nim b/logos_delivery/channels/reliable_channel.nim index 85e2d80c3..e8c426b75 100644 --- a/logos_delivery/channels/reliable_channel.nim +++ b/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 diff --git a/logos_delivery/channels/reliable_channel_manager.nim b/logos_delivery/channels/reliable_channel_manager.nim index 09514b1dc..05fd6194b 100644 --- a/logos_delivery/channels/reliable_channel_manager.nim +++ b/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 diff --git a/logos_delivery/channels/types.nim b/logos_delivery/channels/types.nim index 4070ed620..ec663cf7b 100644 --- a/logos_delivery/channels/types.nim +++ b/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 diff --git a/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim index da6e1ef94..c39bc4530 100644 --- a/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim +++ b/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" diff --git a/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim index d704e3e1c..438309cce 100644 --- a/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim +++ b/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" diff --git a/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim index 500926cc7..09bcaa815 100644 --- a/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim +++ b/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, diff --git a/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim index aa1dc17d7..56b000a45 100644 --- a/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim +++ b/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 diff --git a/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim index 7a9f65c71..75311065d 100644 --- a/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim +++ b/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] diff --git a/logos_delivery/messaging/delivery_service/send_service/relay_processor.nim b/logos_delivery/messaging/delivery_service/send_service/relay_processor.nim index e06b664fb..2fdc39f8e 100644 --- a/logos_delivery/messaging/delivery_service/send_service/relay_processor.nim +++ b/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: diff --git a/logos_delivery/messaging/delivery_service/send_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service/send_service.nim index e60b26124..0207ebdfd 100644 --- a/logos_delivery/messaging/delivery_service/send_service/send_service.nim +++ b/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, diff --git a/logos_delivery/messaging/messaging_client.nim b/logos_delivery/messaging/messaging_client.nim index d191f15fb..1d3892250 100644 --- a/logos_delivery/messaging/messaging_client.nim +++ b/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 diff --git a/logos_delivery/waku/api/api.nim b/logos_delivery/waku/api/api.nim index 2a2e125a7..1cbe47256 100644 --- a/logos_delivery/waku/api/api.nim +++ b/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 diff --git a/logos_delivery/waku/api/api_conf.nim b/logos_delivery/waku/api/api_conf.nim index 3606be596..b01fae8bd 100644 --- a/logos_delivery/waku/api/api_conf.nim +++ b/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 diff --git a/logos_delivery/waku/api/types.nim b/logos_delivery/waku/api/types.nim index 2b7edd616..6b2b621de 100644 --- a/logos_delivery/waku/api/types.nim +++ b/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 diff --git a/logos_delivery/waku/common/callbacks.nim b/logos_delivery/waku/common/callbacks.nim index 83209ef24..34d8c2af1 100644 --- a/logos_delivery/waku/common/callbacks.nim +++ b/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: [].} diff --git a/logos_delivery/waku/discovery/waku_discv5.nim b/logos_delivery/waku/discovery/waku_discv5.nim index c1b253c8c..4fb5a82e2 100644 --- a/logos_delivery/waku/discovery/waku_discv5.nim +++ b/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 diff --git a/logos_delivery/waku/discovery/waku_kademlia.nim b/logos_delivery/waku/discovery/waku_kademlia.nim index 94b63a321..6c64edace 100644 --- a/logos_delivery/waku/discovery/waku_kademlia.nim +++ b/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" diff --git a/logos_delivery/waku/events/delivery_events.nim b/logos_delivery/waku/events/delivery_events.nim index 5730335e0..5238e0403 100644 --- a/logos_delivery/waku/events/delivery_events.nim +++ b/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 diff --git a/logos_delivery/waku/events/health_events.nim b/logos_delivery/waku/events/health_events.nim index 95912941e..4ff6f0c6c 100644 --- a/logos_delivery/waku/events/health_events.nim +++ b/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 diff --git a/logos_delivery/waku/events/message_events.nim b/logos_delivery/waku/events/message_events.nim index b45f91249..9338fda67 100644 --- a/logos_delivery/waku/events/message_events.nim +++ b/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: diff --git a/logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim index 916d71be1..576b6b7d9 100644 --- a/logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim +++ b/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" diff --git a/logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim index 145ccb76e..971e63588 100644 --- a/logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim +++ b/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" diff --git a/logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim index b2edbef03..f3a28c5dc 100644 --- a/logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim +++ b/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" diff --git a/logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim index 96e34eeed..7d7189fac 100644 --- a/logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim +++ b/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, diff --git a/logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim index 61334d958..285e678e8 100644 --- a/logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim +++ b/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" diff --git a/logos_delivery/waku/factory/internal_config.nim b/logos_delivery/waku/factory/internal_config.nim index fa36aff57..da01ebd49 100644 --- a/logos_delivery/waku/factory/internal_config.nim +++ b/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] diff --git a/logos_delivery/waku/factory/waku.nim b/logos_delivery/waku/factory/waku.nim index 510e38376..56e2748e2 100644 --- a/logos_delivery/waku/factory/waku.nim +++ b/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 diff --git a/logos_delivery/waku/factory/waku_state_info.nim b/logos_delivery/waku/factory/waku_state_info.nim index 5796e04f5..e608d5dd2 100644 --- a/logos_delivery/waku/factory/waku_state_info.nim +++ b/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 diff --git a/logos_delivery/waku/incentivization/common.nim b/logos_delivery/waku/incentivization/common.nim index 071b4c18f..1fdfb05a9 100644 --- a/logos_delivery/waku/incentivization/common.nim +++ b/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: diff --git a/logos_delivery/waku/incentivization/eligibility_manager.nim b/logos_delivery/waku/incentivization/eligibility_manager.nim index cbbf4774c..ad0f3b67e 100644 --- a/logos_delivery/waku/incentivization/eligibility_manager.nim +++ b/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 diff --git a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim index e5c941191..74f3defec 100644 --- a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim +++ b/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, diff --git a/logos_delivery/waku/node/health_monitor/online_monitor.nim b/logos_delivery/waku/node/health_monitor/online_monitor.nim index 27bd53bc3..b2b87acd2 100644 --- a/logos_delivery/waku/node/health_monitor/online_monitor.nim +++ b/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: [].} diff --git a/logos_delivery/waku/node/health_monitor/protocol_health.nim b/logos_delivery/waku/node/health_monitor/protocol_health.nim index 4479888c8..50d9c5572 100644 --- a/logos_delivery/waku/node/health_monitor/protocol_health.nim +++ b/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 diff --git a/logos_delivery/waku/node/health_monitor/topic_health.nim b/logos_delivery/waku/node/health_monitor/topic_health.nim index 5a1ea0a16..9273f4835 100644 --- a/logos_delivery/waku/node/health_monitor/topic_health.nim +++ b/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 diff --git a/logos_delivery/waku/node/peer_manager/peer_manager.nim b/logos_delivery/waku/node/peer_manager/peer_manager.nim index 6602c049b..6c916c3c6 100644 --- a/logos_delivery/waku/node/peer_manager/peer_manager.nim +++ b/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, diff --git a/logos_delivery/waku/node/subscription_manager.nim b/logos_delivery/waku/node/subscription_manager.nim index 8bcb7bb46..a8acb58dd 100644 --- a/logos_delivery/waku/node/subscription_manager.nim +++ b/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, diff --git a/logos_delivery/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim index bb4c10fff..16ca85aa5 100644 --- a/logos_delivery/waku/node/waku_metrics.nim +++ b/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 diff --git a/logos_delivery/waku/node/waku_node.nim b/logos_delivery/waku/node/waku_node.nim index 6a8826d2a..a852fa13e 100644 --- a/logos_delivery/waku/node/waku_node.nim +++ b/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, diff --git a/logos_delivery/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim index 30fc22ec3..b90992e9b 100644 --- a/logos_delivery/waku/node/waku_node/relay.nim +++ b/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, diff --git a/logos_delivery/waku/requests/health_requests.nim b/logos_delivery/waku/requests/health_requests.nim index ccf08f83d..bd98f426b 100644 --- a/logos_delivery/waku/requests/health_requests.nim +++ b/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 diff --git a/logos_delivery/waku/requests/node_requests.nim b/logos_delivery/waku/requests/node_requests.nim index 93c6b1159..a5ca263cd 100644 --- a/logos_delivery/waku/requests/node_requests.nim +++ b/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 diff --git a/logos_delivery/waku/requests/rln_requests.nim b/logos_delivery/waku/requests/rln_requests.nim index ffd747bed..04843e170 100644 --- a/logos_delivery/waku/requests/rln_requests.nim +++ b/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 diff --git a/logos_delivery/waku/rest_api/endpoint/admin/handlers.nim b/logos_delivery/waku/rest_api/endpoint/admin/handlers.nim index 304fdabf8..c82401d87 100644 --- a/logos_delivery/waku/rest_api/endpoint/admin/handlers.nim +++ b/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, diff --git a/logos_delivery/waku/rest_api/endpoint/admin/types.nim b/logos_delivery/waku/rest_api/endpoint/admin/types.nim index 483acf8b8..846f5a2fa 100644 --- a/logos_delivery/waku/rest_api/endpoint/admin/types.nim +++ b/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 diff --git a/logos_delivery/waku/rest_api/endpoint/builder.nim b/logos_delivery/waku/rest_api/endpoint/builder.nim index 16cdde988..32cc3f2f1 100644 --- a/logos_delivery/waku/rest_api/endpoint/builder.nim +++ b/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 diff --git a/logos_delivery/waku/rest_api/endpoint/health/client.nim b/logos_delivery/waku/rest_api/endpoint/health/client.nim index 97f4a2c6d..9af8a138f 100644 --- a/logos_delivery/waku/rest_api/endpoint/health/client.nim +++ b/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" diff --git a/logos_delivery/waku/rest_api/endpoint/health/types.nim b/logos_delivery/waku/rest_api/endpoint/health/types.nim index 4f85ebde5..00e101133 100644 --- a/logos_delivery/waku/rest_api/endpoint/health/types.nim +++ b/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 diff --git a/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim index 7a3c5b1ed..4344f0481 100644 --- a/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim +++ b/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, diff --git a/logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim index 342053e72..2afe3c7e7 100644 --- a/logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim +++ b/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, diff --git a/logos_delivery/waku/waku_archive/archive.nim b/logos_delivery/waku/waku_archive/archive.nim index 976d7d035..a257a55b1 100644 --- a/logos_delivery/waku/waku_archive/archive.nim +++ b/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" diff --git a/logos_delivery/waku/waku_filter_v2/client.nim b/logos_delivery/waku/waku_filter_v2/client.nim index 7798f41b7..6fb473e27 100644 --- a/logos_delivery/waku/waku_filter_v2/client.nim +++ b/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, diff --git a/logos_delivery/waku/waku_mix/protocol.nim b/logos_delivery/waku/waku_mix/protocol.nim index ac8b69eaf..c0c3adadc 100644 --- a/logos_delivery/waku/waku_mix/protocol.nim +++ b/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" diff --git a/logos_delivery/waku/waku_persistency.nim b/logos_delivery/waku/waku_persistency.nim index 5eb94e3f0..dc577199e 100644 --- a/logos_delivery/waku/waku_persistency.nim +++ b/logos_delivery/waku/waku_persistency.nim @@ -1,3 +1,3 @@ -import waku/persistency/persistency +import logos_delivery/waku/persistency/persistency export persistency diff --git a/logos_delivery/waku/waku_relay.nim b/logos_delivery/waku/waku_relay.nim index a91033cf1..606fb16e2 100644 --- a/logos_delivery/waku/waku_relay.nim +++ b/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 diff --git a/logos_delivery/waku/waku_relay/protocol.nim b/logos_delivery/waku/waku_relay/protocol.nim index d0b1ddb48..c35854be3 100644 --- a/logos_delivery/waku/waku_relay/protocol.nim +++ b/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 diff --git a/logos_delivery/waku/waku_rendezvous/client.nim b/logos_delivery/waku/waku_rendezvous/client.nim index 09e789774..433ce361e 100644 --- a/logos_delivery/waku/waku_rendezvous/client.nim +++ b/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 diff --git a/logos_delivery/waku/waku_rln_relay/rln_relay.nim b/logos_delivery/waku/waku_rln_relay/rln_relay.nim index 7c36300b2..7c9028dd6 100644 --- a/logos_delivery/waku/waku_rln_relay/rln_relay.nim +++ b/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, diff --git a/tests/api/test_api_health.nim b/tests/api/test_api_health.nim index 62fe39b9e..753516598 100644 --- a/tests/api/test_api_health.nim +++ b/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) diff --git a/tests/api/test_api_receive.nim b/tests/api/test_api_receive.nim index 600dadcfb..3280f0609 100644 --- a/tests/api/test_api_receive.nim +++ b/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) diff --git a/tests/api/test_api_send.nim b/tests/api/test_api_send.nim index 679d6a419..3e9a4b717 100644 --- a/tests/api/test_api_send.nim +++ b/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 diff --git a/tests/api/test_api_subscription.nim b/tests/api/test_api_subscription.nim index c9db540f1..e20250791 100644 --- a/tests/api/test_api_subscription.nim +++ b/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) diff --git a/tests/api/test_node_conf.nim b/tests/api/test_node_conf.nim index 8798c5cc5..2da1362af 100644 --- a/tests/api/test_node_conf.nim +++ b/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": diff --git a/tests/channels/test_reliable_channel_send_receive.nim b/tests/channels/test_reliable_channel_send_receive.nim index dabc4497f..16577899e 100644 --- a/tests/channels/test_reliable_channel_send_receive.nim +++ b/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) diff --git a/tests/common/test_base64_codec.nim b/tests/common/test_base64_codec.nim index b9ac9e464..ff2477312 100644 --- a/tests/common/test_base64_codec.nim +++ b/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 = @[ diff --git a/tests/common/test_enr_builder.nim b/tests/common/test_enr_builder.nim index 0cf7bcb55..0c87cf744 100644 --- a/tests/common/test_enr_builder.nim +++ b/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)": diff --git a/tests/common/test_parse_size.nim b/tests/common/test_parse_size.nim index 009cb9637..708c6f066 100644 --- a/tests/common/test_parse_size.nim +++ b/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": diff --git a/tests/common/test_protobuf_validation.nim b/tests/common/test_protobuf_validation.nim index 30254d3d4..ea81f7ba2 100644 --- a/tests/common/test_protobuf_validation.nim +++ b/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 diff --git a/tests/common/test_ratelimit_setting.nim b/tests/common/test_ratelimit_setting.nim index 2bc95fbfb..e33f13db5 100644 --- a/tests/common/test_ratelimit_setting.nim +++ b/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" diff --git a/tests/common/test_requestratelimiter.nim b/tests/common/test_requestratelimiter.nim index be910b38e..9a662d0bb 100644 --- a/tests/common/test_requestratelimiter.nim +++ b/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" diff --git a/tests/common/test_sqlite_migrations.nim b/tests/common/test_sqlite_migrations.nim index 2a9cae609..a781da4aa 100644 --- a/tests/common/test_sqlite_migrations.nim +++ b/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] diff --git a/tests/common/test_timed_map.nim b/tests/common/test_timed_map.nim index 3b063d9dd..e008b6e22 100644 --- a/tests/common/test_timed_map.nim +++ b/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": diff --git a/tests/factory/test_node_factory.nim b/tests/factory/test_node_factory.nim index 63dd730c2..a31452c55 100644 --- a/tests/factory/test_node_factory.nim +++ b/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, diff --git a/tests/factory/test_waku_conf.nim b/tests/factory/test_waku_conf.nim index 885e22867..8a033c008 100644 --- a/tests/factory/test_waku_conf.nim +++ b/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": diff --git a/tests/incentivization/test_poc_eligibility.nim b/tests/incentivization/test_poc_eligibility.nim index be9018898..f9f1c53fa 100644 --- a/tests/incentivization/test_poc_eligibility.nim +++ b/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 = diff --git a/tests/incentivization/test_poc_reputation.nim b/tests/incentivization/test_poc_reputation.nim index 0547b9744..d87c92a66 100644 --- a/tests/incentivization/test_poc_reputation.nim +++ b/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 diff --git a/tests/incentivization/test_rpc_codec.nim b/tests/incentivization/test_rpc_codec.nim index 30befd8c1..672633113 100644 --- a/tests/incentivization/test_rpc_codec.nim +++ b/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": diff --git a/tests/node/peer_manager/peer_store/test_migrations.nim b/tests/node/peer_manager/peer_store/test_migrations.nim index d6b86a15b..3d08992ec 100644 --- a/tests/node/peer_manager/peer_store/test_migrations.nim +++ b/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": diff --git a/tests/node/peer_manager/peer_store/test_peer_storage.nim b/tests/node/peer_manager/peer_store/test_peer_storage.nim index 871df8644..db8bcd324 100644 --- a/tests/node/peer_manager/peer_store/test_peer_storage.nim +++ b/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 diff --git a/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim b/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim index bf052205b..af09b343f 100644 --- a/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim +++ b/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 = @[ diff --git a/tests/node/peer_manager/peer_store/utils.nim b/tests/node/peer_manager/peer_store/utils.nim index 891c5fdab..c7c380b43 100644 --- a/tests/node/peer_manager/peer_store/utils.nim +++ b/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 = diff --git a/tests/node/peer_manager/test_peer_manager.nim b/tests/node/peer_manager/test_peer_manager.nim index 7697e0af7..25e6f4916 100644 --- a/tests/node/peer_manager/test_peer_manager.nim +++ b/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": diff --git a/tests/node/test_wakunode_filter.nim b/tests/node/test_wakunode_filter.nim index b0dbaa198..ebc529bfb 100644 --- a/tests/node/test_wakunode_filter.nim +++ b/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, diff --git a/tests/node/test_wakunode_health_monitor.nim b/tests/node/test_wakunode_health_monitor.nim index 01b43e6df..480cb235c 100644 --- a/tests/node/test_wakunode_health_monitor.nim +++ b/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 diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim index cdd29b398..ec61c2cdf 100644 --- a/tests/node/test_wakunode_legacy_lightpush.nim +++ b/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, diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim index 4f5476701..cc18b8000 100644 --- a/tests/node/test_wakunode_lightpush.nim +++ b/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] diff --git a/tests/node/test_wakunode_peer_exchange.nim b/tests/node/test_wakunode_peer_exchange.nim index ac263c92f..47bd5b8af 100644 --- a/tests/node/test_wakunode_peer_exchange.nim +++ b/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] diff --git a/tests/node/test_wakunode_peer_manager.nim b/tests/node/test_wakunode_peer_manager.nim index b0c4354cf..09fa4cbe9 100644 --- a/tests/node/test_wakunode_peer_manager.nim +++ b/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, diff --git a/tests/node/test_wakunode_relay_rln.nim b/tests/node/test_wakunode_relay_rln.nim index b78255ce9..e521abcca 100644 --- a/tests/node/test_wakunode_relay_rln.nim +++ b/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) diff --git a/tests/node/test_wakunode_sharding.nim b/tests/node/test_wakunode_sharding.nim index 88bf63efa..d1b19c361 100644 --- a/tests/node/test_wakunode_sharding.nim +++ b/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, diff --git a/tests/node/test_wakunode_store.nim b/tests/node/test_wakunode_store.nim index daa1db682..3d62a17c7 100644 --- a/tests/node/test_wakunode_store.nim +++ b/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, diff --git a/tests/node/utils.nim b/tests/node/utils.nim index 61c6c4a5c..88694dc96 100644 --- a/tests/node/utils.nim +++ b/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 = diff --git a/tests/persistency/test_backend.nim b/tests/persistency/test_backend.nim index e5689d95f..d375bf3a4 100644 --- a/tests/persistency/test_backend.nim +++ b/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) diff --git a/tests/persistency/test_encoding.nim b/tests/persistency/test_encoding.nim index 22bd58209..4912bdcf1 100644 --- a/tests/persistency/test_encoding.nim +++ b/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). diff --git a/tests/persistency/test_facade.nim b/tests/persistency/test_facade.nim index 5b5f9eac1..a3af22d91 100644 --- a/tests/persistency/test_facade.nim +++ b/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) diff --git a/tests/persistency/test_keys.nim b/tests/persistency/test_keys.nim index e33020849..d40563aad 100644 --- a/tests/persistency/test_keys.nim +++ b/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) diff --git a/tests/persistency/test_lifecycle.nim b/tests/persistency/test_lifecycle.nim index 6b1a6ee60..2626cb01b 100644 --- a/tests/persistency/test_lifecycle.nim +++ b/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) diff --git a/tests/persistency/test_sds_persistency.nim b/tests/persistency/test_sds_persistency.nim index ed14f904b..e5e0654d5 100644 --- a/tests/persistency/test_sds_persistency.nim +++ b/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) diff --git a/tests/persistency/test_singleton.nim b/tests/persistency/test_singleton.nim index f17841611..01542f409 100644 --- a/tests/persistency/test_singleton.nim +++ b/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) diff --git a/tests/persistency/test_string_lookup.nim b/tests/persistency/test_string_lookup.nim index 11ac5fed3..46bbce2b6 100644 --- a/tests/persistency/test_string_lookup.nim +++ b/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) diff --git a/tests/test_message_cache.nim b/tests/test_message_cache.nim index 95904f8f2..f86e4dd73 100644 --- a/tests/test_message_cache.nim +++ b/tests/test_message_cache.nim @@ -1,7 +1,7 @@ {.used.} import std/[sets, random], results, stew/byteutils, testutils/unittests -import waku/waku_core, waku/rest_api/message_cache, ./testlib/wakucore +import logos_delivery/waku/waku_core, logos_delivery/waku/rest_api/message_cache, ./testlib/wakucore randomize() diff --git a/tests/test_peer_manager.nim b/tests/test_peer_manager.nim index 608889d32..1ad29b90b 100644 --- a/tests/test_peer_manager.nim +++ b/tests/test_peer_manager.nim @@ -16,7 +16,7 @@ import libp2p/protocols/pubsub/rpc/message, libp2p/peerid import - waku/[ + logos_delivery/waku/[ common/databases/db_sqlite, node/peer_manager/peer_manager, node/peer_manager/peer_store/waku_peer_storage, diff --git a/tests/test_peer_storage.nim b/tests/test_peer_storage.nim index 6cb48d71e..123556b45 100644 --- a/tests/test_peer_storage.nim +++ b/tests/test_peer_storage.nim @@ -2,7 +2,7 @@ import std/options, testutils/unittests, eth/p2p/discoveryv5/enr, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ common/databases/db_sqlite, node/peer_manager/peer_manager, node/peer_manager/peer_store/waku_peer_storage, diff --git a/tests/test_peer_store_extended.nim b/tests/test_peer_store_extended.nim index 16926c7c2..225ac6b9c 100644 --- a/tests/test_peer_store_extended.nim +++ b/tests/test_peer_store_extended.nim @@ -9,7 +9,7 @@ import libp2p/multiaddress, testutils/unittests import - waku/ + logos_delivery/waku/ [node/peer_manager/peer_manager, node/peer_manager/waku_peer_store, waku_core/peers], ./testlib/wakucore diff --git a/tests/test_relay_peer_exchange.nim b/tests/test_relay_peer_exchange.nim index 84976bd9a..4fd9e79d2 100644 --- a/tests/test_relay_peer_exchange.nim +++ b/tests/test_relay_peer_exchange.nim @@ -7,7 +7,7 @@ import libp2p/peerid, libp2p/protocols/pubsub/gossipsub -import waku/waku_core, waku/waku_node, ./testlib/wakucore, ./testlib/wakunode +import logos_delivery/waku/waku_core, logos_delivery/waku/waku_node, ./testlib/wakucore, ./testlib/wakunode procSuite "Relay (GossipSub) Peer Exchange": asyncTest "Mount relay without peer exchange handler": diff --git a/tests/test_utils_compat.nim b/tests/test_utils_compat.nim index 1394982ef..b910f3201 100644 --- a/tests/test_utils_compat.nim +++ b/tests/test_utils_compat.nim @@ -1,7 +1,7 @@ {.used.} import testutils/unittests -import results, waku/waku_core/message, waku/waku_core/time, ./testlib/common +import results, logos_delivery/waku/waku_core/message, logos_delivery/waku/waku_core/time, ./testlib/common suite "Waku Payload": test "Encode/Decode waku message with timestamp": diff --git a/tests/test_waku.nim b/tests/test_waku.nim index cf5675716..310356a44 100644 --- a/tests/test_waku.nim +++ b/tests/test_waku.nim @@ -2,7 +2,7 @@ import chronos, testutils/unittests, std/options -import waku +import logos_delivery import tools/confutils/cli_args suite "Waku API - Create node": diff --git a/tests/test_waku_dnsdisc.nim b/tests/test_waku_dnsdisc.nim index 758bdb3ca..848f2c441 100644 --- a/tests/test_waku_dnsdisc.nim +++ b/tests/test_waku_dnsdisc.nim @@ -11,9 +11,9 @@ import eth/keys, dnsdisc/builder import - waku/node/peer_manager, - waku/waku_node, - waku/discovery/waku_dnsdisc, + logos_delivery/waku/node/peer_manager, + logos_delivery/waku/waku_node, + logos_delivery/waku/discovery/waku_dnsdisc, ./testlib/common, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/test_waku_enr.nim b/tests/test_waku_enr.nim index 10183adf5..5b1688682 100644 --- a/tests/test_waku_enr.nim +++ b/tests/test_waku_enr.nim @@ -1,7 +1,7 @@ {.used.} import std/[options, sequtils], results, testutils/unittests -import waku/waku_core, waku/waku_enr, ./testlib/wakucore +import logos_delivery/waku/waku_core, logos_delivery/waku/waku_enr, ./testlib/wakucore suite "Waku ENR - Capabilities bitfield": test "check capabilities support": diff --git a/tests/test_waku_keepalive.nim b/tests/test_waku_keepalive.nim index 32cfb245d..8c4845f55 100644 --- a/tests/test_waku_keepalive.nim +++ b/tests/test_waku_keepalive.nim @@ -10,9 +10,9 @@ import libp2p/stream/connection, libp2p/crypto/crypto import - waku/waku_core, - waku/waku_node, - waku/node/health_monitor, + logos_delivery/waku/waku_core, + logos_delivery/waku/waku_node, + logos_delivery/waku/node/health_monitor, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/test_waku_keystore.nim b/tests/test_waku_keystore.nim index 8fd8ad297..cba5d87b2 100644 --- a/tests/test_waku_keystore.nim +++ b/tests/test_waku_keystore.nim @@ -1,9 +1,9 @@ {.used.} import std/[os, json], chronos, testutils/unittests -import waku/waku_keystore, ./testlib/common +import logos_delivery/waku/waku_keystore, ./testlib/common -from waku/waku_noise/noise_utils import randomSeqByte +from logos_delivery/waku/waku_noise/noise_utils import randomSeqByte procSuite "Credentials test suite": let testAppInfo = AppInfo(application: "test", appIdentifier: "1234", version: "0.1") diff --git a/tests/test_waku_keystore_keyfile.nim b/tests/test_waku_keystore_keyfile.nim index afdb7e44b..4413659e8 100644 --- a/tests/test_waku_keystore_keyfile.nim +++ b/tests/test_waku_keystore_keyfile.nim @@ -1,9 +1,9 @@ {.used.} import std/[json, os], stew/byteutils, testutils/unittests, chronos, eth/keys -import waku/waku_keystore, ./testlib/common +import logos_delivery/waku/waku_keystore, ./testlib/common -from waku/waku_noise/noise_utils import randomSeqByte +from logos_delivery/waku/waku_noise/noise_utils import randomSeqByte suite "KeyFile test suite": test "Create/Save/Load single keyfile": diff --git a/tests/test_waku_metadata.nim b/tests/test_waku_metadata.nim index cfceb89b5..0252d3f77 100644 --- a/tests/test_waku_metadata.nim +++ b/tests/test_waku_metadata.nim @@ -13,7 +13,7 @@ import eth/keys, eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ waku_node, waku_core/topics, waku_core, diff --git a/tests/test_waku_netconfig.nim b/tests/test_waku_netconfig.nim index 0aff64121..697777233 100644 --- a/tests/test_waku_netconfig.nim +++ b/tests/test_waku_netconfig.nim @@ -2,12 +2,12 @@ import chronos, confutils/toml/std/net, libp2p/multiaddress, testutils/unittests -import ./testlib/wakunode, waku/waku_enr/capabilities +import ./testlib/wakunode, logos_delivery/waku/waku_enr/capabilities include - waku/net/net_config, - waku/factory/conf_builder/web_socket_conf_builder, - waku/factory/conf_builder/conf_builder + logos_delivery/waku/net/net_config, + logos_delivery/waku/factory/conf_builder/web_socket_conf_builder, + logos_delivery/waku/factory/conf_builder/conf_builder proc defaultTestWakuFlags(): CapabilitiesBitfield = CapabilitiesBitfield.init( diff --git a/tests/test_waku_noise.nim b/tests/test_waku_noise.nim index 6566f9eed..3709f9176 100644 --- a/tests/test_waku_noise.nim +++ b/tests/test_waku_noise.nim @@ -9,7 +9,7 @@ import libp2p/protobuf/minprotobuf, stew/endians2 import - waku/[ + logos_delivery/waku/[ utils/noise as waku_message_utils, waku_noise/noise_types, waku_noise/noise_utils, diff --git a/tests/test_waku_noise_sessions.nim b/tests/test_waku_noise_sessions.nim index 543653982..8393a7ba5 100644 --- a/tests/test_waku_noise_sessions.nim +++ b/tests/test_waku_noise_sessions.nim @@ -2,7 +2,7 @@ import std/tables, results, stew/byteutils, testutils/unittests import - waku/[ + logos_delivery/waku/[ common/protobuf, utils/noise as waku_message_utils, waku_noise/noise_types, diff --git a/tests/test_waku_protobufs.nim b/tests/test_waku_protobufs.nim index cd5e3dd02..741ef3eb2 100644 --- a/tests/test_waku_protobufs.nim +++ b/tests/test_waku_protobufs.nim @@ -2,7 +2,7 @@ import std/[options, sequtils, tables], testutils/unittests, chronos, chronicles import - waku/waku_metadata, waku/waku_metadata/rpc, ./testlib/wakucore, ./testlib/wakunode + logos_delivery/waku/waku_metadata, logos_delivery/waku/waku_metadata/rpc, ./testlib/wakucore, ./testlib/wakunode procSuite "Waku Protobufs": # TODO: Missing test coverage in many encode/decode protobuf functions diff --git a/tests/test_waku_rendezvous.nim b/tests/test_waku_rendezvous.nim index 88845dc25..0ebe648fa 100644 --- a/tests/test_waku_rendezvous.nim +++ b/tests/test_waku_rendezvous.nim @@ -8,14 +8,14 @@ import libp2p/protocols/rendezvous import - waku/waku_core/peers, - waku/waku_core/codecs, - waku/waku_core, - waku/node/waku_node, - waku/node/peer_manager/peer_manager, - waku/waku_rendezvous/protocol, - waku/waku_rendezvous/common, - waku/waku_rendezvous/waku_peer_record, + logos_delivery/waku/waku_core/peers, + logos_delivery/waku/waku_core/codecs, + logos_delivery/waku/waku_core, + logos_delivery/waku/node/waku_node, + logos_delivery/waku/node/peer_manager/peer_manager, + logos_delivery/waku/waku_rendezvous/protocol, + logos_delivery/waku/waku_rendezvous/common, + logos_delivery/waku/waku_rendezvous/waku_peer_record, ./testlib/[wakucore, wakunode] procSuite "Waku Rendezvous": diff --git a/tests/test_waku_switch.nim b/tests/test_waku_switch.nim index 9f11a41a1..c3f635c17 100644 --- a/tests/test_waku_switch.nim +++ b/tests/test_waku_switch.nim @@ -8,7 +8,7 @@ import libp2p/protocols/connectivity/relay/relay, libp2p/protocols/connectivity/relay/client, stew/byteutils -import waku/node/waku_switch, ./testlib/common, ./testlib/wakucore +import logos_delivery/waku/node/waku_switch, ./testlib/common, ./testlib/wakucore proc newCircuitRelayClientSwitch(relayClient: RelayClient): Switch = SwitchBuilder diff --git a/tests/test_wakunode.nim b/tests/test_wakunode.nim index a7f1084fb..1e79cfc1b 100644 --- a/tests/test_wakunode.nim +++ b/tests/test_wakunode.nim @@ -17,7 +17,7 @@ import eth/p2p/discoveryv5/enr, eth/net/utils import - waku/[waku_core, waku_node, node/peer_manager], ./testlib/wakucore, ./testlib/wakunode + logos_delivery/waku/[waku_core, waku_node, node/peer_manager], ./testlib/wakucore, ./testlib/wakunode suite "WakuNode": asyncTest "Protocol matcher works as expected": diff --git a/tests/testlib/futures.nim b/tests/testlib/futures.nim index dad1baec8..2661600d6 100644 --- a/tests/testlib/futures.nim +++ b/tests/testlib/futures.nim @@ -1,6 +1,6 @@ import chronos -import waku/[waku_core/message, waku_store] +import logos_delivery/waku/[waku_core/message, waku_store] const FUTURE_TIMEOUT* = 1.seconds diff --git a/tests/testlib/postgres.nim b/tests/testlib/postgres.nim index 1449a5936..3edff6582 100644 --- a/tests/testlib/postgres.nim +++ b/tests/testlib/postgres.nim @@ -1,6 +1,6 @@ import chronicles, chronos import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver as driver_module, waku_archive/driver/builder, diff --git a/tests/testlib/tables.nim b/tests/testlib/tables.nim index 2abb2d6eb..c6eba9582 100644 --- a/tests/testlib/tables.nim +++ b/tests/testlib/tables.nim @@ -1,6 +1,6 @@ import std/[tables, sequtils, options] -import waku/waku_core/topics, ../testlib/wakucore +import logos_delivery/waku/waku_core/topics, ../testlib/wakucore proc `==`*( table: Table[pubsub_topic.RelayShard, seq[NsContentTopic]], diff --git a/tests/testlib/wakucore.nim b/tests/testlib/wakucore.nim index 0c5b5199d..d681adc31 100644 --- a/tests/testlib/wakucore.nim +++ b/tests/testlib/wakucore.nim @@ -7,7 +7,7 @@ import libp2p/builders, libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys -import waku/waku_core, ./common +import logos_delivery/waku/waku_core, ./common export switch diff --git a/tests/testlib/wakunode.nim b/tests/testlib/wakunode.nim index c23854f08..bab8c5764 100644 --- a/tests/testlib/wakunode.nim +++ b/tests/testlib/wakunode.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - waku/[ + logos_delivery/waku/[ waku_node, net/net_config, waku_core/topics, diff --git a/tests/waku_archive/archive_utils.nim b/tests/waku_archive/archive_utils.nim index 498855075..126607c59 100644 --- a/tests/waku_archive/archive_utils.nim +++ b/tests/waku_archive/archive_utils.nim @@ -3,7 +3,7 @@ import std/options, results, chronos, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_core, waku_archive, diff --git a/tests/waku_archive/test_driver_postgres.nim b/tests/waku_archive/test_driver_postgres.nim index 34a428615..1295aebb6 100644 --- a/tests/waku_archive/test_driver_postgres.nim +++ b/tests/waku_archive/test_driver_postgres.nim @@ -2,7 +2,7 @@ import std/[sequtils, options], testutils/unittests, chronos import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver/postgres_driver, waku_core, diff --git a/tests/waku_archive/test_driver_postgres_query.nim b/tests/waku_archive/test_driver_postgres_query.nim index 240ac28dd..9a015c2f2 100644 --- a/tests/waku_archive/test_driver_postgres_query.nim +++ b/tests/waku_archive/test_driver_postgres_query.nim @@ -6,7 +6,7 @@ import chronos, chronicles import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver as driver_module, waku_archive/driver/postgres_driver, diff --git a/tests/waku_archive/test_driver_queue.nim b/tests/waku_archive/test_driver_queue.nim index 584ea9d7e..571b3790c 100644 --- a/tests/waku_archive/test_driver_queue.nim +++ b/tests/waku_archive/test_driver_queue.nim @@ -2,7 +2,7 @@ import std/options, results, testutils/unittests import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver/queue_driver/queue_driver {.all.}, waku_archive/driver/queue_driver/index, diff --git a/tests/waku_archive/test_driver_queue_index.nim b/tests/waku_archive/test_driver_queue_index.nim index f34e181af..85490fc07 100644 --- a/tests/waku_archive/test_driver_queue_index.nim +++ b/tests/waku_archive/test_driver_queue_index.nim @@ -1,7 +1,7 @@ {.used.} import std/random, testutils/unittests -import waku/waku_core, waku/waku_archive/driver/queue_driver/index +import logos_delivery/waku/waku_core, logos_delivery/waku/waku_archive/driver/queue_driver/index var rng = initRand() diff --git a/tests/waku_archive/test_driver_queue_pagination.nim b/tests/waku_archive/test_driver_queue_pagination.nim index 45543c570..1cc18d9ec 100644 --- a/tests/waku_archive/test_driver_queue_pagination.nim +++ b/tests/waku_archive/test_driver_queue_pagination.nim @@ -3,7 +3,7 @@ import std/[options, sequtils, algorithm], testutils/unittests, libp2p/protobuf/minprotobuf import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver/queue_driver/queue_driver {.all.}, waku_archive/driver/queue_driver/index, diff --git a/tests/waku_archive/test_driver_queue_query.nim b/tests/waku_archive/test_driver_queue_query.nim index b93e79bf6..ee371da41 100644 --- a/tests/waku_archive/test_driver_queue_query.nim +++ b/tests/waku_archive/test_driver_queue_query.nim @@ -3,7 +3,7 @@ import std/[options, sequtils, random, algorithm], testutils/unittests, chronos, chronicles import - waku/[ + logos_delivery/waku/[ waku_archive, waku_archive/driver/queue_driver, waku_core, waku_core/message/digest ], ../testlib/common, diff --git a/tests/waku_archive/test_driver_sqlite.nim b/tests/waku_archive/test_driver_sqlite.nim index 5809a8492..1eb30cb44 100644 --- a/tests/waku_archive/test_driver_sqlite.nim +++ b/tests/waku_archive/test_driver_sqlite.nim @@ -2,7 +2,7 @@ import std/sequtils, testutils/unittests, chronos import - waku/[waku_archive, waku_archive/driver/sqlite_driver, waku_core], + logos_delivery/waku/[waku_archive, waku_archive/driver/sqlite_driver, waku_core], ../waku_archive/archive_utils, ../testlib/wakucore diff --git a/tests/waku_archive/test_driver_sqlite_query.nim b/tests/waku_archive/test_driver_sqlite_query.nim index 6ae7c5b9d..fcd52e7fb 100644 --- a/tests/waku_archive/test_driver_sqlite_query.nim +++ b/tests/waku_archive/test_driver_sqlite_query.nim @@ -4,7 +4,7 @@ import std/[options, sequtils, random, algorithm], testutils/unittests, chronos, chronicles import - waku/[waku_archive, waku_core, waku_core/message/digest], + logos_delivery/waku/[waku_archive, waku_core, waku_core/message/digest], ../testlib/common, ../testlib/wakucore, ../waku_archive/archive_utils diff --git a/tests/waku_archive/test_partition_manager.nim b/tests/waku_archive/test_partition_manager.nim index dbfdd846c..ebc02a0f3 100644 --- a/tests/waku_archive/test_partition_manager.nim +++ b/tests/waku_archive/test_partition_manager.nim @@ -1,7 +1,7 @@ {.used.} import testutils/unittests, chronos -import waku/waku_archive/driver/postgres_driver/partitions_manager, waku/waku_core/time +import logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager, logos_delivery/waku/waku_core/time suite "Partition Manager": test "Calculate end partition time": diff --git a/tests/waku_archive/test_retention_policy.nim b/tests/waku_archive/test_retention_policy.nim index 394d5711d..5a500d2cf 100644 --- a/tests/waku_archive/test_retention_policy.nim +++ b/tests/waku_archive/test_retention_policy.nim @@ -2,7 +2,7 @@ import std/[sequtils, times], results, testutils/unittests, chronos import - waku/[ + logos_delivery/waku/[ waku_core, waku_core/message/digest, waku_archive, diff --git a/tests/waku_archive/test_waku_archive.nim b/tests/waku_archive/test_waku_archive.nim index 9b235dd57..b6eb8d98e 100644 --- a/tests/waku_archive/test_waku_archive.nim +++ b/tests/waku_archive/test_waku_archive.nim @@ -3,7 +3,7 @@ import std/[options, sequtils], testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ common/databases/db_postgres/dbconn, common/paging, waku_core, diff --git a/tests/waku_core/test_message_digest.nim b/tests/waku_core/test_message_digest.nim index 22a10d84d..babf84f8f 100644 --- a/tests/waku_core/test_message_digest.nim +++ b/tests/waku_core/test_message_digest.nim @@ -1,7 +1,7 @@ {.used.} import std/sequtils, stew/byteutils, stew/endians2, testutils/unittests -import waku/waku_core, ../testlib/wakucore +import logos_delivery/waku/waku_core, ../testlib/wakucore suite "Waku Message - Deterministic hashing": test "digest computation - empty meta field": diff --git a/tests/waku_core/test_namespaced_topics.nim b/tests/waku_core/test_namespaced_topics.nim index 8c3cee1fc..9cb378b57 100644 --- a/tests/waku_core/test_namespaced_topics.nim +++ b/tests/waku_core/test_namespaced_topics.nim @@ -1,7 +1,7 @@ {.used.} import std/options, results, testutils/unittests -import waku/waku_core/topics +import logos_delivery/waku/waku_core/topics suite "Waku Message - Content topics namespacing": test "Stringify namespaced content topic": diff --git a/tests/waku_core/test_peers.nim b/tests/waku_core/test_peers.nim index 0ba3e5b04..246a1d6d8 100644 --- a/tests/waku_core/test_peers.nim +++ b/tests/waku_core/test_peers.nim @@ -8,7 +8,7 @@ import libp2p/peerid, libp2p/errors, confutils/toml/std/net -import waku/[waku_core, waku_enr], ../testlib/wakucore +import logos_delivery/waku/[waku_core, waku_enr], ../testlib/wakucore suite "Waku Core - Peers": test "Peer info parses correctly": diff --git a/tests/waku_core/test_time.nim b/tests/waku_core/test_time.nim index c54afeb36..af0401c84 100644 --- a/tests/waku_core/test_time.nim +++ b/tests/waku_core/test_time.nim @@ -1,7 +1,7 @@ {.used.} import testutils/unittests -import waku/waku_core/time +import logos_delivery/waku/waku_core/time suite "Waku Core - Time": test "Test timestamp conversion": diff --git a/tests/waku_core/topics/test_pubsub_topic.nim b/tests/waku_core/topics/test_pubsub_topic.nim index 4807d30d1..5ebf92b51 100644 --- a/tests/waku_core/topics/test_pubsub_topic.nim +++ b/tests/waku_core/topics/test_pubsub_topic.nim @@ -2,7 +2,7 @@ import std/[options], testutils/unittests, results -import waku/waku_core/topics/pubsub_topic, ../../testlib/[wakucore] +import logos_delivery/waku/waku_core/topics/pubsub_topic, ../../testlib/[wakucore] suite "Static Sharding Functionality": test "Shard Cluster Identification": diff --git a/tests/waku_core/topics/test_sharding.nim b/tests/waku_core/topics/test_sharding.nim index 33c38b430..5979269e8 100644 --- a/tests/waku_core/topics/test_sharding.nim +++ b/tests/waku_core/topics/test_sharding.nim @@ -1,6 +1,6 @@ import std/[options, tables], testutils/unittests -import waku/waku_core/topics, ../../testlib/[wakucore, tables, testutils] +import logos_delivery/waku/waku_core/topics, ../../testlib/[wakucore, tables, testutils] const GenerationZeroShardsCount = 8 const ClusterId = 1 diff --git a/tests/waku_discv5/test_waku_discv5.nim b/tests/waku_discv5/test_waku_discv5.nim index 58d7d5bb8..e7c53a58d 100644 --- a/tests/waku_discv5/test_waku_discv5.nim +++ b/tests/waku_discv5/test_waku_discv5.nim @@ -13,7 +13,7 @@ import libp2p/protocols/rendezvous import - waku/[ + logos_delivery/waku/[ waku_core/topics, waku_core/codecs, waku_enr, diff --git a/tests/waku_discv5/utils.nim b/tests/waku_discv5/utils.nim index 5a69108c5..bbb47308e 100644 --- a/tests/waku_discv5/utils.nim +++ b/tests/waku_discv5/utils.nim @@ -1,7 +1,7 @@ import std/options, chronos, libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - waku/ + logos_delivery/waku/ [waku_core/topics, waku_enr, discovery/waku_discv5, node/peer_manager/peer_manager], ../testlib/[common, wakucore] diff --git a/tests/waku_enr/test_sharding.nim b/tests/waku_enr/test_sharding.nim index 789f8faec..eddf22448 100644 --- a/tests/waku_enr/test_sharding.nim +++ b/tests/waku_enr/test_sharding.nim @@ -8,7 +8,7 @@ import eth/keys as eth_keys import - waku/[waku_enr, discovery/waku_discv5, waku_core, common/enr], + logos_delivery/waku/[waku_enr, discovery/waku_discv5, waku_core, common/enr], ../testlib/wakucore, ../waku_discv5/utils, ./utils diff --git a/tests/waku_enr/utils.nim b/tests/waku_enr/utils.nim index 7302c2112..32d472d85 100644 --- a/tests/waku_enr/utils.nim +++ b/tests/waku_enr/utils.nim @@ -6,7 +6,7 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys -import waku/[waku_enr, discovery/waku_discv5, waku_enr/sharding], ../testlib/wakucore +import logos_delivery/waku/[waku_enr, discovery/waku_discv5, waku_enr/sharding], ../testlib/wakucore proc newTestEnrRecord*( privKey: libp2p_keys.PrivateKey, diff --git a/tests/waku_filter_v2/test_waku_client.nim b/tests/waku_filter_v2/test_waku_client.nim index b34c22018..9e74562fd 100644 --- a/tests/waku_filter_v2/test_waku_client.nim +++ b/tests/waku_filter_v2/test_waku_client.nim @@ -3,10 +3,10 @@ import std/[options, sequtils, json], testutils/unittests, results, chronos import - waku/node/peer_manager, - waku/waku_node, - waku/waku_core, - waku/waku_filter_v2/[common, client, subscriptions, protocol, rpc_codec], + logos_delivery/waku/node/peer_manager, + logos_delivery/waku/waku_node, + logos_delivery/waku/waku_core, + logos_delivery/waku/waku_filter_v2/[common, client, subscriptions, protocol, rpc_codec], ../testlib/[wakucore, testasync, testutils, futures, sequtils, wakunode], ./waku_filter_utils, ../resources/payloads diff --git a/tests/waku_filter_v2/test_waku_filter_dos_protection.nim b/tests/waku_filter_v2/test_waku_filter_dos_protection.nim index be92fc409..c55a9b4cd 100644 --- a/tests/waku_filter_v2/test_waku_filter_dos_protection.nim +++ b/tests/waku_filter_v2/test_waku_filter_dos_protection.nim @@ -9,8 +9,8 @@ import libp2p/peerstore import - waku/[node/peer_manager, waku_core], - waku/waku_filter_v2/[common, client, subscriptions, protocol], + logos_delivery/waku/[node/peer_manager, waku_core], + logos_delivery/waku/waku_filter_v2/[common, client, subscriptions, protocol], ../testlib/[wakucore, testasync, futures], ./waku_filter_utils diff --git a/tests/waku_filter_v2/waku_filter_utils.nim b/tests/waku_filter_v2/waku_filter_utils.nim index 2f04ceb36..fce601a09 100644 --- a/tests/waku_filter_v2/waku_filter_utils.nim +++ b/tests/waku_filter_v2/waku_filter_utils.nim @@ -1,7 +1,7 @@ import std/[options, tables, sets, algorithm], chronos, chronicles, os import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_filter_v2, waku_filter_v2/client, diff --git a/tests/waku_keystore/utils.nim b/tests/waku_keystore/utils.nim index 8af2d2a26..e041a4e85 100644 --- a/tests/waku_keystore/utils.nim +++ b/tests/waku_keystore/utils.nim @@ -4,7 +4,7 @@ import stint import - waku/[waku_keystore/protocol_types, waku_rln_relay, waku_rln_relay/protocol_types] + logos_delivery/waku/[waku_keystore/protocol_types, waku_rln_relay, waku_rln_relay/protocol_types] func fromStrToBytesLe*(v: string): seq[byte] = try: diff --git a/tests/waku_lightpush/lightpush_utils.nim b/tests/waku_lightpush/lightpush_utils.nim index 7bd44a311..8eb133d99 100644 --- a/tests/waku_lightpush/lightpush_utils.nim +++ b/tests/waku_lightpush/lightpush_utils.nim @@ -3,12 +3,12 @@ import std/options, chronos, chronicles, libp2p/crypto/crypto import - waku/node/peer_manager, - waku/waku_core, - waku/waku_core/topics/sharding, - waku/waku_lightpush, - waku/waku_lightpush/[client, common], - waku/common/rate_limit/setting, + logos_delivery/waku/node/peer_manager, + logos_delivery/waku/waku_core, + logos_delivery/waku/waku_core/topics/sharding, + logos_delivery/waku/waku_lightpush, + logos_delivery/waku/waku_lightpush/[client, common], + logos_delivery/waku/common/rate_limit/setting, ../testlib/[common, wakucore] proc newTestWakuLightpushNode*( diff --git a/tests/waku_lightpush/test_client.nim b/tests/waku_lightpush/test_client.nim index 0bc9afdd4..c7bf7b4a6 100644 --- a/tests/waku_lightpush/test_client.nim +++ b/tests/waku_lightpush/test_client.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_core, waku_lightpush, diff --git a/tests/waku_lightpush/test_ratelimit.nim b/tests/waku_lightpush/test_ratelimit.nim index e023bf3f5..f32a45fbf 100644 --- a/tests/waku_lightpush/test_ratelimit.nim +++ b/tests/waku_lightpush/test_ratelimit.nim @@ -3,7 +3,7 @@ import std/options, testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[node/peer_manager, waku_core, waku_lightpush, waku_lightpush/client], + logos_delivery/waku/[node/peer_manager, waku_core, waku_lightpush, waku_lightpush/client], ../testlib/wakucore, ./lightpush_utils diff --git a/tests/waku_lightpush_legacy/lightpush_utils.nim b/tests/waku_lightpush_legacy/lightpush_utils.nim index d5602173a..1e549859b 100644 --- a/tests/waku_lightpush_legacy/lightpush_utils.nim +++ b/tests/waku_lightpush_legacy/lightpush_utils.nim @@ -6,10 +6,10 @@ logScope: topics = "test waku_lightpush_legacy" import - waku/node/peer_manager, - waku/waku_lightpush_legacy, - waku/waku_lightpush_legacy/[client, common], - waku/common/rate_limit/setting, + logos_delivery/waku/node/peer_manager, + logos_delivery/waku/waku_lightpush_legacy, + logos_delivery/waku/waku_lightpush_legacy/[client, common], + logos_delivery/waku/common/rate_limit/setting, ../testlib/[common, wakucore] proc newTestWakuLegacyLightpushNode*( diff --git a/tests/waku_lightpush_legacy/test_client.nim b/tests/waku_lightpush_legacy/test_client.nim index 3d3027e9c..d60595a1e 100644 --- a/tests/waku_lightpush_legacy/test_client.nim +++ b/tests/waku_lightpush_legacy/test_client.nim @@ -3,7 +3,7 @@ import std/[options, strscans], testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_core, waku_lightpush_legacy, diff --git a/tests/waku_lightpush_legacy/test_ratelimit.nim b/tests/waku_lightpush_legacy/test_ratelimit.nim index ae5f5ed28..345501d0b 100644 --- a/tests/waku_lightpush_legacy/test_ratelimit.nim +++ b/tests/waku_lightpush_legacy/test_ratelimit.nim @@ -3,7 +3,7 @@ import std/options, testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_core, waku_lightpush_legacy, diff --git a/tests/waku_peer_exchange/test_protocol.nim b/tests/waku_peer_exchange/test_protocol.nim index 29ec45d1e..93c522c06 100644 --- a/tests/waku_peer_exchange/test_protocol.nim +++ b/tests/waku_peer_exchange/test_protocol.nim @@ -9,7 +9,7 @@ import brokers/broker_context import - waku/[ + logos_delivery/waku/[ waku_node, node/peer_manager, discovery/waku_discv5, diff --git a/tests/waku_peer_exchange/test_rpc_codec.nim b/tests/waku_peer_exchange/test_rpc_codec.nim index 84aec7ec4..ca86ce294 100644 --- a/tests/waku_peer_exchange/test_rpc_codec.nim +++ b/tests/waku_peer_exchange/test_rpc_codec.nim @@ -11,7 +11,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ node/peer_manager, discovery/waku_discv5, waku_peer_exchange/rpc, diff --git a/tests/waku_peer_exchange/utils.nim b/tests/waku_peer_exchange/utils.nim index ce7660bf0..c72405c51 100644 --- a/tests/waku_peer_exchange/utils.nim +++ b/tests/waku_peer_exchange/utils.nim @@ -11,7 +11,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ waku_node, discovery/waku_discv5, waku_peer_exchange, diff --git a/tests/waku_relay/test_message_id.nim b/tests/waku_relay/test_message_id.nim index 6dcd72ab7..96022a2d9 100644 --- a/tests/waku_relay/test_message_id.nim +++ b/tests/waku_relay/test_message_id.nim @@ -5,7 +5,7 @@ import nimcrypto/sha2, libp2p/protocols/pubsub/rpc/messages -import waku/waku_relay/message_id +import logos_delivery/waku/waku_relay/message_id suite "Message ID Provider": test "Non-empty string": diff --git a/tests/waku_relay/test_protocol.nim b/tests/waku_relay/test_protocol.nim index 46032b693..77466d32a 100644 --- a/tests/waku_relay/test_protocol.nim +++ b/tests/waku_relay/test_protocol.nim @@ -10,7 +10,7 @@ import std/json import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_relay/protocol, waku_relay, diff --git a/tests/waku_relay/test_wakunode_relay.nim b/tests/waku_relay/test_wakunode_relay.nim index a687119bd..58e4b734f 100644 --- a/tests/waku_relay/test_wakunode_relay.nim +++ b/tests/waku_relay/test_wakunode_relay.nim @@ -9,7 +9,7 @@ import libp2p/protocols/pubsub/pubsub, libp2p/protocols/pubsub/gossipsub import - waku/[waku_core, node/peer_manager, waku_node, waku_relay], + logos_delivery/waku/[waku_core, node/peer_manager, waku_node, waku_relay], ../testlib/testutils, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/waku_relay/utils.nim b/tests/waku_relay/utils.nim index 069600106..4a37a3292 100644 --- a/tests/waku_relay/utils.nim +++ b/tests/waku_relay/utils.nim @@ -13,7 +13,7 @@ import brokers/broker_context from std/times import epochTime import - waku/[ + logos_delivery/waku/[ waku_relay, node/waku_node, node/peer_manager, waku_core, waku_node, waku_rln_relay ], ../waku_store/store_utils, diff --git a/tests/waku_rln_relay/rln/test_rln_interface.nim b/tests/waku_rln_relay/rln/test_rln_interface.nim index 7b8ea3878..5ace0c8bb 100644 --- a/tests/waku_rln_relay/rln/test_rln_interface.nim +++ b/tests/waku_rln_relay/rln/test_rln_interface.nim @@ -1,7 +1,7 @@ import testutils/unittests, results -import waku/waku_rln_relay/rln/rln_interface -import waku/waku_rln_relay/rln/wrappers +import logos_delivery/waku/waku_rln_relay/rln/rln_interface +import logos_delivery/waku/waku_rln_relay/rln/wrappers suite "Vec_uint8": suite "toVecUint8": diff --git a/tests/waku_rln_relay/rln/test_wrappers.nim b/tests/waku_rln_relay/rln/test_wrappers.nim index 8cd9251c0..dc95d198b 100644 --- a/tests/waku_rln_relay/rln/test_wrappers.nim +++ b/tests/waku_rln_relay/rln/test_wrappers.nim @@ -1,6 +1,6 @@ import testutils/unittests, results -import waku/waku_rln_relay/rln, waku/waku_rln_relay/rln/wrappers, ./waku_rln_relay_utils +import logos_delivery/waku/waku_rln_relay/rln, logos_delivery/waku/waku_rln_relay/rln/wrappers, ./waku_rln_relay_utils suite "membershipKeyGen": test "ok": diff --git a/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim b/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim index 4bdcbbdc3..065610065 100644 --- a/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim +++ b/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim @@ -1,8 +1,8 @@ import std/tempfiles import - waku/waku_rln_relay, - waku/waku_rln_relay/[ + logos_delivery/waku/waku_rln_relay, + logos_delivery/waku/waku_rln_relay/[ group_manager, rln, conversion_utils, constants, protocol_types, protocol_metrics, nonce_manager, ] diff --git a/tests/waku_rln_relay/test_rln_contract_deployment.nim b/tests/waku_rln_relay/test_rln_contract_deployment.nim index 5a9624ce8..f903a2382 100644 --- a/tests/waku_rln_relay/test_rln_contract_deployment.nim +++ b/tests/waku_rln_relay/test_rln_contract_deployment.nim @@ -5,7 +5,7 @@ import std/[options, os], results, testutils/unittests, chronos, web3 import - waku/[ + logos_delivery/waku/[ waku_rln_relay, waku_rln_relay/conversion_utils, waku_rln_relay/group_manager/on_chain/group_manager, diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim index 6af5bb0f2..e818af94f 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -17,7 +17,7 @@ import tests/testlib/testutils import - waku/[ + logos_delivery/waku/[ waku_rln_relay, waku_rln_relay/protocol_types, waku_rln_relay/constants, diff --git a/tests/waku_rln_relay/test_rln_nonce_manager.nim b/tests/waku_rln_relay/test_rln_nonce_manager.nim index 3a473f186..fb24f0e29 100644 --- a/tests/waku_rln_relay/test_rln_nonce_manager.nim +++ b/tests/waku_rln_relay/test_rln_nonce_manager.nim @@ -1,7 +1,7 @@ {.used.} import testutils/unittests, chronos, os -import waku/waku_rln_relay/nonce_manager +import logos_delivery/waku/waku_rln_relay/nonce_manager suite "Nonce manager": test "should initialize successfully": diff --git a/tests/waku_rln_relay/test_waku_rln_relay.nim b/tests/waku_rln_relay/test_waku_rln_relay.nim index 7694b8112..e71bc3593 100644 --- a/tests/waku_rln_relay/test_waku_rln_relay.nim +++ b/tests/waku_rln_relay/test_waku_rln_relay.nim @@ -12,7 +12,7 @@ import import brokers/broker_context import - waku/[ + logos_delivery/waku/[ waku_core, waku_rln_relay, waku_rln_relay/rln, diff --git a/tests/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim index 414a445fa..0056e575e 100644 --- a/tests/waku_rln_relay/test_wakunode_rln_relay.nim +++ b/tests/waku_rln_relay/test_wakunode_rln_relay.nim @@ -11,7 +11,7 @@ import brokers/broker_context import - waku/[waku_core, waku_node, waku_rln_relay], + logos_delivery/waku/[waku_core, waku_node, waku_rln_relay], ../testlib/[wakucore, futures, wakunode, testutils], ./utils_onchain, ./rln/waku_rln_relay_utils diff --git a/tests/waku_rln_relay/utils_offchain.nim b/tests/waku_rln_relay/utils_offchain.nim index e0e1bd1f7..575a3c525 100644 --- a/tests/waku_rln_relay/utils_offchain.nim +++ b/tests/waku_rln_relay/utils_offchain.nim @@ -11,7 +11,7 @@ import from std/times import epochTime import - ../../../waku/ + ../../../logos_delivery/waku/ [node/waku_node, node/peer_manager, waku_core, waku_node, waku_rln_relay], ../waku_store/store_utils, ../waku_archive/archive_utils, diff --git a/tests/waku_rln_relay/utils_onchain.nim b/tests/waku_rln_relay/utils_onchain.nim index db07d3cd6..f8fa11d28 100644 --- a/tests/waku_rln_relay/utils_onchain.nim +++ b/tests/waku_rln_relay/utils_onchain.nim @@ -19,7 +19,7 @@ import results import - waku/[ + logos_delivery/waku/[ waku_rln_relay, waku_rln_relay/protocol_types, waku_rln_relay/constants, diff --git a/tests/waku_store/store_utils.nim b/tests/waku_store/store_utils.nim index 4586a0631..893b03ae9 100644 --- a/tests/waku_store/store_utils.nim +++ b/tests/waku_store/store_utils.nim @@ -3,7 +3,7 @@ import std/options, chronos, chronicles import - waku/[node/peer_manager, waku_store, waku_store/client], ../testlib/[common, wakucore] + logos_delivery/waku/[node/peer_manager, waku_store, waku_store/client], ../testlib/[common, wakucore] proc newTestWakuStore*( switch: Switch, handler: StoreQueryRequestHandler diff --git a/tests/waku_store/test_client.nim b/tests/waku_store/test_client.nim index d9c94a10c..9f77f12e2 100644 --- a/tests/waku_store/test_client.nim +++ b/tests/waku_store/test_client.nim @@ -3,7 +3,7 @@ import std/[options, sets], testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[node/peer_manager, waku_core, waku_store, waku_store/client, common/paging], + logos_delivery/waku/[node/peer_manager, waku_core, waku_store, waku_store/client, common/paging], ../testlib/[wakucore, testasync, futures], ./store_utils diff --git a/tests/waku_store/test_resume.nim b/tests/waku_store/test_resume.nim index eb11b8f8e..612aa1e1d 100644 --- a/tests/waku_store/test_resume.nim +++ b/tests/waku_store/test_resume.nim @@ -3,7 +3,7 @@ import std/[options, net], testutils/unittests, chronos, results import - waku/[ + logos_delivery/waku/[ node/peer_manager, node/waku_node, waku_core, diff --git a/tests/waku_store/test_rpc_codec.nim b/tests/waku_store/test_rpc_codec.nim index 961e3c029..43543560a 100644 --- a/tests/waku_store/test_rpc_codec.nim +++ b/tests/waku_store/test_rpc_codec.nim @@ -2,7 +2,7 @@ import std/options, testutils/unittests, chronos import - waku/ + logos_delivery/waku/ [common/protobuf, common/paging, waku_core, waku_store/common, waku_store/rpc_codec], ../testlib/wakucore diff --git a/tests/waku_store/test_waku_store.nim b/tests/waku_store/test_waku_store.nim index 815b3ac7d..b210e6b44 100644 --- a/tests/waku_store/test_waku_store.nim +++ b/tests/waku_store/test_waku_store.nim @@ -3,7 +3,7 @@ import std/options, testutils/unittests, chronos, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ common/paging, node/peer_manager, waku_core, diff --git a/tests/waku_store/test_wakunode_store.nim b/tests/waku_store/test_wakunode_store.nim index fa73cd16d..478a91178 100644 --- a/tests/waku_store/test_wakunode_store.nim +++ b/tests/waku_store/test_wakunode_store.nim @@ -13,7 +13,7 @@ import libp2p/protocols/pubsub/pubsub, libp2p/protocols/pubsub/gossipsub import - waku/[ + logos_delivery/waku/[ common/paging, waku_core, waku_core/message/digest, diff --git a/tests/waku_store_sync/sync_utils.nim b/tests/waku_store_sync/sync_utils.nim index 888b10a83..38538b354 100644 --- a/tests/waku_store_sync/sync_utils.nim +++ b/tests/waku_store_sync/sync_utils.nim @@ -1,7 +1,7 @@ import std/[options, random], chronos, chronicles import - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_core, waku_store_sync/common, diff --git a/tests/waku_store_sync/test_codec.nim b/tests/waku_store_sync/test_codec.nim index fdfd3f2f0..c9bce7111 100644 --- a/tests/waku_store_sync/test_codec.nim +++ b/tests/waku_store_sync/test_codec.nim @@ -3,11 +3,11 @@ import std/[options, random], testutils/unittests, chronos import - ../../waku/waku_core, - ../../waku/waku_core/message/digest, - ../../waku/waku_core/time, - ../../waku/waku_store_sync/common, - ../../waku/waku_store_sync/codec, + ../../logos_delivery/waku/waku_core, + ../../logos_delivery/waku/waku_core/message/digest, + ../../logos_delivery/waku/waku_core/time, + ../../logos_delivery/waku/waku_store_sync/common, + ../../logos_delivery/waku/waku_store_sync/codec, ./sync_utils proc randomItemSet(count: int, startTime: Timestamp, rng: var Rand): ItemSet = diff --git a/tests/waku_store_sync/test_protocol.nim b/tests/waku_store_sync/test_protocol.nim index 3ffa7ad4a..62fd568a1 100644 --- a/tests/waku_store_sync/test_protocol.nim +++ b/tests/waku_store_sync/test_protocol.nim @@ -8,7 +8,7 @@ import import chronos, chronos/asyncsync import nimcrypto import - ../../waku/[ + ../../logos_delivery/waku/[ node/peer_manager, waku_core, waku_core/message, diff --git a/tests/waku_store_sync/test_range_split.nim b/tests/waku_store_sync/test_range_split.nim index fe5252416..9015d29d8 100644 --- a/tests/waku_store_sync/test_range_split.nim +++ b/tests/waku_store_sync/test_range_split.nim @@ -1,9 +1,9 @@ import unittest, nimcrypto, std/sequtils, results -import ../../waku/waku_store_sync/[reconciliation, common] -import ../../waku/waku_store_sync/storage/seq_storage -import ../../waku/waku_core/message/digest -import ../../waku/waku_core/topics/pubsub_topic -import ../../waku/waku_core/topics/content_topic +import ../../logos_delivery/waku/waku_store_sync/[reconciliation, common] +import ../../logos_delivery/waku/waku_store_sync/storage/seq_storage +import ../../logos_delivery/waku/waku_core/message/digest +import ../../logos_delivery/waku/waku_core/topics/pubsub_topic +import ../../logos_delivery/waku/waku_core/topics/content_topic proc toDigest(s: string): WakuMessageHash = let d = nimcrypto.keccak256.digest((s & "").toOpenArrayByte(0, (s.len - 1))) diff --git a/tests/waku_store_sync/test_state_transition.nim b/tests/waku_store_sync/test_state_transition.nim index 2e6bb30c3..d8129e0e5 100644 --- a/tests/waku_store_sync/test_state_transition.nim +++ b/tests/waku_store_sync/test_state_transition.nim @@ -1,9 +1,9 @@ import unittest, nimcrypto, std/sequtils -import ../../waku/waku_store_sync/[reconciliation, common] -import ../../waku/waku_store_sync/storage/seq_storage -import ../../waku/waku_core/message/digest -import ../../waku/waku_core/topics/pubsub_topic -import ../../waku/waku_core/topics/content_topic +import ../../logos_delivery/waku/waku_store_sync/[reconciliation, common] +import ../../logos_delivery/waku/waku_store_sync/storage/seq_storage +import ../../logos_delivery/waku/waku_core/message/digest +import ../../logos_delivery/waku/waku_core/topics/pubsub_topic +import ../../logos_delivery/waku/waku_core/topics/content_topic proc toDigest*(s: string): WakuMessageHash = let d = nimcrypto.keccak256.digest((s & "").toOpenArrayByte(0, s.high)) diff --git a/tests/waku_store_sync/test_storage.nim b/tests/waku_store_sync/test_storage.nim index 930d3f7dc..ba0879375 100644 --- a/tests/waku_store_sync/test_storage.nim +++ b/tests/waku_store_sync/test_storage.nim @@ -3,9 +3,9 @@ import std/[options, random, sequtils, packedsets], testutils/unittests, chronos import - ../../waku/waku_core, - ../../waku/waku_store_sync/common, - ../../waku/waku_store_sync/storage/seq_storage, + ../../logos_delivery/waku/waku_core, + ../../logos_delivery/waku/waku_store_sync/common, + ../../logos_delivery/waku/waku_store_sync/storage/seq_storage, ./sync_utils suite "Waku Sync Storage": diff --git a/tests/wakunode2/test_app.nim b/tests/wakunode2/test_app.nim index 8dc9e3582..45a268ed6 100644 --- a/tests/wakunode2/test_app.nim +++ b/tests/wakunode2/test_app.nim @@ -7,9 +7,9 @@ import chronos, libp2p/[crypto/crypto, crypto/secp, multiaddress, switch], tests/testlib/[wakucore, wakunode], - waku/factory/conf_builder/conf_builder + logos_delivery/waku/factory/conf_builder/conf_builder -include waku/factory/waku, waku/common/enr/typed_record +include logos_delivery/waku/factory/waku, logos_delivery/waku/common/enr/typed_record suite "Wakunode2 - Waku": test "compilation version should be reported": diff --git a/tests/wakunode2/test_cli_args.nim b/tests/wakunode2/test_cli_args.nim index d08544c2c..36bb947f2 100644 --- a/tests/wakunode2/test_cli_args.nim +++ b/tests/wakunode2/test_cli_args.nim @@ -14,11 +14,11 @@ import import tools/confutils/cli_args import - ../../waku/factory/networks_config, - ../../waku/factory/waku_conf, - ../../waku/common/logging, - ../../waku/common/utils/parse_size_units, - ../../waku/waku_core/message/default_values + ../../logos_delivery/waku/factory/networks_config, + ../../logos_delivery/waku/factory/waku_conf, + ../../logos_delivery/waku/common/logging, + ../../logos_delivery/waku/common/utils/parse_size_units, + ../../logos_delivery/waku/waku_core/message/default_values suite "Waku external config - default values": test "Default sharding value": diff --git a/tests/wakunode2/test_validators.nim b/tests/wakunode2/test_validators.nim index 83928e4df..c0fbf9bab 100644 --- a/tests/wakunode2/test_validators.nim +++ b/tests/wakunode2/test_validators.nim @@ -12,7 +12,7 @@ import libp2p/multihash, secp256k1 import - waku/[waku_core, node/peer_manager, waku_node, factory/validator_signed], + logos_delivery/waku/[waku_core, node/peer_manager, waku_node, factory/validator_signed], tools/confutils/cli_args, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_admin.nim b/tests/wakunode_rest/test_rest_admin.nim index ef82b8dfc..e1247fb62 100644 --- a/tests/wakunode_rest/test_rest_admin.nim +++ b/tests/wakunode_rest/test_rest_admin.nim @@ -9,7 +9,7 @@ import libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ waku_core, waku_node, waku_filter_v2/client, diff --git a/tests/wakunode_rest/test_rest_cors.nim b/tests/wakunode_rest/test_rest_cors.nim index 0393b0d72..2d198f878 100644 --- a/tests/wakunode_rest/test_rest_cors.nim +++ b/tests/wakunode_rest/test_rest_cors.nim @@ -8,7 +8,7 @@ import libp2p/multiaddress, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ waku_node, node/waku_node as waku_node2, rest_api/endpoint/server, diff --git a/tests/wakunode_rest/test_rest_debug.nim b/tests/wakunode_rest/test_rest_debug.nim index 1171f5878..923f28fa4 100644 --- a/tests/wakunode_rest/test_rest_debug.nim +++ b/tests/wakunode_rest/test_rest_debug.nim @@ -9,7 +9,7 @@ import libp2p/multiaddress, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ waku_node, node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. diff --git a/tests/wakunode_rest/test_rest_debug_serdes.nim b/tests/wakunode_rest/test_rest_debug_serdes.nim index d3232e571..40c9725f1 100644 --- a/tests/wakunode_rest/test_rest_debug_serdes.nim +++ b/tests/wakunode_rest/test_rest_debug_serdes.nim @@ -1,7 +1,7 @@ {.used.} import results, stew/byteutils, testutils/unittests, json_serialization -import waku/rest_api/endpoint/serdes, waku/rest_api/endpoint/debug/types +import logos_delivery/waku/rest_api/endpoint/serdes, logos_delivery/waku/rest_api/endpoint/debug/types suite "Waku v2 REST API - Debug - serialization": suite "DebugWakuInfo - decode": diff --git a/tests/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim index 1a4731d6a..76de0112e 100644 --- a/tests/wakunode_rest/test_rest_filter.nim +++ b/tests/wakunode_rest/test_rest_filter.nim @@ -8,7 +8,7 @@ import presto/client as presto_client, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ rest_api/message_cache, waku_core, waku_node, diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim index 0bdb93123..1f51877ec 100644 --- a/tests/wakunode_rest/test_rest_health.nim +++ b/tests/wakunode_rest/test_rest_health.nim @@ -9,7 +9,7 @@ import libp2p/multiaddress, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ common/waku_protocol, waku_node, node/waku_node as waku_node2, diff --git a/tests/wakunode_rest/test_rest_lightpush.nim b/tests/wakunode_rest/test_rest_lightpush.nim index deba7de22..ae417d11a 100644 --- a/tests/wakunode_rest/test_rest_lightpush.nim +++ b/tests/wakunode_rest/test_rest_lightpush.nim @@ -9,7 +9,7 @@ import libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ rest_api/message_cache, waku_core, waku_node, diff --git a/tests/wakunode_rest/test_rest_lightpush_legacy.nim b/tests/wakunode_rest/test_rest_lightpush_legacy.nim index 4043eeed9..5b2e3494e 100644 --- a/tests/wakunode_rest/test_rest_lightpush_legacy.nim +++ b/tests/wakunode_rest/test_rest_lightpush_legacy.nim @@ -9,7 +9,7 @@ import libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ rest_api/message_cache, waku_core, waku_node, diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim index a98b75520..def933021 100644 --- a/tests/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -9,7 +9,7 @@ import libp2p/crypto/crypto import brokers/broker_context import - waku/[ + logos_delivery/waku/[ common/base64, waku_core, waku_node, diff --git a/tests/wakunode_rest/test_rest_relay_serdes.nim b/tests/wakunode_rest/test_rest_relay_serdes.nim index 21d21e281..24ce80b9e 100644 --- a/tests/wakunode_rest/test_rest_relay_serdes.nim +++ b/tests/wakunode_rest/test_rest_relay_serdes.nim @@ -2,7 +2,7 @@ import results, stew/byteutils, unittest2, json_serialization import - waku/ + logos_delivery/waku/ [common/base64, rest_api/endpoint/serdes, rest_api/endpoint/relay/types, waku_core] suite "Waku v2 Rest API - Relay - serialization": diff --git a/tests/wakunode_rest/test_rest_serdes.nim b/tests/wakunode_rest/test_rest_serdes.nim index 2237e9216..86c14ee5b 100644 --- a/tests/wakunode_rest/test_rest_serdes.nim +++ b/tests/wakunode_rest/test_rest_serdes.nim @@ -1,7 +1,7 @@ {.used.} import results, stew/byteutils, chronicles, unittest2, json_serialization -import waku/rest_api/endpoint/serdes, waku/rest_api/endpoint/debug/types +import logos_delivery/waku/rest_api/endpoint/serdes, logos_delivery/waku/rest_api/endpoint/debug/types # TODO: Decouple this test suite from the `debug_rest_interface` module by defining # private custom types for this test suite module diff --git a/tests/wakunode_rest/test_rest_store.nim b/tests/wakunode_rest/test_rest_store.nim index 01ccea9dd..0f4ed10ea 100644 --- a/tests/wakunode_rest/test_rest_store.nim +++ b/tests/wakunode_rest/test_rest_store.nim @@ -10,7 +10,7 @@ import presto/client as presto_client, libp2p/crypto/crypto import - waku/[ + logos_delivery/waku/[ waku_core/message, waku_core/message/digest, waku_core/topics, diff --git a/tools/confutils/cli_args.nim b/tools/confutils/cli_args.nim index f965c3a06..cbd707a2d 100644 --- a/tools/confutils/cli_args.nim +++ b/tools/confutils/cli_args.nim @@ -21,9 +21,9 @@ import json import - waku/factory/[waku_conf, conf_builder/conf_builder, networks_config], - waku/common/[logging], - waku/[ + logos_delivery/waku/factory/[waku_conf, conf_builder/conf_builder, networks_config], + logos_delivery/waku/common/[logging], + logos_delivery/waku/[ waku_enr, node/peer_manager, waku_core/topics/pubsub_topic, diff --git a/tools/confutils/entry_nodes.nim b/tools/confutils/entry_nodes.nim index 2dad853b8..347bf5114 100644 --- a/tools/confutils/entry_nodes.nim +++ b/tools/confutils/entry_nodes.nim @@ -2,7 +2,7 @@ import std/strutils import results, eth/p2p/discoveryv5/enr -import waku/waku_core/peers +import logos_delivery/waku/waku_core/peers type EntryNodeType {.pure.} = enum EnrTree diff --git a/tools/rln_keystore_generator/rln_keystore_generator.nim b/tools/rln_keystore_generator/rln_keystore_generator.nim index 503e8d58e..16508178b 100644 --- a/tools/rln_keystore_generator/rln_keystore_generator.nim +++ b/tools/rln_keystore_generator/rln_keystore_generator.nim @@ -6,7 +6,7 @@ else: import chronicles, results, std/[tempfiles, sequtils] import - waku/[ + logos_delivery/waku/[ waku_keystore, waku_rln_relay/rln, waku_rln_relay/conversion_utils,