From 3b03ca29b10fb67c9d7aadaa182a866a6ba712d7 Mon Sep 17 00:00:00 2001 From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:37:53 +0200 Subject: [PATCH] refactor: introduce proper logos_delivery layers folder structure (#3935) Co-authored-by: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bump_dependencies.md | 4 +-- .github/ISSUE_TEMPLATE/prepare_release.md | 2 +- .github/workflows/ci.yml | 7 ++-- .github/workflows/container-image.yml | 2 +- .github/workflows/pr-lint.yml | 4 +-- .github/workflows/release-assets.yml | 14 ++++---- .github/workflows/version-check.yml | 16 ++++----- .gitignore | 1 + AGENTS.md | 10 +++--- Makefile | 31 +++++++++-------- apps/benchmarks/benchmarks.nim | 2 +- apps/chat2/chat2.nim | 4 +-- apps/chat2/config_chat2.nim | 2 +- apps/chat2bridge/chat2bridge.nim | 5 +-- apps/chat2mix/chat2mix.nim | 4 +-- apps/chat2mix/config_chat2mix.nim | 2 +- .../diagnose_connections.nim | 3 +- apps/liteprotocoltester/legacy_publisher.nim | 2 +- .../liteprotocoltester/liteprotocoltester.nim | 5 ++- apps/liteprotocoltester/publisher.nim | 2 +- apps/liteprotocoltester/publisher_base.nim | 2 +- apps/liteprotocoltester/receiver.nim | 2 +- .../service_peer_management.nim | 3 +- apps/liteprotocoltester/tester_config.nim | 2 +- apps/liteprotocoltester/tester_message.nim | 2 +- apps/liteprotocoltester/v3_publisher.nim | 2 +- apps/networkmonitor/networkmonitor.nim | 2 +- apps/wakucanary/wakucanary.nim | 9 ++--- apps/wakunode2/wakunode2.nim | 2 +- ci/Jenkinsfile.prs | 4 +-- examples/api_example/api_example.nim | 2 +- examples/filter_subscriber.nim | 2 +- .../lightpush_mix/lightpush_publisher_mix.nim | 2 +- .../lightpush_publisher_mix_config.nim | 2 +- examples/lightpush_publisher.nim | 2 +- examples/publisher.nim | 2 +- examples/subscriber.nim | 2 +- examples/wakustealthcommitments/node_spec.nim | 5 ++- .../stealth_commitment_protocol.nim | 2 +- examples/wakustealthcommitments/wire_spec.nim | 2 +- flake.nix | 4 +-- liblogosdelivery/declare_lib.nim | 2 +- liblogosdelivery/liblogosdelivery.nim | 3 +- .../logos_delivery_api/debug_api.nim | 2 +- .../logos_delivery_api/messaging_api.nim | 8 ++--- .../logos_delivery_api/node_api.nim | 8 ++--- library/declare_lib.nim | 2 +- .../events/json_connection_change_event.nim | 2 +- .../json_connection_status_change_event.nim | 2 +- library/events/json_message_event.nim | 6 ++-- .../events/json_topic_health_change_event.nim | 4 +-- library/kernel_api/debug_node_api.nim | 5 ++- library/kernel_api/discovery_api.nim | 10 +++--- library/kernel_api/node_lifecycle_api.nim | 10 +++--- library/kernel_api/peer_manager_api.nim | 6 +++- library/kernel_api/ping_api.nim | 4 ++- library/kernel_api/protocols/filter_api.nim | 20 +++++------ .../kernel_api/protocols/lightpush_api.nim | 14 ++++---- library/kernel_api/protocols/relay_api.nim | 16 ++++----- library/kernel_api/protocols/store_api.nim | 12 +++---- library/libwaku.nim | 14 ++++---- waku.nim => logos_delivery.nim | 4 +-- waku.nimble => logos_delivery.nimble | 3 +- .../channels}/encryption/encryption.nim | 0 .../channels}/encryption/noop_encryption.nim | 0 .../channels}/events.nim | 2 +- .../rate_limit_manager/rate_limit_manager.nim | 0 .../channels}/reliable_channel.nim | 10 +++--- .../channels}/reliable_channel_manager.nim | 15 +++------ .../scalable_data_sync/scalable_data_sync.nim | 0 .../scalable_data_sync/sds_persistence.nim | 0 .../segmentation/segment_message_proto.nim | 0 .../channels}/segmentation/segmentation.nim | 0 .../segmentation/segmentation_persistence.nim | 0 .../channels}/types.nim | 2 +- .../not_delivered_storage/migrations.nim | 4 ++- .../not_delivered_storage.nim | 6 ++-- .../delivery_service/recv_service.nim | 0 .../recv_service/recv_service.nim | 2 +- .../delivery_service/send_service.nim | 0 .../send_service/delivery_task.nim | 5 ++- .../send_service/lightpush_processor.nim | 5 ++- .../send_service/relay_processor.nim | 6 ++-- .../send_service/send_processor.nim | 0 .../send_service/send_service.nim | 4 +-- .../messaging}/messaging_client.nim | 12 +++---- {waku => logos_delivery/waku}/README.md | 0 {waku => logos_delivery/waku}/api.nim | 0 {waku => logos_delivery/waku}/api/api.nim | 12 +++---- .../waku}/api/api_conf.nim | 10 +++--- {waku => logos_delivery/waku}/api/send_api.md | 0 {waku => logos_delivery/waku}/api/types.nim | 6 ++-- .../waku}/common/base64.nim | 0 .../waku}/common/callbacks.nim | 4 ++- .../waku}/common/databases/common.nim | 0 .../waku}/common/databases/db_postgres.nim | 0 .../common/databases/db_postgres/dbconn.nim | 0 .../databases/db_postgres/pgasyncpool.nim | 0 .../databases/db_postgres/query_metrics.nim | 0 .../waku}/common/databases/db_sqlite.nim | 0 .../waku}/common/databases/dburl.nim | 0 {waku => logos_delivery/waku}/common/enr.nim | 0 .../waku}/common/enr/builder.nim | 0 .../waku}/common/enr/typed_record.nim | 0 .../waku}/common/error_handling.nim | 0 .../waku}/common/hexstrings.nim | 0 .../waku}/common/logging.nim | 0 .../waku}/common/nimchronos.nim | 0 .../waku}/common/paging.nim | 0 .../waku}/common/protobuf.nim | 0 .../common/rate_limit/per_peer_limiter.nim | 0 .../common/rate_limit/request_limiter.nim | 0 .../common/rate_limit/service_metrics.nim | 0 .../waku}/common/rate_limit/setting.nim | 0 .../rate_limit/single_token_limiter.nim | 0 .../waku}/common/rate_limit/timed_map.nim | 0 .../waku}/common/utils/DEPRECATION_NOTICE.md | 0 .../common/utils/matterbridge_client.nim | 0 .../waku}/common/utils/nat.nim | 0 .../waku}/common/utils/parse_size_units.nim | 0 .../waku}/common/utils/sequence.nim | 0 .../waku}/common/waku_protocol.nim | 0 .../waku}/discovery/autonat_service.nim | 0 .../waku}/discovery/waku_discv5.nim | 4 ++- .../waku}/discovery/waku_dnsdisc.nim | 0 .../waku}/discovery/waku_kademlia.nim | 2 +- .../waku}/events/delivery_events.nim | 2 +- .../waku}/events/events.nim | 0 .../waku}/events/health_events.nim | 6 ++-- .../waku}/events/message_events.nim | 2 +- .../waku}/events/peer_events.nim | 0 .../waku}/factory/app_callbacks.nim | 0 .../waku}/factory/builder.nim | 0 .../factory/conf_builder/conf_builder.nim | 0 .../conf_builder/discv5_conf_builder.nim | 0 .../dns_discovery_conf_builder.nim | 0 .../filter_service_conf_builder.nim | 0 .../kademlia_discovery_conf_builder.nim | 2 +- .../metrics_server_conf_builder.nim | 0 .../factory/conf_builder/mix_conf_builder.nim | 2 +- .../conf_builder/rate_limit_conf_builder.nim | 2 +- .../conf_builder/rest_server_conf_builder.nim | 0 .../conf_builder/rln_relay_conf_builder.nim | 0 .../store_service_conf_builder.nim | 0 .../conf_builder/store_sync_conf_builder.nim | 0 .../conf_builder/waku_conf_builder.nim | 2 +- .../conf_builder/web_socket_conf_builder.nim | 2 +- .../waku}/factory/internal_config.nim | 4 ++- .../waku}/factory/networks_config.nim | 0 .../waku}/factory/node_factory.nim | 0 .../waku}/factory/validator_signed.nim | 0 .../waku}/factory/waku.nim | 6 ++-- .../waku}/factory/waku_conf.nim | 0 .../waku}/factory/waku_state_info.nim | 2 +- .../waku}/incentivization/common.nim | 2 +- .../incentivization/eligibility_manager.nim | 2 +- .../incentivization/reputation_manager.nim | 0 .../waku}/incentivization/rpc.nim | 0 .../waku}/incentivization/rpc_codec.nim | 0 .../waku}/net/auto_port.nim | 0 .../waku}/net/bound_ports.nim | 0 .../waku}/net/net_config.nim | 0 .../waku}/node/edge_filter_sub_state.nim | 0 .../waku}/node/health_monitor.nim | 0 .../node/health_monitor/connection_status.nim | 0 .../health_monitor/event_loop_monitor.nim | 0 .../node/health_monitor/health_report.nim | 0 .../node/health_monitor/health_status.nim | 0 .../health_monitor/node_health_monitor.nim | 2 +- .../node/health_monitor/online_monitor.nim | 2 +- .../node/health_monitor/protocol_health.nim | 2 +- .../node/health_monitor/topic_health.nim | 2 +- .../waku}/node/node_telemetry.nim | 0 .../waku}/node/peer_manager.nim | 0 .../waku}/node/peer_manager/peer_manager.nim | 2 +- .../peer_manager/peer_store/migrations.nim | 0 .../peer_manager/peer_store/peer_storage.nim | 0 .../peer_store/waku_peer_storage.nim | 0 .../node/peer_manager/waku_peer_store.nim | 0 .../waku}/node/shard_subscription.nim | 0 .../waku}/node/subscription_manager.nim | 2 +- .../waku}/node/waku_metrics.nim | 3 +- .../waku}/node/waku_node.nim | 6 ++-- .../waku}/node/waku_node/filter.nim | 0 .../waku}/node/waku_node/lightpush.nim | 0 .../waku}/node/waku_node/peer_exchange.nim | 0 .../waku}/node/waku_node/ping.nim | 0 .../waku}/node/waku_node/relay.nim | 2 +- .../waku}/node/waku_node/store.nim | 0 .../waku}/node/waku_switch.nim | 0 .../waku}/persistency/backend_comm.nim | 0 .../waku}/persistency/backend_sqlite.nim | 0 .../waku}/persistency/backend_thread.nim | 0 .../waku}/persistency/keys.nim | 0 .../waku}/persistency/payload.nim | 0 .../waku}/persistency/persistency.nim | 0 .../waku}/persistency/schema.nim | 0 .../waku}/persistency/sds_persistency.nim | 0 .../waku}/persistency/types.nim | 0 .../waku}/requests/health_requests.nim | 9 ++--- .../waku}/requests/node_requests.nim | 2 +- .../waku}/requests/requests.nim | 0 .../waku}/requests/rln_requests.nim | 2 +- .../waku}/rest_api/endpoint/admin/client.nim | 0 .../rest_api/endpoint/admin/handlers.nim | 2 +- .../waku}/rest_api/endpoint/admin/types.nim | 2 +- .../waku}/rest_api/endpoint/builder.nim | 33 ++++++++++--------- .../waku}/rest_api/endpoint/client.nim | 0 .../waku}/rest_api/endpoint/debug/client.nim | 0 .../rest_api/endpoint/debug/handlers.nim | 0 .../waku}/rest_api/endpoint/debug/types.nim | 0 .../waku}/rest_api/endpoint/filter/client.nim | 0 .../rest_api/endpoint/filter/handlers.nim | 0 .../waku}/rest_api/endpoint/filter/types.nim | 0 .../waku}/rest_api/endpoint/health/client.nim | 2 +- .../rest_api/endpoint/health/handlers.nim | 0 .../waku}/rest_api/endpoint/health/types.nim | 2 +- .../endpoint/legacy_lightpush/client.nim | 0 .../endpoint/legacy_lightpush/handlers.nim | 4 +-- .../endpoint/legacy_lightpush/types.nim | 0 .../rest_api/endpoint/lightpush/client.nim | 0 .../rest_api/endpoint/lightpush/handlers.nim | 4 +-- .../rest_api/endpoint/lightpush/types.nim | 0 .../rest_api/endpoint/origin_handler.nim | 0 .../waku}/rest_api/endpoint/relay/client.nim | 0 .../rest_api/endpoint/relay/handlers.nim | 0 .../waku}/rest_api/endpoint/relay/types.nim | 0 .../waku}/rest_api/endpoint/responses.nim | 0 .../waku}/rest_api/endpoint/rest_serdes.nim | 0 .../waku}/rest_api/endpoint/serdes.nim | 0 .../waku}/rest_api/endpoint/server.nim | 0 .../waku}/rest_api/endpoint/store/client.nim | 0 .../rest_api/endpoint/store/handlers.nim | 0 .../waku}/rest_api/endpoint/store/types.nim | 0 .../waku}/rest_api/handlers.nim | 0 .../waku}/rest_api/message_cache.nim | 0 .../waku}/utils/DEPRECATION_NOTICE.md | 0 .../waku}/utils/collector.nim | 0 {waku => logos_delivery/waku}/utils/noise.nim | 0 .../waku}/utils/requests.nim | 0 .../waku}/utils/tableutils.nim | 0 .../waku}/waku_archive.nim | 0 .../waku}/waku_archive/archive.nim | 2 +- .../waku}/waku_archive/archive_metrics.nim | 0 .../waku}/waku_archive/common.nim | 0 .../waku}/waku_archive/driver.nim | 0 .../waku}/waku_archive/driver/builder.nim | 0 .../waku_archive/driver/postgres_driver.nim | 0 .../driver/postgres_driver/migrations.nim | 2 +- .../postgres_driver/partitions_manager.nim | 0 .../postgres_driver/postgres_driver.nim | 0 .../postgres_driver/postgres_healthcheck.nim | 0 .../waku_archive/driver/queue_driver.nim | 0 .../driver/queue_driver/index.nim | 0 .../driver/queue_driver/queue_driver.nim | 0 .../waku_archive/driver/sqlite_driver.nim | 0 .../driver/sqlite_driver/migrations.nim | 0 .../driver/sqlite_driver/queries.nim | 0 .../driver/sqlite_driver/sqlite_driver.nim | 0 .../waku}/waku_archive/retention_policy.nim | 0 .../waku_archive/retention_policy/builder.nim | 0 .../retention_policy_capacity.nim | 0 .../retention_policy_size.nim | 0 .../retention_policy_time.nim | 0 {waku => logos_delivery/waku}/waku_core.nim | 0 .../waku}/waku_core/codecs.nim | 0 .../waku}/waku_core/message.nim | 0 .../waku}/waku_core/message/codec.nim | 0 .../waku_core/message/default_values.nim | 0 .../waku}/waku_core/message/digest.nim | 0 .../waku}/waku_core/message/message.nim | 0 .../waku}/waku_core/multiaddrstr.nim | 0 .../waku}/waku_core/peers.nim | 0 .../waku}/waku_core/subscription.nim | 0 .../waku_core/subscription/push_handler.nim | 0 .../waku}/waku_core/time.nim | 0 .../waku}/waku_core/topics.nim | 0 .../waku}/waku_core/topics/content_topic.nim | 0 .../waku}/waku_core/topics/parsing.nim | 0 .../waku}/waku_core/topics/pubsub_topic.nim | 0 .../waku}/waku_core/topics/sharding.nim | 0 {waku => logos_delivery/waku}/waku_enr.nim | 0 .../waku}/waku_enr/capabilities.nim | 0 .../waku}/waku_enr/multiaddr.nim | 0 .../waku}/waku_enr/sharding.nim | 0 .../waku}/waku_filter_v2.nim | 0 .../waku}/waku_filter_v2/client.nim | 2 +- .../waku}/waku_filter_v2/common.nim | 0 .../waku}/waku_filter_v2/protocol.nim | 0 .../waku}/waku_filter_v2/protocol_metrics.nim | 0 .../waku}/waku_filter_v2/rpc.nim | 0 .../waku}/waku_filter_v2/rpc_codec.nim | 0 .../waku}/waku_filter_v2/subscriptions.nim | 0 .../waku}/waku_keystore.nim | 0 .../waku}/waku_keystore/conversion_utils.nim | 0 .../waku}/waku_keystore/keyfile.nim | 0 .../waku}/waku_keystore/keystore.nim | 0 .../waku}/waku_keystore/protocol_types.nim | 0 .../waku}/waku_keystore/utils.nim | 0 .../waku}/waku_lightpush.nim | 0 .../waku}/waku_lightpush/callbacks.nim | 0 .../waku}/waku_lightpush/client.nim | 0 .../waku}/waku_lightpush/common.nim | 0 .../waku}/waku_lightpush/protocol.nim | 0 .../waku}/waku_lightpush/protocol_metrics.nim | 0 .../waku}/waku_lightpush/rpc.nim | 0 .../waku}/waku_lightpush/rpc_codec.nim | 0 .../waku}/waku_lightpush/self_req_handler.nim | 0 .../waku}/waku_lightpush_legacy.nim | 0 .../waku}/waku_lightpush_legacy/README.md | 0 .../waku}/waku_lightpush_legacy/callbacks.nim | 0 .../waku}/waku_lightpush_legacy/client.nim | 0 .../waku}/waku_lightpush_legacy/common.nim | 0 .../waku}/waku_lightpush_legacy/protocol.nim | 0 .../protocol_metrics.nim | 0 .../waku}/waku_lightpush_legacy/rpc.nim | 0 .../waku}/waku_lightpush_legacy/rpc_codec.nim | 0 .../self_req_handler.nim | 0 .../waku}/waku_metadata.nim | 0 .../waku}/waku_metadata/protocol.nim | 0 .../waku}/waku_metadata/rpc.nim | 0 {waku => logos_delivery/waku}/waku_mix.nim | 0 .../waku}/waku_mix/protocol.nim | 8 ++--- {waku => logos_delivery/waku}/waku_node.nim | 0 .../waku}/waku_noise/noise.nim | 0 .../waku_noise/noise_handshake_processing.nim | 0 .../waku}/waku_noise/noise_types.nim | 0 .../waku}/waku_noise/noise_utils.nim | 0 .../waku}/waku_peer_exchange.nim | 0 .../waku}/waku_peer_exchange/README.md | 0 .../waku}/waku_peer_exchange/client.nim | 0 .../waku}/waku_peer_exchange/common.nim | 0 .../waku}/waku_peer_exchange/protocol.nim | 0 .../waku}/waku_peer_exchange/rpc.nim | 0 .../waku}/waku_peer_exchange/rpc_codec.nim | 0 logos_delivery/waku/waku_persistency.nim | 3 ++ {waku => logos_delivery/waku}/waku_relay.nim | 2 +- .../waku}/waku_relay/message_id.nim | 0 .../waku}/waku_relay/protocol.nim | 12 +++---- .../waku}/waku_rendezvous.nim | 0 .../waku}/waku_rendezvous/client.nim | 6 ++-- .../waku}/waku_rendezvous/common.nim | 0 .../waku}/waku_rendezvous/protocol.nim | 0 .../waku_rendezvous/waku_peer_record.nim | 0 {waku => logos_delivery/waku}/waku_rest.nim | 0 .../waku}/waku_rln_relay.nim | 0 .../waku}/waku_rln_relay/constants.nim | 0 .../waku}/waku_rln_relay/contract.nim | 0 .../waku}/waku_rln_relay/conversion_utils.nim | 0 .../waku}/waku_rln_relay/group_manager.nim | 0 .../group_manager/group_manager_base.nim | 0 .../waku_rln_relay/group_manager/on_chain.nim | 0 .../group_manager/on_chain/group_manager.nim | 0 .../group_manager/on_chain/retry_wrapper.nim | 0 .../group_manager/on_chain/rpc_wrapper.nim | 0 .../waku}/waku_rln_relay/nonce_manager.nim | 0 .../waku}/waku_rln_relay/protocol_metrics.nim | 0 .../waku}/waku_rln_relay/protocol_types.nim | 0 .../waku}/waku_rln_relay/rln.nim | 0 .../waku_rln_relay/rln/rln_interface.nim | 0 .../waku}/waku_rln_relay/rln/wrappers.nim | 0 .../waku}/waku_rln_relay/rln_relay.nim | 2 +- {waku => logos_delivery/waku}/waku_store.nim | 0 .../waku}/waku_store/client.nim | 0 .../waku}/waku_store/common.nim | 0 .../waku}/waku_store/protocol.nim | 0 .../waku}/waku_store/protocol_metrics.nim | 0 .../waku}/waku_store/resume.nim | 0 .../waku}/waku_store/rpc_codec.nim | 0 .../waku}/waku_store/self_req_handler.nim | 0 .../waku}/waku_store_sync.nim | 0 .../waku}/waku_store_sync/codec.nim | 0 .../waku}/waku_store_sync/common.nim | 0 .../waku_store_sync/protocols_metrics.nim | 0 .../waku}/waku_store_sync/reconciliation.nim | 0 .../storage/range_processing.nim | 0 .../waku_store_sync/storage/seq_storage.nim | 0 .../waku}/waku_store_sync/storage/storage.nim | 0 .../waku}/waku_store_sync/transfer.nim | 0 tests/api/test_api_health.nim | 17 +++++----- 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 | 3 +- 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 | 4 ++- tests/incentivization/test_rpc_codec.nim | 2 +- .../peer_store/test_migrations.nim | 6 ++-- .../peer_store/test_peer_storage.nim | 4 ++- .../peer_store/test_waku_peer_storage.nim | 4 ++- 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 | 3 +- 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 | 3 +- 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 | 5 ++- 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 | 6 +++- tests/test_utils_compat.nim | 6 +++- 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 | 5 ++- tests/test_waku_rendezvous.nim | 16 ++++----- tests/test_waku_switch.nim | 2 +- tests/test_wakunode.nim | 4 ++- 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 | 4 ++- .../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 | 4 ++- 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 | 4 ++- tests/waku_filter_v2/test_waku_client.nim | 9 ++--- .../test_waku_filter_dos_protection.nim | 4 +-- tests/waku_filter_v2/waku_filter_utils.nim | 2 +- tests/waku_keystore/utils.nim | 3 +- tests/waku_lightpush/lightpush_utils.nim | 12 +++---- tests/waku_lightpush/test_client.nim | 2 +- tests/waku_lightpush/test_ratelimit.nim | 3 +- .../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 | 5 ++- .../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 | 3 +- tests/waku_store/test_client.nim | 3 +- 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 | 3 +- 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 | 4 ++- 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 | 4 ++- 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 +- tools/sync-nimble-lock.sh | 16 ++++----- waku/waku_persistency.nim | 3 -- 527 files changed, 610 insertions(+), 539 deletions(-) rename waku.nim => logos_delivery.nim (73%) rename waku.nimble => logos_delivery.nimble (99%) rename {channels => logos_delivery/channels}/encryption/encryption.nim (100%) rename {channels => logos_delivery/channels}/encryption/noop_encryption.nim (100%) rename {channels => logos_delivery/channels}/events.nim (95%) rename {channels => logos_delivery/channels}/rate_limit_manager/rate_limit_manager.nim (100%) rename {channels => logos_delivery/channels}/reliable_channel.nim (98%) rename {channels => logos_delivery/channels}/reliable_channel_manager.nim (93%) rename {channels => logos_delivery/channels}/scalable_data_sync/scalable_data_sync.nim (100%) rename {channels => logos_delivery/channels}/scalable_data_sync/sds_persistence.nim (100%) rename {channels => logos_delivery/channels}/segmentation/segment_message_proto.nim (100%) rename {channels => logos_delivery/channels}/segmentation/segmentation.nim (100%) rename {channels => logos_delivery/channels}/segmentation/segmentation_persistence.nim (100%) rename {channels => logos_delivery/channels}/types.nim (85%) rename {waku/node => logos_delivery/messaging}/delivery_service/not_delivered_storage/migrations.nim (88%) rename {waku/node => logos_delivery/messaging}/delivery_service/not_delivered_storage/not_delivered_storage.nim (87%) rename {waku/node => logos_delivery/messaging}/delivery_service/recv_service.nim (100%) rename {waku/node => logos_delivery/messaging}/delivery_service/recv_service/recv_service.nim (99%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service.nim (100%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service/delivery_task.nim (94%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service/lightpush_processor.nim (95%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service/relay_processor.nim (93%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service/send_processor.nim (100%) rename {waku/node => logos_delivery/messaging}/delivery_service/send_service/send_service.nim (99%) rename {waku => logos_delivery/messaging}/messaging_client.nim (89%) rename {waku => logos_delivery/waku}/README.md (100%) rename {waku => logos_delivery/waku}/api.nim (100%) rename {waku => logos_delivery/waku}/api/api.nim (81%) rename {waku => logos_delivery/waku}/api/api_conf.nim (98%) rename {waku => logos_delivery/waku}/api/send_api.md (100%) rename {waku => logos_delivery/waku}/api/types.nim (91%) rename {waku => logos_delivery/waku}/common/base64.nim (100%) rename {waku => logos_delivery/waku}/common/callbacks.nim (68%) rename {waku => logos_delivery/waku}/common/databases/common.nim (100%) rename {waku => logos_delivery/waku}/common/databases/db_postgres.nim (100%) rename {waku => logos_delivery/waku}/common/databases/db_postgres/dbconn.nim (100%) rename {waku => logos_delivery/waku}/common/databases/db_postgres/pgasyncpool.nim (100%) rename {waku => logos_delivery/waku}/common/databases/db_postgres/query_metrics.nim (100%) rename {waku => logos_delivery/waku}/common/databases/db_sqlite.nim (100%) rename {waku => logos_delivery/waku}/common/databases/dburl.nim (100%) rename {waku => logos_delivery/waku}/common/enr.nim (100%) rename {waku => logos_delivery/waku}/common/enr/builder.nim (100%) rename {waku => logos_delivery/waku}/common/enr/typed_record.nim (100%) rename {waku => logos_delivery/waku}/common/error_handling.nim (100%) rename {waku => logos_delivery/waku}/common/hexstrings.nim (100%) rename {waku => logos_delivery/waku}/common/logging.nim (100%) rename {waku => logos_delivery/waku}/common/nimchronos.nim (100%) rename {waku => logos_delivery/waku}/common/paging.nim (100%) rename {waku => logos_delivery/waku}/common/protobuf.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/per_peer_limiter.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/request_limiter.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/service_metrics.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/setting.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/single_token_limiter.nim (100%) rename {waku => logos_delivery/waku}/common/rate_limit/timed_map.nim (100%) rename {waku => logos_delivery/waku}/common/utils/DEPRECATION_NOTICE.md (100%) rename {waku => logos_delivery/waku}/common/utils/matterbridge_client.nim (100%) rename {waku => logos_delivery/waku}/common/utils/nat.nim (100%) rename {waku => logos_delivery/waku}/common/utils/parse_size_units.nim (100%) rename {waku => logos_delivery/waku}/common/utils/sequence.nim (100%) rename {waku => logos_delivery/waku}/common/waku_protocol.nim (100%) rename {waku => logos_delivery/waku}/discovery/autonat_service.nim (100%) rename {waku => logos_delivery/waku}/discovery/waku_discv5.nim (99%) rename {waku => logos_delivery/waku}/discovery/waku_dnsdisc.nim (100%) rename {waku => logos_delivery/waku}/discovery/waku_kademlia.nim (99%) rename {waku => logos_delivery/waku}/events/delivery_events.nim (78%) rename {waku => logos_delivery/waku}/events/events.nim (100%) rename {waku => logos_delivery/waku}/events/health_events.nim (82%) rename {waku => logos_delivery/waku}/events/message_events.nim (92%) rename {waku => logos_delivery/waku}/events/peer_events.nim (100%) rename {waku => logos_delivery/waku}/factory/app_callbacks.nim (100%) rename {waku => logos_delivery/waku}/factory/builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/discv5_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/dns_discovery_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/filter_service_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/kademlia_discovery_conf_builder.nim (96%) rename {waku => logos_delivery/waku}/factory/conf_builder/metrics_server_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/mix_conf_builder.nim (96%) rename {waku => logos_delivery/waku}/factory/conf_builder/rate_limit_conf_builder.nim (95%) rename {waku => logos_delivery/waku}/factory/conf_builder/rest_server_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/rln_relay_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/store_service_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/store_sync_conf_builder.nim (100%) rename {waku => logos_delivery/waku}/factory/conf_builder/waku_conf_builder.nim (99%) rename {waku => logos_delivery/waku}/factory/conf_builder/web_socket_conf_builder.nim (97%) rename {waku => logos_delivery/waku}/factory/internal_config.nim (98%) rename {waku => logos_delivery/waku}/factory/networks_config.nim (100%) rename {waku => logos_delivery/waku}/factory/node_factory.nim (100%) rename {waku => logos_delivery/waku}/factory/validator_signed.nim (100%) rename {waku => logos_delivery/waku}/factory/waku.nim (99%) rename {waku => logos_delivery/waku}/factory/waku_conf.nim (100%) rename {waku => logos_delivery/waku}/factory/waku_state_info.nim (97%) rename {waku => logos_delivery/waku}/incentivization/common.nim (84%) rename {waku => logos_delivery/waku}/incentivization/eligibility_manager.nim (97%) rename {waku => logos_delivery/waku}/incentivization/reputation_manager.nim (100%) rename {waku => logos_delivery/waku}/incentivization/rpc.nim (100%) rename {waku => logos_delivery/waku}/incentivization/rpc_codec.nim (100%) rename {waku => logos_delivery/waku}/net/auto_port.nim (100%) rename {waku => logos_delivery/waku}/net/bound_ports.nim (100%) rename {waku => logos_delivery/waku}/net/net_config.nim (100%) rename {waku => logos_delivery/waku}/node/edge_filter_sub_state.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor/connection_status.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor/event_loop_monitor.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor/health_report.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor/health_status.nim (100%) rename {waku => logos_delivery/waku}/node/health_monitor/node_health_monitor.nim (99%) rename {waku => logos_delivery/waku}/node/health_monitor/online_monitor.nim (97%) rename {waku => logos_delivery/waku}/node/health_monitor/protocol_health.nim (96%) rename {waku => logos_delivery/waku}/node/health_monitor/topic_health.nim (92%) rename {waku => logos_delivery/waku}/node/node_telemetry.nim (100%) rename {waku => logos_delivery/waku}/node/peer_manager.nim (100%) rename {waku => logos_delivery/waku}/node/peer_manager/peer_manager.nim (99%) rename {waku => logos_delivery/waku}/node/peer_manager/peer_store/migrations.nim (100%) rename {waku => logos_delivery/waku}/node/peer_manager/peer_store/peer_storage.nim (100%) rename {waku => logos_delivery/waku}/node/peer_manager/peer_store/waku_peer_storage.nim (100%) rename {waku => logos_delivery/waku}/node/peer_manager/waku_peer_store.nim (100%) rename {waku => logos_delivery/waku}/node/shard_subscription.nim (100%) rename {waku => logos_delivery/waku}/node/subscription_manager.nim (99%) rename {waku => logos_delivery/waku}/node/waku_metrics.nim (96%) rename {waku => logos_delivery/waku}/node/waku_node.nim (99%) rename {waku => logos_delivery/waku}/node/waku_node/filter.nim (100%) rename {waku => logos_delivery/waku}/node/waku_node/lightpush.nim (100%) rename {waku => logos_delivery/waku}/node/waku_node/peer_exchange.nim (100%) rename {waku => logos_delivery/waku}/node/waku_node/ping.nim (100%) rename {waku => logos_delivery/waku}/node/waku_node/relay.nim (99%) rename {waku => logos_delivery/waku}/node/waku_node/store.nim (100%) rename {waku => logos_delivery/waku}/node/waku_switch.nim (100%) rename {waku => logos_delivery/waku}/persistency/backend_comm.nim (100%) rename {waku => logos_delivery/waku}/persistency/backend_sqlite.nim (100%) rename {waku => logos_delivery/waku}/persistency/backend_thread.nim (100%) rename {waku => logos_delivery/waku}/persistency/keys.nim (100%) rename {waku => logos_delivery/waku}/persistency/payload.nim (100%) rename {waku => logos_delivery/waku}/persistency/persistency.nim (100%) rename {waku => logos_delivery/waku}/persistency/schema.nim (100%) rename {waku => logos_delivery/waku}/persistency/sds_persistency.nim (100%) rename {waku => logos_delivery/waku}/persistency/types.nim (100%) rename {waku => logos_delivery/waku}/requests/health_requests.nim (87%) rename {waku => logos_delivery/waku}/requests/node_requests.nim (85%) rename {waku => logos_delivery/waku}/requests/requests.nim (100%) rename {waku => logos_delivery/waku}/requests/rln_requests.nim (81%) rename {waku => logos_delivery/waku}/rest_api/endpoint/admin/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/admin/handlers.nim (99%) rename {waku => logos_delivery/waku}/rest_api/endpoint/admin/types.nim (99%) rename {waku => logos_delivery/waku}/rest_api/endpoint/builder.nim (87%) rename {waku => logos_delivery/waku}/rest_api/endpoint/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/debug/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/debug/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/debug/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/filter/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/filter/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/filter/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/health/client.nim (74%) rename {waku => logos_delivery/waku}/rest_api/endpoint/health/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/health/types.nim (97%) rename {waku => logos_delivery/waku}/rest_api/endpoint/legacy_lightpush/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/legacy_lightpush/handlers.nim (96%) rename {waku => logos_delivery/waku}/rest_api/endpoint/legacy_lightpush/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/lightpush/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/lightpush/handlers.nim (97%) rename {waku => logos_delivery/waku}/rest_api/endpoint/lightpush/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/origin_handler.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/relay/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/relay/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/relay/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/responses.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/rest_serdes.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/serdes.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/server.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/store/client.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/store/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/endpoint/store/types.nim (100%) rename {waku => logos_delivery/waku}/rest_api/handlers.nim (100%) rename {waku => logos_delivery/waku}/rest_api/message_cache.nim (100%) rename {waku => logos_delivery/waku}/utils/DEPRECATION_NOTICE.md (100%) rename {waku => logos_delivery/waku}/utils/collector.nim (100%) rename {waku => logos_delivery/waku}/utils/noise.nim (100%) rename {waku => logos_delivery/waku}/utils/requests.nim (100%) rename {waku => logos_delivery/waku}/utils/tableutils.nim (100%) rename {waku => logos_delivery/waku}/waku_archive.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/archive.nim (99%) rename {waku => logos_delivery/waku}/waku_archive/archive_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/common.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/builder.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/postgres_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/postgres_driver/migrations.nim (97%) rename {waku => logos_delivery/waku}/waku_archive/driver/postgres_driver/partitions_manager.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/postgres_driver/postgres_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/postgres_driver/postgres_healthcheck.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/queue_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/queue_driver/index.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/queue_driver/queue_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/sqlite_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/sqlite_driver/migrations.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/sqlite_driver/queries.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/driver/sqlite_driver/sqlite_driver.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/retention_policy.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/retention_policy/builder.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/retention_policy/retention_policy_capacity.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/retention_policy/retention_policy_size.nim (100%) rename {waku => logos_delivery/waku}/waku_archive/retention_policy/retention_policy_time.nim (100%) rename {waku => logos_delivery/waku}/waku_core.nim (100%) rename {waku => logos_delivery/waku}/waku_core/codecs.nim (100%) rename {waku => logos_delivery/waku}/waku_core/message.nim (100%) rename {waku => logos_delivery/waku}/waku_core/message/codec.nim (100%) rename {waku => logos_delivery/waku}/waku_core/message/default_values.nim (100%) rename {waku => logos_delivery/waku}/waku_core/message/digest.nim (100%) rename {waku => logos_delivery/waku}/waku_core/message/message.nim (100%) rename {waku => logos_delivery/waku}/waku_core/multiaddrstr.nim (100%) rename {waku => logos_delivery/waku}/waku_core/peers.nim (100%) rename {waku => logos_delivery/waku}/waku_core/subscription.nim (100%) rename {waku => logos_delivery/waku}/waku_core/subscription/push_handler.nim (100%) rename {waku => logos_delivery/waku}/waku_core/time.nim (100%) rename {waku => logos_delivery/waku}/waku_core/topics.nim (100%) rename {waku => logos_delivery/waku}/waku_core/topics/content_topic.nim (100%) rename {waku => logos_delivery/waku}/waku_core/topics/parsing.nim (100%) rename {waku => logos_delivery/waku}/waku_core/topics/pubsub_topic.nim (100%) rename {waku => logos_delivery/waku}/waku_core/topics/sharding.nim (100%) rename {waku => logos_delivery/waku}/waku_enr.nim (100%) rename {waku => logos_delivery/waku}/waku_enr/capabilities.nim (100%) rename {waku => logos_delivery/waku}/waku_enr/multiaddr.nim (100%) rename {waku => logos_delivery/waku}/waku_enr/sharding.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/client.nim (99%) rename {waku => logos_delivery/waku}/waku_filter_v2/common.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/protocol_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/rpc.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/rpc_codec.nim (100%) rename {waku => logos_delivery/waku}/waku_filter_v2/subscriptions.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore/conversion_utils.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore/keyfile.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore/keystore.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore/protocol_types.nim (100%) rename {waku => logos_delivery/waku}/waku_keystore/utils.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/callbacks.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/client.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/common.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/protocol_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/rpc.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/rpc_codec.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush/self_req_handler.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/README.md (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/callbacks.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/client.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/common.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/protocol_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/rpc.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/rpc_codec.nim (100%) rename {waku => logos_delivery/waku}/waku_lightpush_legacy/self_req_handler.nim (100%) rename {waku => logos_delivery/waku}/waku_metadata.nim (100%) rename {waku => logos_delivery/waku}/waku_metadata/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_metadata/rpc.nim (100%) rename {waku => logos_delivery/waku}/waku_mix.nim (100%) rename {waku => logos_delivery/waku}/waku_mix/protocol.nim (94%) rename {waku => logos_delivery/waku}/waku_node.nim (100%) rename {waku => logos_delivery/waku}/waku_noise/noise.nim (100%) rename {waku => logos_delivery/waku}/waku_noise/noise_handshake_processing.nim (100%) rename {waku => logos_delivery/waku}/waku_noise/noise_types.nim (100%) rename {waku => logos_delivery/waku}/waku_noise/noise_utils.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/README.md (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/client.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/common.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/rpc.nim (100%) rename {waku => logos_delivery/waku}/waku_peer_exchange/rpc_codec.nim (100%) create mode 100644 logos_delivery/waku/waku_persistency.nim rename {waku => logos_delivery/waku}/waku_relay.nim (50%) rename {waku => logos_delivery/waku}/waku_relay/message_id.nim (100%) rename {waku => logos_delivery/waku}/waku_relay/protocol.nim (98%) rename {waku => logos_delivery/waku}/waku_rendezvous.nim (100%) rename {waku => logos_delivery/waku}/waku_rendezvous/client.nim (97%) rename {waku => logos_delivery/waku}/waku_rendezvous/common.nim (100%) rename {waku => logos_delivery/waku}/waku_rendezvous/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_rendezvous/waku_peer_record.nim (100%) rename {waku => logos_delivery/waku}/waku_rest.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/constants.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/contract.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/conversion_utils.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager/group_manager_base.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager/on_chain.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager/on_chain/group_manager.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/nonce_manager.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/protocol_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/protocol_types.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/rln.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/rln/rln_interface.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/rln/wrappers.nim (100%) rename {waku => logos_delivery/waku}/waku_rln_relay/rln_relay.nim (99%) rename {waku => logos_delivery/waku}/waku_store.nim (100%) rename {waku => logos_delivery/waku}/waku_store/client.nim (100%) rename {waku => logos_delivery/waku}/waku_store/common.nim (100%) rename {waku => logos_delivery/waku}/waku_store/protocol.nim (100%) rename {waku => logos_delivery/waku}/waku_store/protocol_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_store/resume.nim (100%) rename {waku => logos_delivery/waku}/waku_store/rpc_codec.nim (100%) rename {waku => logos_delivery/waku}/waku_store/self_req_handler.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/codec.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/common.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/protocols_metrics.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/reconciliation.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/storage/range_processing.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/storage/seq_storage.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/storage/storage.nim (100%) rename {waku => logos_delivery/waku}/waku_store_sync/transfer.nim (100%) delete mode 100644 waku/waku_persistency.nim diff --git a/.github/ISSUE_TEMPLATE/bump_dependencies.md b/.github/ISSUE_TEMPLATE/bump_dependencies.md index 59f46f08b..56f95eb00 100644 --- a/.github/ISSUE_TEMPLATE/bump_dependencies.md +++ b/.github/ISSUE_TEMPLATE/bump_dependencies.md @@ -11,8 +11,8 @@ assignees: '' ### Bumped items - [ ] Update nimble dependencies - 1. Edit manually waku.nimble. For some dependencies, we want to bump versions manually and use a pinned version, f.e., nim-libp2p and all its dependencies. - 2. Run `nimble lock` (make sure `nimble --version` shows the Nimble version pinned in waku.nimble) + 1. Edit manually logos_delivery.nimble. For some dependencies, we want to bump versions manually and use a pinned version, f.e., nim-libp2p and all its dependencies. + 2. Run `nimble lock` (make sure `nimble --version` shows the Nimble version pinned in logos_delivery.nimble) 3. Run `./tools/gen-nix-deps.sh nimble.lock nix/deps.nix` to update nix deps - [ ] Update vendor/zerokit dependency. diff --git a/.github/ISSUE_TEMPLATE/prepare_release.md b/.github/ISSUE_TEMPLATE/prepare_release.md index 3c2e2f729..095e54257 100644 --- a/.github/ISSUE_TEMPLATE/prepare_release.md +++ b/.github/ISSUE_TEMPLATE/prepare_release.md @@ -18,7 +18,7 @@ For detailed info on the release process refer to https://github.com/logos-messa All items below are to be completed by the owner of the given release. - [ ] Create release branch with major and minor only ( e.g. release/v0.X ) if it doesn't exist. -- [ ] Update the `version` field in `waku.nimble` to match the release version (e.g. `version = "0.X.0"`) **and merge it before assigning any tag** - the `release-assets` workflow gates artifact build/upload. +- [ ] Update the `version` field in `logos_delivery.nimble` to match the release version (e.g. `version = "0.X.0"`) **and merge it before assigning any tag** - the `release-assets` workflow gates artifact build/upload. - [ ] Assign release candidate tag to the release branch HEAD (e.g. `v0.X.0-rc.0`, `v0.X.0-rc.1`, ... `v0.X.0-rc.N`). - [ ] Generate and edit release notes in CHANGELOG.md. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67a29fa31..72b385dce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: common: - '.github/workflows/**' - 'nimble.lock' - - 'waku.nimble' + - 'logos_delivery.nimble' - 'Makefile' - 'scripts/**' - 'flake.nix' @@ -42,12 +42,11 @@ jobs: - 'library/**' - 'liblogosdelivery/**' v2: - - 'waku/**' + - 'logos_delivery/**' - 'apps/**' - 'tools/**' - 'tests/all_tests_v2.nim' - 'tests/**' - - 'channels/**' docker: - 'docker/**' @@ -235,5 +234,5 @@ jobs: shopt -s extglob # Enable extended globbing NPH=$(make print-nph-path) echo "using nph at ${NPH}" - "${NPH}" examples waku tests tools apps *.@(nim|nims|nimble) + "${NPH}" examples logos_delivery tests tools apps *.@(nim|nims|nimble) git diff --exit-code diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index b2066438b..4b0e7dcd2 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -15,7 +15,7 @@ env: NPROC: 2 MAKEFLAGS: "-j${NPROC}" NIMFLAGS: "--parallelBuild:${NPROC}" - # waku.nimble reads compile flags from NIM_PARAMS, not NIMFLAGS. Without + # logos_delivery.nimble reads compile flags from NIM_PARAMS, not NIMFLAGS. Without # -d:disableMarchNative here, config.nims applies -march=native and # secp256k1 fails to compile. NIM_PARAMS: "-d:disableMarchNative" diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index d3ac05f46..56ff0dc46 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -26,8 +26,8 @@ jobs: - 'apps/chat2bridge/config_chat2bridge.nim' db_schema: - - 'waku/waku_archive/driver/postgres_driver/postgres_driver.nim' - - 'waku/waku_archive/driver/sqlite_driver/queries.nim' + - 'logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_driver.nim' + - 'logos_delivery/waku/waku_archive/driver/sqlite_driver/queries.nim' - name: Comment config change uses: thollander/actions-comment-pull-request@v2 if: ${{steps.filter.outputs.config == 'true'}} diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml index 77862d11b..fb631c975 100644 --- a/.github/workflows/release-assets.yml +++ b/.github/workflows/release-assets.yml @@ -11,7 +11,7 @@ env: NPROC: 2 jobs: - # Release gate: the pushed tag MUST exactly match waku.nimble's version, + # Release gate: the pushed tag MUST exactly match logos_delivery.nimble's version, # so every published artifact reports the correct getNodeInfo Version. # CI cannot reject/remove a tag, so we gate artifact build & upload on # this instead: a mismatched tag yields no released artifacts. @@ -19,24 +19,24 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - name: Assert pushed tag equals waku.nimble version + - name: Assert pushed tag equals logos_delivery.nimble version if: startsWith(github.ref, 'refs/tags/') run: | set -euo pipefail - NIMBLE_VERSION=$(grep -m1 '^version = ' waku.nimble | sed -E 's/version = "([^"]+)"/\1/') + NIMBLE_VERSION=$(grep -m1 '^version = ' logos_delivery.nimble | sed -E 's/version = "([^"]+)"/\1/') # Strip leading v and any prerelease suffix (e.g. v0.38.0-rc.1 -> # 0.38.0) so release-candidate tags build against the same - # waku.nimble version as the final tag. + # logos_delivery.nimble version as the final tag. TAG_VERSION="${GITHUB_REF_NAME#v}" BASE_VERSION="${TAG_VERSION%%-*}" echo "tag: ${GITHUB_REF_NAME} (base ${BASE_VERSION})" - echo "waku.nimble version: ${NIMBLE_VERSION}" + echo "logos_delivery.nimble version: ${NIMBLE_VERSION}" if [ "${BASE_VERSION}" != "${NIMBLE_VERSION}" ]; then echo "::error::Tag ${GITHUB_REF_NAME} (base ${BASE_VERSION}) does not match" - echo "::error::waku.nimble version (${NIMBLE_VERSION}). Bump waku.nimble before tagging." + echo "::error::logos_delivery.nimble version (${NIMBLE_VERSION}). Bump logos_delivery.nimble before tagging." exit 1 fi - echo "OK: tag base matches waku.nimble." + echo "OK: tag base matches logos_delivery.nimble." build-and-upload: needs: verify-version diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index ee01a9f1a..d412ae138 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -7,12 +7,12 @@ on: branches: [master] jobs: - # PR check: waku.nimble version must be >= the nearest tag reachable from + # PR check: logos_delivery.nimble version must be >= the nearest tag reachable from # this branch (`git describe --tags --abbrev=0`, i.e. ancestor-aware). # Because we check out the PR HEAD (not the simulated merge ref), a branch # that predates a release tag does not see that tag in its history, so a # newly pushed tag does NOT break in-flight PRs. Once the branch merges/ - # rebases past the tag, the bump is then enforced. This keeps waku.nimble + # rebases past the tag, the bump is then enforced. This keeps logos_delivery.nimble # fixed as early as possible, independent of whether a release is cut. # The exact tag==nimble guarantee at release time lives in # release-assets.yml, which gates artifact publishing on it. @@ -23,10 +23,10 @@ jobs: with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - - name: Compare waku.nimble version with nearest ancestor tag + - name: Compare logos_delivery.nimble version with nearest ancestor tag run: | set -euo pipefail - NIMBLE_VERSION=$(grep -m1 '^version = ' waku.nimble | sed -E 's/version = "([^"]+)"/\1/') + NIMBLE_VERSION=$(grep -m1 '^version = ' logos_delivery.nimble | sed -E 's/version = "([^"]+)"/\1/') # Nearest tag reachable from HEAD; --abbrev=0 drops the --g # suffix so we get the bare tag (e.g. v0.38.0). `--match 'v*'` skips # the moving `nightly` tag (auto-updated by the daily CI to point at @@ -36,7 +36,7 @@ jobs: BASE_TAG=${BASE_TAG#v} # Compare on the base version, ignoring any -rc.N prerelease suffix. BASE_TAG=${BASE_TAG%%-*} - echo "waku.nimble version: ${NIMBLE_VERSION}" + echo "logos_delivery.nimble version: ${NIMBLE_VERSION}" echo "ancestor git tag: ${BASE_TAG:-}" if [ -z "${BASE_TAG}" ]; then echo "No ancestor release tag; skipping." @@ -45,8 +45,8 @@ jobs: # lowest of the two by version sort must be the tag => nimble >= tag LOWEST=$(printf '%s\n%s\n' "${NIMBLE_VERSION}" "${BASE_TAG}" | sort -V | head -1) if [ "${LOWEST}" != "${BASE_TAG}" ] && [ "${NIMBLE_VERSION}" != "${BASE_TAG}" ]; then - echo "::error::waku.nimble version (${NIMBLE_VERSION}) is behind its" - echo "::error::ancestor git tag (v${BASE_TAG}). Bump 'version' in waku.nimble." + echo "::error::logos_delivery.nimble version (${NIMBLE_VERSION}) is behind its" + echo "::error::ancestor git tag (v${BASE_TAG}). Bump 'version' in logos_delivery.nimble." exit 1 fi - echo "OK: waku.nimble is not behind its ancestor tag." + echo "OK: logos_delivery.nimble is not behind its ancestor tag." diff --git a/.gitignore b/.gitignore index 0f9751f9b..bfd8f269f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /tags # a symlink that can't be added to the repo because of Windows +/logos_delivery.nims /waku.nims # Ignore dynamic, static libs and libtool archive files diff --git a/AGENTS.md b/AGENTS.md index ff7d29a39..6deaa4055 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -78,7 +78,7 @@ type WakuFilter* = ref object of LPProtocol ## Development Essentials ### Build Requirements -- Nim 2.x (check `waku.nimble` for minimum version) +- Nim 2.x (check `logos_delivery.nimble` for minimum version) - Rust toolchain (required for RLN dependencies) - Build system: Make driven by Nimble (dependencies pinned in `nimble.lock`) @@ -94,7 +94,7 @@ make wakunode2 make wakunode2 NIMFLAGS="-d:chronicles_log_level=DEBUG" ``` -Note: The build uses `--mm:refc` memory management (passed automatically by the Nimble tasks in `waku.nimble`). Only relevant if compiling outside the standard build system. +Note: The build uses `--mm:refc` memory management (passed automatically by the Nimble tasks in `logos_delivery.nimble`). Only relevant if compiling outside the standard build system. ### Common Make Targets ```bash @@ -476,7 +476,7 @@ nim c -r \ ### Memory Management - Uses `refc` (reference counting with cycle collection) -- Automatically enforced by the build system (hardcoded in `waku.nimble`) +- Automatically enforced by the build system (hardcoded in `logos_delivery.nimble`) - Do not override unless absolutely necessary, as it breaks compatibility ### RLN Dependencies @@ -489,7 +489,7 @@ Language: Nim 2.x | License: MIT or Apache 2.0 ### Important Files - `Makefile` - Primary build interface -- `waku.nimble` - Package definition and build tasks (invoked by the Makefile via Nimble) +- `logos_delivery.nimble` - Package definition and build tasks (invoked by the Makefile via Nimble) - `nimble.lock` - Pinned dependency versions resolved into `nimbledeps/` - `waku/node/waku_node.nim` - Core node implementation - `apps/wakunode2/wakunode2.nim` - Main CLI application @@ -511,7 +511,7 @@ Language: Nim 2.x | License: MIT or Apache 2.0 - `presto` - REST server - `nimcrypto` - Cryptographic primitives -Note: For specific version requirements, check `waku.nimble`. +Note: For specific version requirements, check `logos_delivery.nimble`. # GitNexus — Code Intelligence diff --git a/Makefile b/Makefile index 344743c86..2eabc6017 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,14 @@ export PATH := $(HOME)/.nimble/bin:$(PATH) # NIM binary location NIM_BINARY := $(shell which nim 2>/dev/null) NPH := $(HOME)/.nimble/bin/nph + +NIMBLE := nimble +ifeq ($(detected_OS),Windows) # Resolve nimble via PATH (Windows has no $(HOME)/.nimble/bin); --useSystemNim # reuses the nim on PATH so nimble never re-clones the locked nim. -NIMBLE := nimble --useSystemNim + NIMBLE := nimble --useSystemNim +endif + NIMBLEDEPS_STAMP := nimbledeps/.nimble-setup # Compilation parameters @@ -70,10 +75,10 @@ endif %: @true -waku.nims: - ln -s waku.nimble $@ +logos_delivery.nims: + ln -s logos_delivery.nimble $@ -$(NIMBLEDEPS_STAMP): nimble.lock | install-nimble build-nph waku.nims +$(NIMBLEDEPS_STAMP): nimble.lock | install-nimble build-nph logos_delivery.nims $(NIMBLE) setup --localdeps touch $@ @@ -91,8 +96,8 @@ clean: rm nimble.paths 2> /dev/null || true nimble clean -REQUIRED_NIM_VERSION := $(shell grep -E '^const RequiredNimVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"') -REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const RequiredNimbleVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"') +REQUIRED_NIM_VERSION := $(shell grep -E '^const RequiredNimVersion\s*=' logos_delivery.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"') +REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const RequiredNimbleVersion\s*=' logos_delivery.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"') install-nim: ifneq ($(detected_OS),Windows) @@ -218,7 +223,7 @@ testwaku: | build-deps build rln-deps librln $(NIMBLE) test # Windows: build with nim directly — `nimble ` re-clones git deps every -# build and they intermittently hang on the MSYS2 runner. Flags mirror waku.nimble. +# build and they intermittently hang on the MSYS2 runner. Flags mirror logos_delivery.nimble. wakunode2: | build-deps build deps librln ifeq ($(detected_OS),Windows) echo -e $(BUILD_MSG) "build/$@" && \ @@ -266,7 +271,7 @@ lightpushwithmix: | build-deps build deps librln api_example: | build-deps build deps librln echo -e $(BUILD_MSG) "build/$@" && \ - $(ENV_SCRIPT) nim api_example $(NIM_PARAMS) waku.nims + $(ENV_SCRIPT) nim api_example $(NIM_PARAMS) logos_delivery.nims build/%: | build-deps build deps librln echo -e $(BUILD_MSG) "build/$*" && \ @@ -336,7 +341,7 @@ clean: docs: | build deps echo -e $(BUILD_MSG) "build/$@" && \ - $(NIMBLE) doc --run --index:on --project --out:.gh-pages waku/waku.nim waku.nims + $(NIMBLE) doc --run --index:on --project --out:.gh-pages logos-delivery/logos-delivery.nim logos_delivery.nims coverage: echo -e $(BUILD_MSG) "build/$@" && \ @@ -432,16 +437,16 @@ else ifeq ($(detected_OS),Linux) BUILD_COMMAND := $(BUILD_COMMAND)Linux endif -# Windows: build with nim directly (see wakunode2). Flags mirror waku.nimble. +# Windows: build with nim directly (see wakunode2). Flags mirror logos_delivery.nimble. libwaku: | build-deps librln ifeq ($(detected_OS),Windows) nim c --out:build/libwaku.dll --threads:on --app:lib --opt:speed --noMain --mm:refc --header -d:metrics --nimMainPrefix:libwaku --skipParentCfg:off -d:discv5_protocol_id=d5waku --cpu:amd64 $(NIM_PARAMS) library/libwaku.nim else - $(NIMBLE) --verbose libwaku$(BUILD_COMMAND) waku.nimble + $(NIMBLE) --verbose libwaku$(BUILD_COMMAND) logos_delivery.nimble endif liblogosdelivery: | build-deps librln - $(NIMBLE) --verbose liblogosdelivery$(BUILD_COMMAND) waku.nimble + $(NIMBLE) --verbose liblogosdelivery$(BUILD_COMMAND) logos_delivery.nimble logosdelivery_example: | build liblogosdelivery @echo -e $(BUILD_MSG) "build/$@" @@ -603,4 +608,4 @@ release-notes: -u $(shell id -u) \ docker.io/wakuorg/sv4git:latest \ release-notes |\ - sed -E 's@#([0-9]+)@[#\1](https://github.com/waku-org/nwaku/issues/\1)@g' \ No newline at end of file + sed -E 's@#([0-9]+)@[#\1](https://github.com/logos-messaging/logos-delivery/issues/\1)@g' diff --git a/apps/benchmarks/benchmarks.nim b/apps/benchmarks/benchmarks.nim index 3896cd765..65ad7a525 100644 --- a/apps/benchmarks/benchmarks.nim +++ b/apps/benchmarks/benchmarks.nim @@ -2,7 +2,7 @@ import std/[strutils, times, sequtils, osproc], math, results, options, testutils/unittests import - waku/[ + logos_delivery/waku/[ waku_rln_relay/protocol_types, waku_rln_relay/rln, waku_rln_relay, diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim index 282e17bfd..a1b101022 100644 --- a/apps/chat2/chat2.nim +++ b/apps/chat2/chat2.nim @@ -31,7 +31,7 @@ import nameresolving/dnsresolver, ] # define DNS resolution import - waku/[ + logos_delivery/waku/[ waku_core, waku_lightpush_legacy/common, waku_lightpush_legacy/rpc, @@ -48,7 +48,7 @@ import ./config_chat2 import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub -import ../../waku/waku_rln_relay +import ../../logos_delivery/waku/waku_rln_relay const Help = """ Commands: /[?|help|connect|nick|exit] diff --git a/apps/chat2/config_chat2.nim b/apps/chat2/config_chat2.nim index b0e38c6bc..dfb26eb56 100644 --- a/apps/chat2/config_chat2.nim +++ b/apps/chat2/config_chat2.nim @@ -10,7 +10,7 @@ import nimcrypto/utils, std/strutils, regex -import waku/waku_core +import logos_delivery/waku/waku_core type Fleet* = enum diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index eeeea328b..4e8842dab 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -15,7 +15,7 @@ import # Waku v2 imports libp2p/crypto/crypto, libp2p/errors, - waku/[ + logos_delivery/waku/[ waku_core, waku_node, node/peer_manager, @@ -242,7 +242,8 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} = {.pop.} # @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError when isMainModule: - import waku/common/utils/nat, waku/rest_api/message_cache + import + logos_delivery/waku/common/utils/nat, logos_delivery/waku/rest_api/message_cache let rng = newRng() diff --git a/apps/chat2mix/chat2mix.nim b/apps/chat2mix/chat2mix.nim index 8b786d7b6..8f48396cf 100644 --- a/apps/chat2mix/chat2mix.nim +++ b/apps/chat2mix/chat2mix.nim @@ -33,7 +33,7 @@ import protocols/mix/mix_protocol, ] # define DNS resolution import - waku/[ + logos_delivery/waku/[ waku_core, waku_lightpush/common, waku_lightpush/rpc, @@ -52,7 +52,7 @@ import ./config_chat2mix import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub -import ../../waku/waku_rln_relay +import ../../logos_delivery/waku/waku_rln_relay logScope: topics = "chat2 mix" diff --git a/apps/chat2mix/config_chat2mix.nim b/apps/chat2mix/config_chat2mix.nim index 639e14986..f77a729f4 100644 --- a/apps/chat2mix/config_chat2mix.nim +++ b/apps/chat2mix/config_chat2mix.nim @@ -12,7 +12,7 @@ import confutils/defs, confutils/std/net -import waku/waku_core, waku/waku_mix +import logos_delivery/waku/waku_core, logos_delivery/waku/waku_mix type Fleet* = enum diff --git a/apps/liteprotocoltester/diagnose_connections.nim b/apps/liteprotocoltester/diagnose_connections.nim index d2cc75516..1b5b79b4b 100644 --- a/apps/liteprotocoltester/diagnose_connections.nim +++ b/apps/liteprotocoltester/diagnose_connections.nim @@ -8,14 +8,13 @@ import chronicles, chronos, metrics, - libbacktrace, libp2p/crypto/crypto, confutils, libp2p/wire import tools/confutils/cli_args, - waku/[ + logos_delivery/waku/[ node/peer_manager, waku_lightpush/common, waku_relay, diff --git a/apps/liteprotocoltester/legacy_publisher.nim b/apps/liteprotocoltester/legacy_publisher.nim index 12733ad2d..c2b729b8b 100644 --- a/apps/liteprotocoltester/legacy_publisher.nim +++ b/apps/liteprotocoltester/legacy_publisher.nim @@ -1,5 +1,5 @@ import chronos, results, options -import waku/[waku_node, waku_core] +import logos_delivery/waku/[waku_node, waku_core] import publisher_base type LegacyPublisher* = ref object of PublisherBase diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim index 1877b8477..bcfe2cdec 100644 --- a/apps/liteprotocoltester/liteprotocoltester.nim +++ b/apps/liteprotocoltester/liteprotocoltester.nim @@ -5,14 +5,13 @@ import chronicles, chronos, metrics, - libbacktrace, system/ansi_c, libp2p/crypto/crypto, confutils import tools/confutils/cli_args, - waku/[ + logos_delivery/waku/[ common/enr, common/logging, factory/waku as waku_factory, @@ -156,7 +155,7 @@ when isMainModule: when defined(posix): proc handleSigsegv(signal: cint) {.noconv.} = # Require --debugger:native - fatal "Shutting down after receiving SIGSEGV", stacktrace = getBacktrace() + fatal "Shutting down after receiving SIGSEGV" # Not available in -d:release mode writeStackTrace() diff --git a/apps/liteprotocoltester/publisher.nim b/apps/liteprotocoltester/publisher.nim index 0df3f3e3e..cbd36ce68 100644 --- a/apps/liteprotocoltester/publisher.nim +++ b/apps/liteprotocoltester/publisher.nim @@ -8,7 +8,7 @@ import results, json_serialization as js import - waku/[ + logos_delivery/waku/[ common/logging, waku_node, node/peer_manager, diff --git a/apps/liteprotocoltester/publisher_base.nim b/apps/liteprotocoltester/publisher_base.nim index de88d82f8..aaa85b5f8 100644 --- a/apps/liteprotocoltester/publisher_base.nim +++ b/apps/liteprotocoltester/publisher_base.nim @@ -1,5 +1,5 @@ import chronos, results -import waku/[waku_node, waku_core] +import logos_delivery/waku/[waku_node, waku_core] type PublisherBase* = ref object of RootObj wakuNode*: WakuNode diff --git a/apps/liteprotocoltester/receiver.nim b/apps/liteprotocoltester/receiver.nim index b62094ec6..457626af6 100644 --- a/apps/liteprotocoltester/receiver.nim +++ b/apps/liteprotocoltester/receiver.nim @@ -13,7 +13,7 @@ import json_serialization as js import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_node, diff --git a/apps/liteprotocoltester/service_peer_management.nim b/apps/liteprotocoltester/service_peer_management.nim index d5cfafef1..6198bc448 100644 --- a/apps/liteprotocoltester/service_peer_management.nim +++ b/apps/liteprotocoltester/service_peer_management.nim @@ -5,14 +5,13 @@ import chronicles, chronos, metrics, - libbacktrace, libp2p/crypto/crypto, confutils, libp2p/wire import tools/confutils/cli_args, - waku/[ + logos_delivery/waku/[ common/enr, waku_node, node/peer_manager, diff --git a/apps/liteprotocoltester/tester_config.nim b/apps/liteprotocoltester/tester_config.nim index 1f4bedaa8..79fc6bf1d 100644 --- a/apps/liteprotocoltester/tester_config.nim +++ b/apps/liteprotocoltester/tester_config.nim @@ -14,7 +14,7 @@ import import ../../tools/confutils/ [cli_args, envvar as confEnvvarDefs, envvar_net as confEnvvarNet], - waku/[common/logging, waku_core, waku_core/topics/pubsub_topic] + logos_delivery/waku/[common/logging, waku_core, waku_core/topics/pubsub_topic] export confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet diff --git a/apps/liteprotocoltester/tester_message.nim b/apps/liteprotocoltester/tester_message.nim index 38028e4a7..1a169db04 100644 --- a/apps/liteprotocoltester/tester_message.nim +++ b/apps/liteprotocoltester/tester_message.nim @@ -6,7 +6,7 @@ import json_serialization/std/options, json_serialization/lexer -import waku/rest_api/endpoint/serdes +import logos_delivery/waku/rest_api/endpoint/serdes type ProtocolTesterMessage* = object sender*: string diff --git a/apps/liteprotocoltester/v3_publisher.nim b/apps/liteprotocoltester/v3_publisher.nim index c8353b5a3..bdfea75ec 100644 --- a/apps/liteprotocoltester/v3_publisher.nim +++ b/apps/liteprotocoltester/v3_publisher.nim @@ -1,5 +1,5 @@ import results, options, chronos -import waku/[waku_node, waku_core, waku_lightpush, waku_lightpush/common] +import logos_delivery/waku/[waku_node, waku_core, waku_lightpush, waku_lightpush/common] import publisher_base type V3Publisher* = ref object of PublisherBase diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim index 23607b118..61bb8d07a 100644 --- a/apps/networkmonitor/networkmonitor.nim +++ b/apps/networkmonitor/networkmonitor.nim @@ -17,7 +17,7 @@ import metrics/chronos_httpserver, presto/[route, server, client] import - waku/[ + logos_delivery/waku/[ waku_core, node/peer_manager, waku_node, diff --git a/apps/wakucanary/wakucanary.nim b/apps/wakucanary/wakucanary.nim index f9023c45c..7d5581d8e 100644 --- a/apps/wakucanary/wakucanary.nim +++ b/apps/wakucanary/wakucanary.nim @@ -12,10 +12,11 @@ import libp2p/multicodec import ./certsgenerator, - waku/[waku_enr, node/peer_manager, waku_core, waku_node, factory/builder], - waku/net/net_config, - waku/waku_metadata/protocol, - waku/common/callbacks + logos_delivery/waku/ + [waku_enr, node/peer_manager, waku_core, waku_node, factory/builder], + logos_delivery/waku/net/net_config, + logos_delivery/waku/waku_metadata/protocol, + logos_delivery/waku/common/callbacks # protocols and their tag const ProtocolsTable = { diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim index be3a83f57..e61b76e9c 100644 --- a/apps/wakunode2/wakunode2.nim +++ b/apps/wakunode2/wakunode2.nim @@ -9,7 +9,7 @@ import libp2p/crypto/crypto import ../../tools/[rln_keystore_generator/rln_keystore_generator, confutils/cli_args], - waku/[ + logos_delivery/waku/[ common/logging, factory/waku, node/health_monitor, diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs index 2aa56543c..f37a8c6b4 100644 --- a/ci/Jenkinsfile.prs +++ b/ci/Jenkinsfile.prs @@ -124,13 +124,13 @@ def versionWasChanged(version) { script: "git diff --name-only origin/${env.CHANGE_TARGET}", returnStdout: true ) - if (changes =~ "(?m)^(Makefile|waku.nimble|config.nims|vendor|ci|shell.nix).*") { + if (changes =~ "(?m)^(Makefile|logos_delivery.nimble|config.nims|vendor|ci|shell.nix).*") { return true } if (version == 'v2' && changes =~ "(?m)^(apps|tools)/.*") { return true } - if (changes =~ "(?m)^(waku|tests|examples)/(${version}|common)/.*") { + if (changes =~ "(?m)^(logos_delivery|tests|examples)/(${version}|common)/.*") { return true } return false diff --git a/examples/api_example/api_example.nim b/examples/api_example/api_example.nim index 207e83429..9e96858db 100644 --- a/examples/api_example/api_example.nim +++ b/examples/api_example/api_example.nim @@ -1,6 +1,6 @@ import std/options import chronos, results, confutils, confutils/defs -import waku +import logos_delivery type CliArgs = object ethRpcEndpoint* {. diff --git a/examples/filter_subscriber.nim b/examples/filter_subscriber.nim index 03a5de4eb..5fa47d976 100644 --- a/examples/filter_subscriber.nim +++ b/examples/filter_subscriber.nim @@ -9,7 +9,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_core, diff --git a/examples/lightpush_mix/lightpush_publisher_mix.nim b/examples/lightpush_mix/lightpush_publisher_mix.nim index 104de8552..ae022e226 100644 --- a/examples/lightpush_mix/lightpush_publisher_mix.nim +++ b/examples/lightpush_mix/lightpush_publisher_mix.nim @@ -16,7 +16,7 @@ import metrics/chronos_httpserver import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_core, diff --git a/examples/lightpush_mix/lightpush_publisher_mix_config.nim b/examples/lightpush_mix/lightpush_publisher_mix_config.nim index b541dcd8c..100364415 100644 --- a/examples/lightpush_mix/lightpush_publisher_mix_config.nim +++ b/examples/lightpush_mix/lightpush_publisher_mix_config.nim @@ -5,7 +5,7 @@ import libp2p/multicodec, nimcrypto/utils as ncrutils -import waku/waku_mix +import logos_delivery/waku/waku_mix type LightPushMixConf* = object destPeerAddr* {.desc: "Destination peer address with peerId.", name: "dp-addr".}: diff --git a/examples/lightpush_publisher.nim b/examples/lightpush_publisher.nim index c7eacdd30..fe4134072 100644 --- a/examples/lightpush_publisher.nim +++ b/examples/lightpush_publisher.nim @@ -10,7 +10,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_core, diff --git a/examples/publisher.nim b/examples/publisher.nim index 6f5d34bc4..edae12157 100644 --- a/examples/publisher.nim +++ b/examples/publisher.nim @@ -9,7 +9,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_core, diff --git a/examples/subscriber.nim b/examples/subscriber.nim index ce64bb803..541d3ddec 100644 --- a/examples/subscriber.nim +++ b/examples/subscriber.nim @@ -9,7 +9,7 @@ import eth/p2p/discoveryv5/enr import - waku/[ + logos_delivery/waku/[ common/logging, node/peer_manager, waku_core, diff --git a/examples/wakustealthcommitments/node_spec.nim b/examples/wakustealthcommitments/node_spec.nim index 7751878ca..8eb11595c 100644 --- a/examples/wakustealthcommitments/node_spec.nim +++ b/examples/wakustealthcommitments/node_spec.nim @@ -1,18 +1,17 @@ {.push raises: [].} import tools/confutils/cli_args -import waku/[common/logging, factory/[waku, networks_config]] +import logos_delivery/waku/[common/logging, factory/[waku, networks_config]] import std/[options, strutils, os, sequtils], chronicles, chronos, metrics, - libbacktrace, libp2p/crypto/crypto export networks_config, waku, logging, options, strutils, os, sequtils, stewNet, chronicles, - chronos, metrics, libbacktrace, crypto + chronos, metrics, crypto proc setup*(): Waku = const versionString = "version / git commit hash: " & waku.git_version diff --git a/examples/wakustealthcommitments/stealth_commitment_protocol.nim b/examples/wakustealthcommitments/stealth_commitment_protocol.nim index 63311bf7b..653cfe4b1 100644 --- a/examples/wakustealthcommitments/stealth_commitment_protocol.nim +++ b/examples/wakustealthcommitments/stealth_commitment_protocol.nim @@ -2,7 +2,7 @@ import results, - waku/[common/logging, waku_node, waku_rln_relay], + logos_delivery/waku/[common/logging, waku_node, waku_rln_relay], ./erc_5564_interface as StealthCommitmentFFI, ./node_spec, ./wire_spec diff --git a/examples/wakustealthcommitments/wire_spec.nim b/examples/wakustealthcommitments/wire_spec.nim index fa3d5a888..cd32d24a8 100644 --- a/examples/wakustealthcommitments/wire_spec.nim +++ b/examples/wakustealthcommitments/wire_spec.nim @@ -1,7 +1,7 @@ import std/[times, options] import confutils, chronicles, chronos, results -import waku/[waku_core, common/protobuf] +import logos_delivery/waku/[waku_core, common/protobuf] import libp2p/protobuf/minprotobuf export diff --git a/flake.nix b/flake.nix index b32a53455..67f516359 100644 --- a/flake.nix +++ b/flake.nix @@ -32,11 +32,11 @@ lib = nixpkgs.lib; # Single source of truth for the semver: the `version` field of - # waku.nimble. Kept in sync with git tags by the version-check CI. + # logos_delivery.nimble. Kept in sync with git tags by the version-check CI. nimbleVersion = let line = lib.findFirst (l: lib.hasPrefix "version = " l) "version = \"unknown\"" - (lib.splitString "\n" (builtins.readFile ./waku.nimble)); + (lib.splitString "\n" (builtins.readFile ./logos_delivery.nimble)); in lib.removeSuffix "\"" (lib.removePrefix "version = \"" line); # A flake sandbox has no .git, so `git describe` is impossible; the diff --git a/liblogosdelivery/declare_lib.nim b/liblogosdelivery/declare_lib.nim index 5087a0dee..77e992eea 100644 --- a/liblogosdelivery/declare_lib.nim +++ b/liblogosdelivery/declare_lib.nim @@ -1,6 +1,6 @@ import ffi import std/locks -import waku/factory/waku +import logos_delivery/waku/factory/waku declareLibrary("logosdelivery") diff --git a/liblogosdelivery/liblogosdelivery.nim b/liblogosdelivery/liblogosdelivery.nim index fc907498a..001f793a7 100644 --- a/liblogosdelivery/liblogosdelivery.nim +++ b/liblogosdelivery/liblogosdelivery.nim @@ -1,6 +1,7 @@ import std/[atomics, options] import chronicles, chronos, chronos/threadsync, ffi -import waku/factory/waku, waku/node/waku_node, ./declare_lib +import + logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, ./declare_lib ################################################################################ ## Include different APIs, i.e. all procs with {.ffi.} pragma diff --git a/liblogosdelivery/logos_delivery_api/debug_api.nim b/liblogosdelivery/logos_delivery_api/debug_api.nim index bb66a0e3f..e93467d84 100644 --- a/liblogosdelivery/logos_delivery_api/debug_api.nim +++ b/liblogosdelivery/logos_delivery_api/debug_api.nim @@ -1,5 +1,5 @@ import std/[json, strutils] -import waku/factory/waku_state_info +import logos_delivery/waku/factory/waku_state_info import tools/confutils/[cli_args, config_option_meta] proc logosdelivery_get_available_node_info_ids( diff --git a/liblogosdelivery/logos_delivery_api/messaging_api.nim b/liblogosdelivery/logos_delivery_api/messaging_api.nim index cb2771034..ff7c7f6d0 100644 --- a/liblogosdelivery/logos_delivery_api/messaging_api.nim +++ b/liblogosdelivery/logos_delivery_api/messaging_api.nim @@ -2,10 +2,10 @@ import std/[json] import chronos, results, ffi import stew/byteutils import - waku/common/base64, - waku/factory/waku, - waku/waku_core/topics/content_topic, - waku/api/[api, types], + logos_delivery/waku/common/base64, + logos_delivery/waku/factory/waku, + logos_delivery/waku/waku_core/topics/content_topic, + logos_delivery/waku/api/[api, types], ../declare_lib proc logosdelivery_subscribe( diff --git a/liblogosdelivery/logos_delivery_api/node_api.nim b/liblogosdelivery/logos_delivery_api/node_api.nim index 042bdb3a8..de6f69c19 100644 --- a/liblogosdelivery/logos_delivery_api/node_api.nim +++ b/liblogosdelivery/logos_delivery_api/node_api.nim @@ -1,10 +1,10 @@ import std/[json, strutils, tables] import chronos, chronicles, results, confutils, confutils/std/net, ffi import - waku/factory/waku, - waku/node/waku_node, - waku/api/[api, types], - waku/events/[message_events, health_events], + logos_delivery/waku/factory/waku, + logos_delivery/waku/node/waku_node, + logos_delivery/waku/api/[api, types], + logos_delivery/waku/events/[message_events, health_events], tools/confutils/cli_args, ../declare_lib, ../json_event diff --git a/library/declare_lib.nim b/library/declare_lib.nim index 188de8549..ab75ac6b6 100644 --- a/library/declare_lib.nim +++ b/library/declare_lib.nim @@ -1,5 +1,5 @@ import ffi -import waku/factory/waku +import logos_delivery/waku/factory/waku declareLibrary("waku") diff --git a/library/events/json_connection_change_event.nim b/library/events/json_connection_change_event.nim index ff2823640..f78dcbe59 100644 --- a/library/events/json_connection_change_event.nim +++ b/library/events/json_connection_change_event.nim @@ -1,6 +1,6 @@ import system, std/json, libp2p/[connmanager, peerid] -import ../../waku/common/base64, ./json_base_event +import ../../logos_delivery/waku/common/base64, ./json_base_event type JsonConnectionChangeEvent* = ref object of JsonEvent peerId*: string diff --git a/library/events/json_connection_status_change_event.nim b/library/events/json_connection_status_change_event.nim index 86bfda780..9b8a0f9e6 100644 --- a/library/events/json_connection_status_change_event.nim +++ b/library/events/json_connection_status_change_event.nim @@ -2,7 +2,7 @@ import system, std/json import ./json_base_event -import ../../waku/api/types +import ../../logos_delivery/waku/api/types type JsonConnectionStatusChangeEvent* = ref object of JsonEvent status*: ConnectionStatus diff --git a/library/events/json_message_event.nim b/library/events/json_message_event.nim index f79fef86f..61278b4fa 100644 --- a/library/events/json_message_event.nim +++ b/library/events/json_message_event.nim @@ -1,9 +1,9 @@ import system, results, std/json, std/strutils import stew/byteutils import - ../../waku/common/base64, - ../../waku/waku_core/message, - ../../waku/waku_core/message/message, + ../../logos_delivery/waku/common/base64, + ../../logos_delivery/waku/waku_core/message, + ../../logos_delivery/waku/waku_core/message/message, ../utils, ./json_base_event diff --git a/library/events/json_topic_health_change_event.nim b/library/events/json_topic_health_change_event.nim index c194e890c..810e89b2e 100644 --- a/library/events/json_topic_health_change_event.nim +++ b/library/events/json_topic_health_change_event.nim @@ -1,7 +1,7 @@ import system, results, std/json import stew/byteutils -import ../../waku/common/base64, ./json_base_event -import ../../waku/waku_relay +import ../../logos_delivery/waku/common/base64, ./json_base_event +import ../../logos_delivery/waku/waku_relay type JsonTopicHealthChangeEvent* = ref object of JsonEvent pubsubTopic*: string diff --git a/library/kernel_api/debug_node_api.nim b/library/kernel_api/debug_node_api.nim index 9d5a7f134..bbce84939 100644 --- a/library/kernel_api/debug_node_api.nim +++ b/library/kernel_api/debug_node_api.nim @@ -9,7 +9,10 @@ import metrics, ffi import - waku/factory/waku, waku/node/waku_node, waku/node/health_monitor, library/declare_lib + logos_delivery/waku/factory/waku, + logos_delivery/waku/node/waku_node, + logos_delivery/waku/node/health_monitor, + library/declare_lib proc getMultiaddresses(node: WakuNode): seq[string] = return node.info().listenAddresses diff --git a/library/kernel_api/discovery_api.nim b/library/kernel_api/discovery_api.nim index 882c91686..847e21efb 100644 --- a/library/kernel_api/discovery_api.nim +++ b/library/kernel_api/discovery_api.nim @@ -1,11 +1,11 @@ import std/json import chronos, chronicles, results, strutils, libp2p/multiaddress, ffi import - waku/factory/waku, - waku/discovery/waku_dnsdisc, - waku/discovery/waku_discv5, - waku/waku_core/peers, - waku/waku_node, + logos_delivery/waku/factory/waku, + logos_delivery/waku/discovery/waku_dnsdisc, + logos_delivery/waku/discovery/waku_discv5, + logos_delivery/waku/waku_core/peers, + logos_delivery/waku/waku_node, library/declare_lib proc retrieveBootstrapNodes( diff --git a/library/kernel_api/node_lifecycle_api.nim b/library/kernel_api/node_lifecycle_api.nim index 55dd7cd55..45de64c5b 100644 --- a/library/kernel_api/node_lifecycle_api.nim +++ b/library/kernel_api/node_lifecycle_api.nim @@ -2,12 +2,12 @@ import std/[options, json, strutils, net] import chronos, chronicles, results, confutils, confutils/std/net, ffi import - waku/node/peer_manager/peer_manager, + logos_delivery/waku/node/peer_manager/peer_manager, tools/confutils/cli_args, - waku/factory/waku, - waku/factory/node_factory, - waku/factory/app_callbacks, - waku/rest_api/endpoint/builder, + logos_delivery/waku/factory/waku, + logos_delivery/waku/factory/node_factory, + logos_delivery/waku/factory/app_callbacks, + logos_delivery/waku/rest_api/endpoint/builder, library/declare_lib proc createWaku( diff --git a/library/kernel_api/peer_manager_api.nim b/library/kernel_api/peer_manager_api.nim index f0ae37f00..a7dfe0a70 100644 --- a/library/kernel_api/peer_manager_api.nim +++ b/library/kernel_api/peer_manager_api.nim @@ -1,6 +1,10 @@ import std/[sequtils, strutils, tables] import chronicles, chronos, results, options, json, ffi -import waku/factory/waku, waku/node/waku_node, waku/node/peer_manager, ../declare_lib +import + logos_delivery/waku/factory/waku, + logos_delivery/waku/node/waku_node, + logos_delivery/waku/node/peer_manager, + ../declare_lib type PeerInfo = object protocols: seq[string] diff --git a/library/kernel_api/ping_api.nim b/library/kernel_api/ping_api.nim index 4f10dcf59..da830bc5d 100644 --- a/library/kernel_api/ping_api.nim +++ b/library/kernel_api/ping_api.nim @@ -1,7 +1,9 @@ import std/[json, strutils] import chronos, results, ffi import libp2p/[protocols/ping, switch, multiaddress, multicodec] -import waku/[factory/waku, waku_core/peers, node/waku_node], library/declare_lib +import + logos_delivery/waku/[factory/waku, waku_core/peers, node/waku_node], + library/declare_lib proc waku_ping_peer( ctx: ptr FFIContext[Waku], diff --git a/library/kernel_api/protocols/filter_api.nim b/library/kernel_api/protocols/filter_api.nim index 866b70ca2..ac1f372be 100644 --- a/library/kernel_api/protocols/filter_api.nim +++ b/library/kernel_api/protocols/filter_api.nim @@ -1,16 +1,16 @@ import options, std/[strutils, sequtils] import chronicles, chronos, results, ffi import - waku/waku_filter_v2/client, - waku/waku_core/message/message, - waku/factory/waku, - waku/waku_relay, - waku/waku_filter_v2/common, - waku/waku_core/subscription/push_handler, - waku/node/peer_manager/peer_manager, - waku/waku_node, - waku/waku_core/topics/pubsub_topic, - waku/waku_core/topics/content_topic, + logos_delivery/waku/waku_filter_v2/client, + logos_delivery/waku/waku_core/message/message, + logos_delivery/waku/factory/waku, + logos_delivery/waku/waku_relay, + logos_delivery/waku/waku_filter_v2/common, + logos_delivery/waku/waku_core/subscription/push_handler, + logos_delivery/waku/node/peer_manager/peer_manager, + logos_delivery/waku/waku_node, + logos_delivery/waku/waku_core/topics/pubsub_topic, + logos_delivery/waku/waku_core/topics/content_topic, library/events/json_message_event, library/declare_lib diff --git a/library/kernel_api/protocols/lightpush_api.nim b/library/kernel_api/protocols/lightpush_api.nim index e9251a3f3..da32ab7b2 100644 --- a/library/kernel_api/protocols/lightpush_api.nim +++ b/library/kernel_api/protocols/lightpush_api.nim @@ -1,13 +1,13 @@ import options, std/[json, strformat] import chronicles, chronos, results, ffi import - waku/waku_core/message/message, - waku/waku_core/codecs, - waku/factory/waku, - waku/waku_core/message, - waku/waku_core/topics/pubsub_topic, - waku/waku_lightpush_legacy/client, - waku/node/peer_manager/peer_manager, + logos_delivery/waku/waku_core/message/message, + logos_delivery/waku/waku_core/codecs, + logos_delivery/waku/factory/waku, + logos_delivery/waku/waku_core/message, + logos_delivery/waku/waku_core/topics/pubsub_topic, + logos_delivery/waku/waku_lightpush_legacy/client, + logos_delivery/waku/node/peer_manager/peer_manager, library/events/json_message_event, library/declare_lib diff --git a/library/kernel_api/protocols/relay_api.nim b/library/kernel_api/protocols/relay_api.nim index 4364a4170..739856104 100644 --- a/library/kernel_api/protocols/relay_api.nim +++ b/library/kernel_api/protocols/relay_api.nim @@ -1,15 +1,15 @@ import std/[net, sequtils, strutils, json], strformat import chronicles, chronos, stew/byteutils, results, ffi import - waku/waku_core/message/message, - waku/factory/[validator_signed, waku], + logos_delivery/waku/waku_core/message/message, + logos_delivery/waku/factory/[validator_signed, waku], tools/confutils/cli_args, - waku/waku_core/message, - waku/waku_core/topics/pubsub_topic, - waku/waku_core/topics, - waku/node/waku_node/relay, - waku/waku_relay/protocol, - waku/node/peer_manager, + logos_delivery/waku/waku_core/message, + logos_delivery/waku/waku_core/topics/pubsub_topic, + logos_delivery/waku/waku_core/topics, + logos_delivery/waku/node/waku_node/relay, + logos_delivery/waku/waku_relay/protocol, + logos_delivery/waku/node/peer_manager, library/events/json_message_event, library/declare_lib diff --git a/library/kernel_api/protocols/store_api.nim b/library/kernel_api/protocols/store_api.nim index 0df4d9b1f..c66b64839 100644 --- a/library/kernel_api/protocols/store_api.nim +++ b/library/kernel_api/protocols/store_api.nim @@ -1,13 +1,13 @@ import std/[json, sugar, strutils, options] import chronos, chronicles, results, stew/byteutils, ffi import - waku/factory/waku, + logos_delivery/waku/factory/waku, library/utils, - waku/waku_core/peers, - waku/waku_core/message/digest, - waku/waku_store/common, - waku/waku_store/client, - waku/common/paging, + logos_delivery/waku/waku_core/peers, + logos_delivery/waku/waku_core/message/digest, + logos_delivery/waku/waku_store/common, + logos_delivery/waku/waku_store/client, + logos_delivery/waku/common/paging, library/declare_lib func fromJsonNode(jsonContent: JsonNode): Result[StoreQueryRequest, string] = diff --git a/library/libwaku.nim b/library/libwaku.nim index dd1ee9fd9..ab7fb5bdf 100644 --- a/library/libwaku.nim +++ b/library/libwaku.nim @@ -1,17 +1,17 @@ import std/[atomics, options, atomics, macros] import chronicles, chronos, chronos/threadsync, ffi import - waku/waku_core/message/message, - waku/waku_core/topics/pubsub_topic, - waku/waku_relay, + logos_delivery/waku/waku_core/message/message, + logos_delivery/waku/waku_core/topics/pubsub_topic, + logos_delivery/waku/waku_relay, ./events/json_message_event, ./events/json_topic_health_change_event, ./events/json_connection_change_event, ./events/json_connection_status_change_event, - ../waku/factory/app_callbacks, - waku/factory/waku, - waku/node/waku_node, - waku/node/health_monitor/health_status, + ../logos_delivery/waku/factory/app_callbacks, + logos_delivery/waku/factory/waku, + logos_delivery/waku/node/waku_node, + logos_delivery/waku/node/health_monitor/health_status, ./declare_lib ################################################################################ diff --git a/waku.nim b/logos_delivery.nim similarity index 73% rename from waku.nim rename to logos_delivery.nim index 65a017c5a..c4edbe6d6 100644 --- a/waku.nim +++ b/logos_delivery.nim @@ -3,8 +3,8 @@ ## This module re-exports the public API for creating and managing Waku nodes ## when using nwaku as a library dependency. -import waku/api +import logos_delivery/waku/api export api -import waku/factory/waku +import logos_delivery/waku/factory/waku export waku diff --git a/waku.nimble b/logos_delivery.nimble similarity index 99% rename from waku.nimble rename to logos_delivery.nimble index 38548b5dc..db83d5690 100644 --- a/waku.nimble +++ b/logos_delivery.nimble @@ -6,8 +6,9 @@ mode = ScriptMode.Verbose ### Package version = "0.38.1" author = "Status Research & Development GmbH" -description = "Waku, Private P2P Messaging for Resource-Restricted Devices" +description = "Logos-delivery, Private P2P Messaging for Resource-Restricted Devices" license = "MIT or Apache License 2.0" +skipDirs = @["tests", "examples", "tools", "apps", "simulations", "metrics"] const RequiredNimVersion = "2.2.4" ## This is the nim compiler version that we are working on. Other versions may behave differently. diff --git a/channels/encryption/encryption.nim b/logos_delivery/channels/encryption/encryption.nim similarity index 100% rename from channels/encryption/encryption.nim rename to logos_delivery/channels/encryption/encryption.nim diff --git a/channels/encryption/noop_encryption.nim b/logos_delivery/channels/encryption/noop_encryption.nim similarity index 100% rename from channels/encryption/noop_encryption.nim rename to logos_delivery/channels/encryption/noop_encryption.nim diff --git a/channels/events.nim b/logos_delivery/channels/events.nim similarity index 95% rename from channels/events.nim rename to logos_delivery/channels/events.nim index 3e271976e..5f69095e4 100644 --- a/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/channels/rate_limit_manager/rate_limit_manager.nim b/logos_delivery/channels/rate_limit_manager/rate_limit_manager.nim similarity index 100% rename from channels/rate_limit_manager/rate_limit_manager.nim rename to logos_delivery/channels/rate_limit_manager/rate_limit_manager.nim diff --git a/channels/reliable_channel.nim b/logos_delivery/channels/reliable_channel.nim similarity index 98% rename from channels/reliable_channel.nim rename to logos_delivery/channels/reliable_channel.nim index 6aa7086e5..4f4851aca 100644 --- a/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 waku/node/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 @@ -277,7 +277,9 @@ proc onReadyToSend( MessageErrorEvent.emit( self.brokerCtx, MessageErrorEvent( - requestId: channelReqId, messageHash: "", error: "messaging send failed: " & error + requestId: channelReqId, + messageHash: "", + error: "messaging send failed: " & error, ), ) self.markSegmentFailed(channelReqId) diff --git a/channels/reliable_channel_manager.nim b/logos_delivery/channels/reliable_channel_manager.nim similarity index 93% rename from channels/reliable_channel_manager.nim rename to logos_delivery/channels/reliable_channel_manager.nim index 68ae82388..a21dfc54e 100644 --- a/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 waku/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 @@ -23,8 +23,7 @@ export reliable_channel type ReliableChannelManager* = ref object channels: Table[ChannelId, ReliableChannel] - messagingClient: MessagingClient - ## Borrowed from the owning `Waku`. + messagingClient: MessagingClient ## Borrowed from the owning `Waku`. sendHandler: SendHandler ## Default egress dispatch for channels created through this manager. ## Constructed at mount time as a closure over `MessagingClient.send` @@ -97,11 +96,7 @@ proc createReliableChannel*( epochPeriodSec: DefaultEpochPeriodSec, messagesPerEpoch: DefaultMessagesPerEpoch ) - let effectiveSendHandler = - if sendHandler.isNil(): - self.sendHandler - else: - sendHandler + let effectiveSendHandler = if sendHandler.isNil(): self.sendHandler else: sendHandler let chn = ReliableChannel.new( sendHandler = effectiveSendHandler, diff --git a/channels/scalable_data_sync/scalable_data_sync.nim b/logos_delivery/channels/scalable_data_sync/scalable_data_sync.nim similarity index 100% rename from channels/scalable_data_sync/scalable_data_sync.nim rename to logos_delivery/channels/scalable_data_sync/scalable_data_sync.nim diff --git a/channels/scalable_data_sync/sds_persistence.nim b/logos_delivery/channels/scalable_data_sync/sds_persistence.nim similarity index 100% rename from channels/scalable_data_sync/sds_persistence.nim rename to logos_delivery/channels/scalable_data_sync/sds_persistence.nim diff --git a/channels/segmentation/segment_message_proto.nim b/logos_delivery/channels/segmentation/segment_message_proto.nim similarity index 100% rename from channels/segmentation/segment_message_proto.nim rename to logos_delivery/channels/segmentation/segment_message_proto.nim diff --git a/channels/segmentation/segmentation.nim b/logos_delivery/channels/segmentation/segmentation.nim similarity index 100% rename from channels/segmentation/segmentation.nim rename to logos_delivery/channels/segmentation/segmentation.nim diff --git a/channels/segmentation/segmentation_persistence.nim b/logos_delivery/channels/segmentation/segmentation_persistence.nim similarity index 100% rename from channels/segmentation/segmentation_persistence.nim rename to logos_delivery/channels/segmentation/segmentation_persistence.nim diff --git a/channels/types.nim b/logos_delivery/channels/types.nim similarity index 85% rename from channels/types.nim rename to logos_delivery/channels/types.nim index 4070ed620..ec663cf7b 100644 --- a/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/waku/node/delivery_service/not_delivered_storage/migrations.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim similarity index 88% rename from waku/node/delivery_service/not_delivered_storage/migrations.nim rename to logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim index 807074d64..da636dbcb 100644 --- a/waku/node/delivery_service/not_delivered_storage/migrations.nim +++ b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim @@ -1,7 +1,9 @@ {.push raises: [].} import std/[tables, strutils, os], results, chronicles -import ../../../common/databases/db_sqlite, ../../../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/waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim similarity index 87% rename from waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim rename to logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim index b0f5f5828..852c33c9a 100644 --- a/waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim +++ b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim @@ -9,9 +9,9 @@ import results import - ../../../common/databases/db_sqlite, - ../../../waku_core/message/message, - ../../../node/delivery_service/not_delivered_storage/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/waku/node/delivery_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service.nim similarity index 100% rename from waku/node/delivery_service/recv_service.nim rename to logos_delivery/messaging/delivery_service/recv_service.nim diff --git a/waku/node/delivery_service/recv_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim similarity index 99% rename from waku/node/delivery_service/recv_service/recv_service.nim rename to logos_delivery/messaging/delivery_service/recv_service/recv_service.nim index 500926cc7..09bcaa815 100644 --- a/waku/node/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/waku/node/delivery_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service.nim similarity index 100% rename from waku/node/delivery_service/send_service.nim rename to logos_delivery/messaging/delivery_service/send_service.nim diff --git a/waku/node/delivery_service/send_service/delivery_task.nim b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim similarity index 94% rename from waku/node/delivery_service/send_service/delivery_task.nim rename to logos_delivery/messaging/delivery_service/send_service/delivery_task.nim index aa1dc17d7..e56536baa 100644 --- a/waku/node/delivery_service/send_service/delivery_task.nim +++ b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim @@ -1,6 +1,9 @@ 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/waku/node/delivery_service/send_service/lightpush_processor.nim b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim similarity index 95% rename from waku/node/delivery_service/send_service/lightpush_processor.nim rename to logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim index 7a9f65c71..100c27f52 100644 --- a/waku/node/delivery_service/send_service/lightpush_processor.nim +++ b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim @@ -1,7 +1,10 @@ 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/waku/node/delivery_service/send_service/relay_processor.nim b/logos_delivery/messaging/delivery_service/send_service/relay_processor.nim similarity index 93% rename from waku/node/delivery_service/send_service/relay_processor.nim rename to logos_delivery/messaging/delivery_service/send_service/relay_processor.nim index e06b664fb..2fdc39f8e 100644 --- a/waku/node/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/waku/node/delivery_service/send_service/send_processor.nim b/logos_delivery/messaging/delivery_service/send_service/send_processor.nim similarity index 100% rename from waku/node/delivery_service/send_service/send_processor.nim rename to logos_delivery/messaging/delivery_service/send_service/send_processor.nim diff --git a/waku/node/delivery_service/send_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service/send_service.nim similarity index 99% rename from waku/node/delivery_service/send_service/send_service.nim rename to logos_delivery/messaging/delivery_service/send_service/send_service.nim index e60b26124..43b73fa26 100644 --- a/waku/node/delivery_service/send_service/send_service.nim +++ b/logos_delivery/messaging/delivery_service/send_service/send_service.nim @@ -1,12 +1,12 @@ ## This module reinforces the publish operation with regular store-v3 requests. ## -import std/[sequtils, tables, options] +import std/[sequtils, tables, options, typetraits] 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/waku/messaging_client.nim b/logos_delivery/messaging/messaging_client.nim similarity index 89% rename from waku/messaging_client.nim rename to logos_delivery/messaging/messaging_client.nim index 1fc4deb3c..1d3892250 100644 --- a/waku/messaging_client.nim +++ b/logos_delivery/messaging/messaging_client.nim @@ -1,14 +1,10 @@ import results, chronos import chronicles import - ./api/types, - ./node/[ - waku_node, - subscription_manager, - delivery_service/recv_service, - delivery_service/send_service, - 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/waku/README.md b/logos_delivery/waku/README.md similarity index 100% rename from waku/README.md rename to logos_delivery/waku/README.md diff --git a/waku/api.nim b/logos_delivery/waku/api.nim similarity index 100% rename from waku/api.nim rename to logos_delivery/waku/api.nim diff --git a/waku/api/api.nim b/logos_delivery/waku/api/api.nim similarity index 81% rename from waku/api/api.nim rename to logos_delivery/waku/api/api.nim index 24049002b..1cbe47256 100644 --- a/waku/api/api.nim +++ b/logos_delivery/waku/api/api.nim @@ -1,12 +1,12 @@ import chronicles, chronos, results -import waku/factory/waku -import waku/messaging_client -import waku/[requests/health_requests, waku_core, waku_node] -import waku/node/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/waku/api/api_conf.nim b/logos_delivery/waku/api/api_conf.nim similarity index 98% rename from waku/api/api_conf.nim rename to logos_delivery/waku/api/api_conf.nim index 3606be596..b01fae8bd 100644 --- a/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/waku/api/send_api.md b/logos_delivery/waku/api/send_api.md similarity index 100% rename from waku/api/send_api.md rename to logos_delivery/waku/api/send_api.md diff --git a/waku/api/types.nim b/logos_delivery/waku/api/types.nim similarity index 91% rename from waku/api/types.nim rename to logos_delivery/waku/api/types.nim index 2b7edd616..6b2b621de 100644 --- a/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/waku/common/base64.nim b/logos_delivery/waku/common/base64.nim similarity index 100% rename from waku/common/base64.nim rename to logos_delivery/waku/common/base64.nim diff --git a/waku/common/callbacks.nim b/logos_delivery/waku/common/callbacks.nim similarity index 68% rename from waku/common/callbacks.nim rename to logos_delivery/waku/common/callbacks.nim index 83209ef24..9935a8d76 100644 --- a/waku/common/callbacks.nim +++ b/logos_delivery/waku/common/callbacks.nim @@ -1,4 +1,6 @@ -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/waku/common/databases/common.nim b/logos_delivery/waku/common/databases/common.nim similarity index 100% rename from waku/common/databases/common.nim rename to logos_delivery/waku/common/databases/common.nim diff --git a/waku/common/databases/db_postgres.nim b/logos_delivery/waku/common/databases/db_postgres.nim similarity index 100% rename from waku/common/databases/db_postgres.nim rename to logos_delivery/waku/common/databases/db_postgres.nim diff --git a/waku/common/databases/db_postgres/dbconn.nim b/logos_delivery/waku/common/databases/db_postgres/dbconn.nim similarity index 100% rename from waku/common/databases/db_postgres/dbconn.nim rename to logos_delivery/waku/common/databases/db_postgres/dbconn.nim diff --git a/waku/common/databases/db_postgres/pgasyncpool.nim b/logos_delivery/waku/common/databases/db_postgres/pgasyncpool.nim similarity index 100% rename from waku/common/databases/db_postgres/pgasyncpool.nim rename to logos_delivery/waku/common/databases/db_postgres/pgasyncpool.nim diff --git a/waku/common/databases/db_postgres/query_metrics.nim b/logos_delivery/waku/common/databases/db_postgres/query_metrics.nim similarity index 100% rename from waku/common/databases/db_postgres/query_metrics.nim rename to logos_delivery/waku/common/databases/db_postgres/query_metrics.nim diff --git a/waku/common/databases/db_sqlite.nim b/logos_delivery/waku/common/databases/db_sqlite.nim similarity index 100% rename from waku/common/databases/db_sqlite.nim rename to logos_delivery/waku/common/databases/db_sqlite.nim diff --git a/waku/common/databases/dburl.nim b/logos_delivery/waku/common/databases/dburl.nim similarity index 100% rename from waku/common/databases/dburl.nim rename to logos_delivery/waku/common/databases/dburl.nim diff --git a/waku/common/enr.nim b/logos_delivery/waku/common/enr.nim similarity index 100% rename from waku/common/enr.nim rename to logos_delivery/waku/common/enr.nim diff --git a/waku/common/enr/builder.nim b/logos_delivery/waku/common/enr/builder.nim similarity index 100% rename from waku/common/enr/builder.nim rename to logos_delivery/waku/common/enr/builder.nim diff --git a/waku/common/enr/typed_record.nim b/logos_delivery/waku/common/enr/typed_record.nim similarity index 100% rename from waku/common/enr/typed_record.nim rename to logos_delivery/waku/common/enr/typed_record.nim diff --git a/waku/common/error_handling.nim b/logos_delivery/waku/common/error_handling.nim similarity index 100% rename from waku/common/error_handling.nim rename to logos_delivery/waku/common/error_handling.nim diff --git a/waku/common/hexstrings.nim b/logos_delivery/waku/common/hexstrings.nim similarity index 100% rename from waku/common/hexstrings.nim rename to logos_delivery/waku/common/hexstrings.nim diff --git a/waku/common/logging.nim b/logos_delivery/waku/common/logging.nim similarity index 100% rename from waku/common/logging.nim rename to logos_delivery/waku/common/logging.nim diff --git a/waku/common/nimchronos.nim b/logos_delivery/waku/common/nimchronos.nim similarity index 100% rename from waku/common/nimchronos.nim rename to logos_delivery/waku/common/nimchronos.nim diff --git a/waku/common/paging.nim b/logos_delivery/waku/common/paging.nim similarity index 100% rename from waku/common/paging.nim rename to logos_delivery/waku/common/paging.nim diff --git a/waku/common/protobuf.nim b/logos_delivery/waku/common/protobuf.nim similarity index 100% rename from waku/common/protobuf.nim rename to logos_delivery/waku/common/protobuf.nim diff --git a/waku/common/rate_limit/per_peer_limiter.nim b/logos_delivery/waku/common/rate_limit/per_peer_limiter.nim similarity index 100% rename from waku/common/rate_limit/per_peer_limiter.nim rename to logos_delivery/waku/common/rate_limit/per_peer_limiter.nim diff --git a/waku/common/rate_limit/request_limiter.nim b/logos_delivery/waku/common/rate_limit/request_limiter.nim similarity index 100% rename from waku/common/rate_limit/request_limiter.nim rename to logos_delivery/waku/common/rate_limit/request_limiter.nim diff --git a/waku/common/rate_limit/service_metrics.nim b/logos_delivery/waku/common/rate_limit/service_metrics.nim similarity index 100% rename from waku/common/rate_limit/service_metrics.nim rename to logos_delivery/waku/common/rate_limit/service_metrics.nim diff --git a/waku/common/rate_limit/setting.nim b/logos_delivery/waku/common/rate_limit/setting.nim similarity index 100% rename from waku/common/rate_limit/setting.nim rename to logos_delivery/waku/common/rate_limit/setting.nim diff --git a/waku/common/rate_limit/single_token_limiter.nim b/logos_delivery/waku/common/rate_limit/single_token_limiter.nim similarity index 100% rename from waku/common/rate_limit/single_token_limiter.nim rename to logos_delivery/waku/common/rate_limit/single_token_limiter.nim diff --git a/waku/common/rate_limit/timed_map.nim b/logos_delivery/waku/common/rate_limit/timed_map.nim similarity index 100% rename from waku/common/rate_limit/timed_map.nim rename to logos_delivery/waku/common/rate_limit/timed_map.nim diff --git a/waku/common/utils/DEPRECATION_NOTICE.md b/logos_delivery/waku/common/utils/DEPRECATION_NOTICE.md similarity index 100% rename from waku/common/utils/DEPRECATION_NOTICE.md rename to logos_delivery/waku/common/utils/DEPRECATION_NOTICE.md diff --git a/waku/common/utils/matterbridge_client.nim b/logos_delivery/waku/common/utils/matterbridge_client.nim similarity index 100% rename from waku/common/utils/matterbridge_client.nim rename to logos_delivery/waku/common/utils/matterbridge_client.nim diff --git a/waku/common/utils/nat.nim b/logos_delivery/waku/common/utils/nat.nim similarity index 100% rename from waku/common/utils/nat.nim rename to logos_delivery/waku/common/utils/nat.nim diff --git a/waku/common/utils/parse_size_units.nim b/logos_delivery/waku/common/utils/parse_size_units.nim similarity index 100% rename from waku/common/utils/parse_size_units.nim rename to logos_delivery/waku/common/utils/parse_size_units.nim diff --git a/waku/common/utils/sequence.nim b/logos_delivery/waku/common/utils/sequence.nim similarity index 100% rename from waku/common/utils/sequence.nim rename to logos_delivery/waku/common/utils/sequence.nim diff --git a/waku/common/waku_protocol.nim b/logos_delivery/waku/common/waku_protocol.nim similarity index 100% rename from waku/common/waku_protocol.nim rename to logos_delivery/waku/common/waku_protocol.nim diff --git a/waku/discovery/autonat_service.nim b/logos_delivery/waku/discovery/autonat_service.nim similarity index 100% rename from waku/discovery/autonat_service.nim rename to logos_delivery/waku/discovery/autonat_service.nim diff --git a/waku/discovery/waku_discv5.nim b/logos_delivery/waku/discovery/waku_discv5.nim similarity index 99% rename from waku/discovery/waku_discv5.nim rename to logos_delivery/waku/discovery/waku_discv5.nim index c1b253c8c..d1b22a6d4 100644 --- a/waku/discovery/waku_discv5.nim +++ b/logos_delivery/waku/discovery/waku_discv5.nim @@ -10,7 +10,9 @@ 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/waku/discovery/waku_dnsdisc.nim b/logos_delivery/waku/discovery/waku_dnsdisc.nim similarity index 100% rename from waku/discovery/waku_dnsdisc.nim rename to logos_delivery/waku/discovery/waku_dnsdisc.nim diff --git a/waku/discovery/waku_kademlia.nim b/logos_delivery/waku/discovery/waku_kademlia.nim similarity index 99% rename from waku/discovery/waku_kademlia.nim rename to logos_delivery/waku/discovery/waku_kademlia.nim index 94b63a321..6c64edace 100644 --- a/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/waku/events/delivery_events.nim b/logos_delivery/waku/events/delivery_events.nim similarity index 78% rename from waku/events/delivery_events.nim rename to logos_delivery/waku/events/delivery_events.nim index 5730335e0..5238e0403 100644 --- a/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/waku/events/events.nim b/logos_delivery/waku/events/events.nim similarity index 100% rename from waku/events/events.nim rename to logos_delivery/waku/events/events.nim diff --git a/waku/events/health_events.nim b/logos_delivery/waku/events/health_events.nim similarity index 82% rename from waku/events/health_events.nim rename to logos_delivery/waku/events/health_events.nim index 95912941e..4ff6f0c6c 100644 --- a/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/waku/events/message_events.nim b/logos_delivery/waku/events/message_events.nim similarity index 92% rename from waku/events/message_events.nim rename to logos_delivery/waku/events/message_events.nim index b45f91249..9338fda67 100644 --- a/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/waku/events/peer_events.nim b/logos_delivery/waku/events/peer_events.nim similarity index 100% rename from waku/events/peer_events.nim rename to logos_delivery/waku/events/peer_events.nim diff --git a/waku/factory/app_callbacks.nim b/logos_delivery/waku/factory/app_callbacks.nim similarity index 100% rename from waku/factory/app_callbacks.nim rename to logos_delivery/waku/factory/app_callbacks.nim diff --git a/waku/factory/builder.nim b/logos_delivery/waku/factory/builder.nim similarity index 100% rename from waku/factory/builder.nim rename to logos_delivery/waku/factory/builder.nim diff --git a/waku/factory/conf_builder/conf_builder.nim b/logos_delivery/waku/factory/conf_builder/conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/conf_builder.nim diff --git a/waku/factory/conf_builder/discv5_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/discv5_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/discv5_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/discv5_conf_builder.nim diff --git a/waku/factory/conf_builder/dns_discovery_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/dns_discovery_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/dns_discovery_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/dns_discovery_conf_builder.nim diff --git a/waku/factory/conf_builder/filter_service_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/filter_service_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/filter_service_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/filter_service_conf_builder.nim diff --git a/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim similarity index 96% rename from waku/factory/conf_builder/kademlia_discovery_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim index 916d71be1..576b6b7d9 100644 --- a/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/waku/factory/conf_builder/metrics_server_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/metrics_server_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/metrics_server_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/metrics_server_conf_builder.nim diff --git a/waku/factory/conf_builder/mix_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim similarity index 96% rename from waku/factory/conf_builder/mix_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim index 145ccb76e..971e63588 100644 --- a/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/waku/factory/conf_builder/rate_limit_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim similarity index 95% rename from waku/factory/conf_builder/rate_limit_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim index b2edbef03..f3a28c5dc 100644 --- a/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/waku/factory/conf_builder/rest_server_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rest_server_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/rest_server_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/rest_server_conf_builder.nim diff --git a/waku/factory/conf_builder/rln_relay_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rln_relay_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/rln_relay_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/rln_relay_conf_builder.nim diff --git a/waku/factory/conf_builder/store_service_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/store_service_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/store_service_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/store_service_conf_builder.nim diff --git a/waku/factory/conf_builder/store_sync_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/store_sync_conf_builder.nim similarity index 100% rename from waku/factory/conf_builder/store_sync_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/store_sync_conf_builder.nim diff --git a/waku/factory/conf_builder/waku_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim similarity index 99% rename from waku/factory/conf_builder/waku_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim index 96e34eeed..7d7189fac 100644 --- a/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/waku/factory/conf_builder/web_socket_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim similarity index 97% rename from waku/factory/conf_builder/web_socket_conf_builder.nim rename to logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim index 61334d958..285e678e8 100644 --- a/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/waku/factory/internal_config.nim b/logos_delivery/waku/factory/internal_config.nim similarity index 98% rename from waku/factory/internal_config.nim rename to logos_delivery/waku/factory/internal_config.nim index fa36aff57..a3306eadc 100644 --- a/waku/factory/internal_config.nim +++ b/logos_delivery/waku/factory/internal_config.nim @@ -8,7 +8,9 @@ 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/waku/factory/networks_config.nim b/logos_delivery/waku/factory/networks_config.nim similarity index 100% rename from waku/factory/networks_config.nim rename to logos_delivery/waku/factory/networks_config.nim diff --git a/waku/factory/node_factory.nim b/logos_delivery/waku/factory/node_factory.nim similarity index 100% rename from waku/factory/node_factory.nim rename to logos_delivery/waku/factory/node_factory.nim diff --git a/waku/factory/validator_signed.nim b/logos_delivery/waku/factory/validator_signed.nim similarity index 100% rename from waku/factory/validator_signed.nim rename to logos_delivery/waku/factory/validator_signed.nim diff --git a/waku/factory/waku.nim b/logos_delivery/waku/factory/waku.nim similarity index 99% rename from waku/factory/waku.nim rename to logos_delivery/waku/factory/waku.nim index edd02ade8..56e2748e2 100644 --- a/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, @@ -30,7 +30,6 @@ import waku_enr/sharding, waku_enr/multiaddr, api/types, - messaging_client, common/logging, node/peer_manager, node/health_monitor, @@ -49,7 +48,8 @@ import factory/app_callbacks, persistency/persistency, ], - channels/reliable_channel_manager, + logos_delivery/channels/reliable_channel_manager, + logos_delivery/messaging/messaging_client, ./waku_conf, ./waku_state_info diff --git a/waku/factory/waku_conf.nim b/logos_delivery/waku/factory/waku_conf.nim similarity index 100% rename from waku/factory/waku_conf.nim rename to logos_delivery/waku/factory/waku_conf.nim diff --git a/waku/factory/waku_state_info.nim b/logos_delivery/waku/factory/waku_state_info.nim similarity index 97% rename from waku/factory/waku_state_info.nim rename to logos_delivery/waku/factory/waku_state_info.nim index 5796e04f5..e608d5dd2 100644 --- a/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/waku/incentivization/common.nim b/logos_delivery/waku/incentivization/common.nim similarity index 84% rename from waku/incentivization/common.nim rename to logos_delivery/waku/incentivization/common.nim index 071b4c18f..1fdfb05a9 100644 --- a/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/waku/incentivization/eligibility_manager.nim b/logos_delivery/waku/incentivization/eligibility_manager.nim similarity index 97% rename from waku/incentivization/eligibility_manager.nim rename to logos_delivery/waku/incentivization/eligibility_manager.nim index cbbf4774c..ad0f3b67e 100644 --- a/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/waku/incentivization/reputation_manager.nim b/logos_delivery/waku/incentivization/reputation_manager.nim similarity index 100% rename from waku/incentivization/reputation_manager.nim rename to logos_delivery/waku/incentivization/reputation_manager.nim diff --git a/waku/incentivization/rpc.nim b/logos_delivery/waku/incentivization/rpc.nim similarity index 100% rename from waku/incentivization/rpc.nim rename to logos_delivery/waku/incentivization/rpc.nim diff --git a/waku/incentivization/rpc_codec.nim b/logos_delivery/waku/incentivization/rpc_codec.nim similarity index 100% rename from waku/incentivization/rpc_codec.nim rename to logos_delivery/waku/incentivization/rpc_codec.nim diff --git a/waku/net/auto_port.nim b/logos_delivery/waku/net/auto_port.nim similarity index 100% rename from waku/net/auto_port.nim rename to logos_delivery/waku/net/auto_port.nim diff --git a/waku/net/bound_ports.nim b/logos_delivery/waku/net/bound_ports.nim similarity index 100% rename from waku/net/bound_ports.nim rename to logos_delivery/waku/net/bound_ports.nim diff --git a/waku/net/net_config.nim b/logos_delivery/waku/net/net_config.nim similarity index 100% rename from waku/net/net_config.nim rename to logos_delivery/waku/net/net_config.nim diff --git a/waku/node/edge_filter_sub_state.nim b/logos_delivery/waku/node/edge_filter_sub_state.nim similarity index 100% rename from waku/node/edge_filter_sub_state.nim rename to logos_delivery/waku/node/edge_filter_sub_state.nim diff --git a/waku/node/health_monitor.nim b/logos_delivery/waku/node/health_monitor.nim similarity index 100% rename from waku/node/health_monitor.nim rename to logos_delivery/waku/node/health_monitor.nim diff --git a/waku/node/health_monitor/connection_status.nim b/logos_delivery/waku/node/health_monitor/connection_status.nim similarity index 100% rename from waku/node/health_monitor/connection_status.nim rename to logos_delivery/waku/node/health_monitor/connection_status.nim diff --git a/waku/node/health_monitor/event_loop_monitor.nim b/logos_delivery/waku/node/health_monitor/event_loop_monitor.nim similarity index 100% rename from waku/node/health_monitor/event_loop_monitor.nim rename to logos_delivery/waku/node/health_monitor/event_loop_monitor.nim diff --git a/waku/node/health_monitor/health_report.nim b/logos_delivery/waku/node/health_monitor/health_report.nim similarity index 100% rename from waku/node/health_monitor/health_report.nim rename to logos_delivery/waku/node/health_monitor/health_report.nim diff --git a/waku/node/health_monitor/health_status.nim b/logos_delivery/waku/node/health_monitor/health_status.nim similarity index 100% rename from waku/node/health_monitor/health_status.nim rename to logos_delivery/waku/node/health_monitor/health_status.nim diff --git a/waku/node/health_monitor/node_health_monitor.nim b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim similarity index 99% rename from waku/node/health_monitor/node_health_monitor.nim rename to logos_delivery/waku/node/health_monitor/node_health_monitor.nim index e5c941191..74f3defec 100644 --- a/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/waku/node/health_monitor/online_monitor.nim b/logos_delivery/waku/node/health_monitor/online_monitor.nim similarity index 97% rename from waku/node/health_monitor/online_monitor.nim rename to logos_delivery/waku/node/health_monitor/online_monitor.nim index 27bd53bc3..b2b87acd2 100644 --- a/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/waku/node/health_monitor/protocol_health.nim b/logos_delivery/waku/node/health_monitor/protocol_health.nim similarity index 96% rename from waku/node/health_monitor/protocol_health.nim rename to logos_delivery/waku/node/health_monitor/protocol_health.nim index 4479888c8..50d9c5572 100644 --- a/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/waku/node/health_monitor/topic_health.nim b/logos_delivery/waku/node/health_monitor/topic_health.nim similarity index 92% rename from waku/node/health_monitor/topic_health.nim rename to logos_delivery/waku/node/health_monitor/topic_health.nim index 5a1ea0a16..9273f4835 100644 --- a/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/waku/node/node_telemetry.nim b/logos_delivery/waku/node/node_telemetry.nim similarity index 100% rename from waku/node/node_telemetry.nim rename to logos_delivery/waku/node/node_telemetry.nim diff --git a/waku/node/peer_manager.nim b/logos_delivery/waku/node/peer_manager.nim similarity index 100% rename from waku/node/peer_manager.nim rename to logos_delivery/waku/node/peer_manager.nim diff --git a/waku/node/peer_manager/peer_manager.nim b/logos_delivery/waku/node/peer_manager/peer_manager.nim similarity index 99% rename from waku/node/peer_manager/peer_manager.nim rename to logos_delivery/waku/node/peer_manager/peer_manager.nim index 6602c049b..6c916c3c6 100644 --- a/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/waku/node/peer_manager/peer_store/migrations.nim b/logos_delivery/waku/node/peer_manager/peer_store/migrations.nim similarity index 100% rename from waku/node/peer_manager/peer_store/migrations.nim rename to logos_delivery/waku/node/peer_manager/peer_store/migrations.nim diff --git a/waku/node/peer_manager/peer_store/peer_storage.nim b/logos_delivery/waku/node/peer_manager/peer_store/peer_storage.nim similarity index 100% rename from waku/node/peer_manager/peer_store/peer_storage.nim rename to logos_delivery/waku/node/peer_manager/peer_store/peer_storage.nim diff --git a/waku/node/peer_manager/peer_store/waku_peer_storage.nim b/logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage.nim similarity index 100% rename from waku/node/peer_manager/peer_store/waku_peer_storage.nim rename to logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage.nim diff --git a/waku/node/peer_manager/waku_peer_store.nim b/logos_delivery/waku/node/peer_manager/waku_peer_store.nim similarity index 100% rename from waku/node/peer_manager/waku_peer_store.nim rename to logos_delivery/waku/node/peer_manager/waku_peer_store.nim diff --git a/waku/node/shard_subscription.nim b/logos_delivery/waku/node/shard_subscription.nim similarity index 100% rename from waku/node/shard_subscription.nim rename to logos_delivery/waku/node/shard_subscription.nim diff --git a/waku/node/subscription_manager.nim b/logos_delivery/waku/node/subscription_manager.nim similarity index 99% rename from waku/node/subscription_manager.nim rename to logos_delivery/waku/node/subscription_manager.nim index 8bcb7bb46..a8acb58dd 100644 --- a/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/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim similarity index 96% rename from waku/node/waku_metrics.nim rename to logos_delivery/waku/node/waku_metrics.nim index bb4c10fff..feb767878 100644 --- a/waku/node/waku_metrics.nim +++ b/logos_delivery/waku/node/waku_metrics.nim @@ -2,7 +2,8 @@ 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/waku/node/waku_node.nim b/logos_delivery/waku/node/waku_node.nim similarity index 99% rename from waku/node/waku_node.nim rename to logos_delivery/waku/node/waku_node.nim index 6a8826d2a..a852fa13e 100644 --- a/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/waku/node/waku_node/filter.nim b/logos_delivery/waku/node/waku_node/filter.nim similarity index 100% rename from waku/node/waku_node/filter.nim rename to logos_delivery/waku/node/waku_node/filter.nim diff --git a/waku/node/waku_node/lightpush.nim b/logos_delivery/waku/node/waku_node/lightpush.nim similarity index 100% rename from waku/node/waku_node/lightpush.nim rename to logos_delivery/waku/node/waku_node/lightpush.nim diff --git a/waku/node/waku_node/peer_exchange.nim b/logos_delivery/waku/node/waku_node/peer_exchange.nim similarity index 100% rename from waku/node/waku_node/peer_exchange.nim rename to logos_delivery/waku/node/waku_node/peer_exchange.nim diff --git a/waku/node/waku_node/ping.nim b/logos_delivery/waku/node/waku_node/ping.nim similarity index 100% rename from waku/node/waku_node/ping.nim rename to logos_delivery/waku/node/waku_node/ping.nim diff --git a/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim similarity index 99% rename from waku/node/waku_node/relay.nim rename to logos_delivery/waku/node/waku_node/relay.nim index 30fc22ec3..b90992e9b 100644 --- a/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/waku/node/waku_node/store.nim b/logos_delivery/waku/node/waku_node/store.nim similarity index 100% rename from waku/node/waku_node/store.nim rename to logos_delivery/waku/node/waku_node/store.nim diff --git a/waku/node/waku_switch.nim b/logos_delivery/waku/node/waku_switch.nim similarity index 100% rename from waku/node/waku_switch.nim rename to logos_delivery/waku/node/waku_switch.nim diff --git a/waku/persistency/backend_comm.nim b/logos_delivery/waku/persistency/backend_comm.nim similarity index 100% rename from waku/persistency/backend_comm.nim rename to logos_delivery/waku/persistency/backend_comm.nim diff --git a/waku/persistency/backend_sqlite.nim b/logos_delivery/waku/persistency/backend_sqlite.nim similarity index 100% rename from waku/persistency/backend_sqlite.nim rename to logos_delivery/waku/persistency/backend_sqlite.nim diff --git a/waku/persistency/backend_thread.nim b/logos_delivery/waku/persistency/backend_thread.nim similarity index 100% rename from waku/persistency/backend_thread.nim rename to logos_delivery/waku/persistency/backend_thread.nim diff --git a/waku/persistency/keys.nim b/logos_delivery/waku/persistency/keys.nim similarity index 100% rename from waku/persistency/keys.nim rename to logos_delivery/waku/persistency/keys.nim diff --git a/waku/persistency/payload.nim b/logos_delivery/waku/persistency/payload.nim similarity index 100% rename from waku/persistency/payload.nim rename to logos_delivery/waku/persistency/payload.nim diff --git a/waku/persistency/persistency.nim b/logos_delivery/waku/persistency/persistency.nim similarity index 100% rename from waku/persistency/persistency.nim rename to logos_delivery/waku/persistency/persistency.nim diff --git a/waku/persistency/schema.nim b/logos_delivery/waku/persistency/schema.nim similarity index 100% rename from waku/persistency/schema.nim rename to logos_delivery/waku/persistency/schema.nim diff --git a/waku/persistency/sds_persistency.nim b/logos_delivery/waku/persistency/sds_persistency.nim similarity index 100% rename from waku/persistency/sds_persistency.nim rename to logos_delivery/waku/persistency/sds_persistency.nim diff --git a/waku/persistency/types.nim b/logos_delivery/waku/persistency/types.nim similarity index 100% rename from waku/persistency/types.nim rename to logos_delivery/waku/persistency/types.nim diff --git a/waku/requests/health_requests.nim b/logos_delivery/waku/requests/health_requests.nim similarity index 87% rename from waku/requests/health_requests.nim rename to logos_delivery/waku/requests/health_requests.nim index ccf08f83d..1c9ed4d70 100644 --- a/waku/requests/health_requests.nim +++ b/logos_delivery/waku/requests/health_requests.nim @@ -1,9 +1,10 @@ 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/waku/requests/node_requests.nim b/logos_delivery/waku/requests/node_requests.nim similarity index 85% rename from waku/requests/node_requests.nim rename to logos_delivery/waku/requests/node_requests.nim index 93c6b1159..a5ca263cd 100644 --- a/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/waku/requests/requests.nim b/logos_delivery/waku/requests/requests.nim similarity index 100% rename from waku/requests/requests.nim rename to logos_delivery/waku/requests/requests.nim diff --git a/waku/requests/rln_requests.nim b/logos_delivery/waku/requests/rln_requests.nim similarity index 81% rename from waku/requests/rln_requests.nim rename to logos_delivery/waku/requests/rln_requests.nim index ffd747bed..04843e170 100644 --- a/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/waku/rest_api/endpoint/admin/client.nim b/logos_delivery/waku/rest_api/endpoint/admin/client.nim similarity index 100% rename from waku/rest_api/endpoint/admin/client.nim rename to logos_delivery/waku/rest_api/endpoint/admin/client.nim diff --git a/waku/rest_api/endpoint/admin/handlers.nim b/logos_delivery/waku/rest_api/endpoint/admin/handlers.nim similarity index 99% rename from waku/rest_api/endpoint/admin/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/admin/handlers.nim index 304fdabf8..c82401d87 100644 --- a/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/waku/rest_api/endpoint/admin/types.nim b/logos_delivery/waku/rest_api/endpoint/admin/types.nim similarity index 99% rename from waku/rest_api/endpoint/admin/types.nim rename to logos_delivery/waku/rest_api/endpoint/admin/types.nim index 483acf8b8..846f5a2fa 100644 --- a/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/waku/rest_api/endpoint/builder.nim b/logos_delivery/waku/rest_api/endpoint/builder.nim similarity index 87% rename from waku/rest_api/endpoint/builder.nim rename to logos_delivery/waku/rest_api/endpoint/builder.nim index 16cdde988..6762aebdf 100644 --- a/waku/rest_api/endpoint/builder.nim +++ b/logos_delivery/waku/rest_api/endpoint/builder.nim @@ -3,22 +3,23 @@ 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/waku/rest_api/endpoint/client.nim b/logos_delivery/waku/rest_api/endpoint/client.nim similarity index 100% rename from waku/rest_api/endpoint/client.nim rename to logos_delivery/waku/rest_api/endpoint/client.nim diff --git a/waku/rest_api/endpoint/debug/client.nim b/logos_delivery/waku/rest_api/endpoint/debug/client.nim similarity index 100% rename from waku/rest_api/endpoint/debug/client.nim rename to logos_delivery/waku/rest_api/endpoint/debug/client.nim diff --git a/waku/rest_api/endpoint/debug/handlers.nim b/logos_delivery/waku/rest_api/endpoint/debug/handlers.nim similarity index 100% rename from waku/rest_api/endpoint/debug/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/debug/handlers.nim diff --git a/waku/rest_api/endpoint/debug/types.nim b/logos_delivery/waku/rest_api/endpoint/debug/types.nim similarity index 100% rename from waku/rest_api/endpoint/debug/types.nim rename to logos_delivery/waku/rest_api/endpoint/debug/types.nim diff --git a/waku/rest_api/endpoint/filter/client.nim b/logos_delivery/waku/rest_api/endpoint/filter/client.nim similarity index 100% rename from waku/rest_api/endpoint/filter/client.nim rename to logos_delivery/waku/rest_api/endpoint/filter/client.nim diff --git a/waku/rest_api/endpoint/filter/handlers.nim b/logos_delivery/waku/rest_api/endpoint/filter/handlers.nim similarity index 100% rename from waku/rest_api/endpoint/filter/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/filter/handlers.nim diff --git a/waku/rest_api/endpoint/filter/types.nim b/logos_delivery/waku/rest_api/endpoint/filter/types.nim similarity index 100% rename from waku/rest_api/endpoint/filter/types.nim rename to logos_delivery/waku/rest_api/endpoint/filter/types.nim diff --git a/waku/rest_api/endpoint/health/client.nim b/logos_delivery/waku/rest_api/endpoint/health/client.nim similarity index 74% rename from waku/rest_api/endpoint/health/client.nim rename to logos_delivery/waku/rest_api/endpoint/health/client.nim index 97f4a2c6d..9af8a138f 100644 --- a/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/waku/rest_api/endpoint/health/handlers.nim b/logos_delivery/waku/rest_api/endpoint/health/handlers.nim similarity index 100% rename from waku/rest_api/endpoint/health/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/health/handlers.nim diff --git a/waku/rest_api/endpoint/health/types.nim b/logos_delivery/waku/rest_api/endpoint/health/types.nim similarity index 97% rename from waku/rest_api/endpoint/health/types.nim rename to logos_delivery/waku/rest_api/endpoint/health/types.nim index 4f85ebde5..00e101133 100644 --- a/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/waku/rest_api/endpoint/legacy_lightpush/client.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/client.nim similarity index 100% rename from waku/rest_api/endpoint/legacy_lightpush/client.nim rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/client.nim diff --git a/waku/rest_api/endpoint/legacy_lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim similarity index 96% rename from waku/rest_api/endpoint/legacy_lightpush/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim index 7a3c5b1ed..4344f0481 100644 --- a/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/waku/rest_api/endpoint/legacy_lightpush/types.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/types.nim similarity index 100% rename from waku/rest_api/endpoint/legacy_lightpush/types.nim rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/types.nim diff --git a/waku/rest_api/endpoint/lightpush/client.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/client.nim similarity index 100% rename from waku/rest_api/endpoint/lightpush/client.nim rename to logos_delivery/waku/rest_api/endpoint/lightpush/client.nim diff --git a/waku/rest_api/endpoint/lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim similarity index 97% rename from waku/rest_api/endpoint/lightpush/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim index 342053e72..2afe3c7e7 100644 --- a/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/waku/rest_api/endpoint/lightpush/types.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/types.nim similarity index 100% rename from waku/rest_api/endpoint/lightpush/types.nim rename to logos_delivery/waku/rest_api/endpoint/lightpush/types.nim diff --git a/waku/rest_api/endpoint/origin_handler.nim b/logos_delivery/waku/rest_api/endpoint/origin_handler.nim similarity index 100% rename from waku/rest_api/endpoint/origin_handler.nim rename to logos_delivery/waku/rest_api/endpoint/origin_handler.nim diff --git a/waku/rest_api/endpoint/relay/client.nim b/logos_delivery/waku/rest_api/endpoint/relay/client.nim similarity index 100% rename from waku/rest_api/endpoint/relay/client.nim rename to logos_delivery/waku/rest_api/endpoint/relay/client.nim diff --git a/waku/rest_api/endpoint/relay/handlers.nim b/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim similarity index 100% rename from waku/rest_api/endpoint/relay/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/relay/handlers.nim diff --git a/waku/rest_api/endpoint/relay/types.nim b/logos_delivery/waku/rest_api/endpoint/relay/types.nim similarity index 100% rename from waku/rest_api/endpoint/relay/types.nim rename to logos_delivery/waku/rest_api/endpoint/relay/types.nim diff --git a/waku/rest_api/endpoint/responses.nim b/logos_delivery/waku/rest_api/endpoint/responses.nim similarity index 100% rename from waku/rest_api/endpoint/responses.nim rename to logos_delivery/waku/rest_api/endpoint/responses.nim diff --git a/waku/rest_api/endpoint/rest_serdes.nim b/logos_delivery/waku/rest_api/endpoint/rest_serdes.nim similarity index 100% rename from waku/rest_api/endpoint/rest_serdes.nim rename to logos_delivery/waku/rest_api/endpoint/rest_serdes.nim diff --git a/waku/rest_api/endpoint/serdes.nim b/logos_delivery/waku/rest_api/endpoint/serdes.nim similarity index 100% rename from waku/rest_api/endpoint/serdes.nim rename to logos_delivery/waku/rest_api/endpoint/serdes.nim diff --git a/waku/rest_api/endpoint/server.nim b/logos_delivery/waku/rest_api/endpoint/server.nim similarity index 100% rename from waku/rest_api/endpoint/server.nim rename to logos_delivery/waku/rest_api/endpoint/server.nim diff --git a/waku/rest_api/endpoint/store/client.nim b/logos_delivery/waku/rest_api/endpoint/store/client.nim similarity index 100% rename from waku/rest_api/endpoint/store/client.nim rename to logos_delivery/waku/rest_api/endpoint/store/client.nim diff --git a/waku/rest_api/endpoint/store/handlers.nim b/logos_delivery/waku/rest_api/endpoint/store/handlers.nim similarity index 100% rename from waku/rest_api/endpoint/store/handlers.nim rename to logos_delivery/waku/rest_api/endpoint/store/handlers.nim diff --git a/waku/rest_api/endpoint/store/types.nim b/logos_delivery/waku/rest_api/endpoint/store/types.nim similarity index 100% rename from waku/rest_api/endpoint/store/types.nim rename to logos_delivery/waku/rest_api/endpoint/store/types.nim diff --git a/waku/rest_api/handlers.nim b/logos_delivery/waku/rest_api/handlers.nim similarity index 100% rename from waku/rest_api/handlers.nim rename to logos_delivery/waku/rest_api/handlers.nim diff --git a/waku/rest_api/message_cache.nim b/logos_delivery/waku/rest_api/message_cache.nim similarity index 100% rename from waku/rest_api/message_cache.nim rename to logos_delivery/waku/rest_api/message_cache.nim diff --git a/waku/utils/DEPRECATION_NOTICE.md b/logos_delivery/waku/utils/DEPRECATION_NOTICE.md similarity index 100% rename from waku/utils/DEPRECATION_NOTICE.md rename to logos_delivery/waku/utils/DEPRECATION_NOTICE.md diff --git a/waku/utils/collector.nim b/logos_delivery/waku/utils/collector.nim similarity index 100% rename from waku/utils/collector.nim rename to logos_delivery/waku/utils/collector.nim diff --git a/waku/utils/noise.nim b/logos_delivery/waku/utils/noise.nim similarity index 100% rename from waku/utils/noise.nim rename to logos_delivery/waku/utils/noise.nim diff --git a/waku/utils/requests.nim b/logos_delivery/waku/utils/requests.nim similarity index 100% rename from waku/utils/requests.nim rename to logos_delivery/waku/utils/requests.nim diff --git a/waku/utils/tableutils.nim b/logos_delivery/waku/utils/tableutils.nim similarity index 100% rename from waku/utils/tableutils.nim rename to logos_delivery/waku/utils/tableutils.nim diff --git a/waku/waku_archive.nim b/logos_delivery/waku/waku_archive.nim similarity index 100% rename from waku/waku_archive.nim rename to logos_delivery/waku/waku_archive.nim diff --git a/waku/waku_archive/archive.nim b/logos_delivery/waku/waku_archive/archive.nim similarity index 99% rename from waku/waku_archive/archive.nim rename to logos_delivery/waku/waku_archive/archive.nim index 976d7d035..a257a55b1 100644 --- a/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/waku/waku_archive/archive_metrics.nim b/logos_delivery/waku/waku_archive/archive_metrics.nim similarity index 100% rename from waku/waku_archive/archive_metrics.nim rename to logos_delivery/waku/waku_archive/archive_metrics.nim diff --git a/waku/waku_archive/common.nim b/logos_delivery/waku/waku_archive/common.nim similarity index 100% rename from waku/waku_archive/common.nim rename to logos_delivery/waku/waku_archive/common.nim diff --git a/waku/waku_archive/driver.nim b/logos_delivery/waku/waku_archive/driver.nim similarity index 100% rename from waku/waku_archive/driver.nim rename to logos_delivery/waku/waku_archive/driver.nim diff --git a/waku/waku_archive/driver/builder.nim b/logos_delivery/waku/waku_archive/driver/builder.nim similarity index 100% rename from waku/waku_archive/driver/builder.nim rename to logos_delivery/waku/waku_archive/driver/builder.nim diff --git a/waku/waku_archive/driver/postgres_driver.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver.nim similarity index 100% rename from waku/waku_archive/driver/postgres_driver.nim rename to logos_delivery/waku/waku_archive/driver/postgres_driver.nim diff --git a/waku/waku_archive/driver/postgres_driver/migrations.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/migrations.nim similarity index 97% rename from waku/waku_archive/driver/postgres_driver/migrations.nim rename to logos_delivery/waku/waku_archive/driver/postgres_driver/migrations.nim index 700f2a162..a1a3e93fe 100644 --- a/waku/waku_archive/driver/postgres_driver/migrations.nim +++ b/logos_delivery/waku/waku_archive/driver/postgres_driver/migrations.nim @@ -3,7 +3,7 @@ import std/strutils, results, chronicles, chronos import ../../../common/databases/common, - ../../../../migrations/message_store_postgres/pg_migration_manager, + ../../../../../migrations/message_store_postgres/pg_migration_manager, ../postgres_driver logScope: diff --git a/waku/waku_archive/driver/postgres_driver/partitions_manager.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager.nim similarity index 100% rename from waku/waku_archive/driver/postgres_driver/partitions_manager.nim rename to logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager.nim diff --git a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_driver.nim similarity index 100% rename from waku/waku_archive/driver/postgres_driver/postgres_driver.nim rename to logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_driver.nim diff --git a/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim similarity index 100% rename from waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim rename to logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim diff --git a/waku/waku_archive/driver/queue_driver.nim b/logos_delivery/waku/waku_archive/driver/queue_driver.nim similarity index 100% rename from waku/waku_archive/driver/queue_driver.nim rename to logos_delivery/waku/waku_archive/driver/queue_driver.nim diff --git a/waku/waku_archive/driver/queue_driver/index.nim b/logos_delivery/waku/waku_archive/driver/queue_driver/index.nim similarity index 100% rename from waku/waku_archive/driver/queue_driver/index.nim rename to logos_delivery/waku/waku_archive/driver/queue_driver/index.nim diff --git a/waku/waku_archive/driver/queue_driver/queue_driver.nim b/logos_delivery/waku/waku_archive/driver/queue_driver/queue_driver.nim similarity index 100% rename from waku/waku_archive/driver/queue_driver/queue_driver.nim rename to logos_delivery/waku/waku_archive/driver/queue_driver/queue_driver.nim diff --git a/waku/waku_archive/driver/sqlite_driver.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver.nim similarity index 100% rename from waku/waku_archive/driver/sqlite_driver.nim rename to logos_delivery/waku/waku_archive/driver/sqlite_driver.nim diff --git a/waku/waku_archive/driver/sqlite_driver/migrations.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/migrations.nim similarity index 100% rename from waku/waku_archive/driver/sqlite_driver/migrations.nim rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/migrations.nim diff --git a/waku/waku_archive/driver/sqlite_driver/queries.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/queries.nim similarity index 100% rename from waku/waku_archive/driver/sqlite_driver/queries.nim rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/queries.nim diff --git a/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim similarity index 100% rename from waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim diff --git a/waku/waku_archive/retention_policy.nim b/logos_delivery/waku/waku_archive/retention_policy.nim similarity index 100% rename from waku/waku_archive/retention_policy.nim rename to logos_delivery/waku/waku_archive/retention_policy.nim diff --git a/waku/waku_archive/retention_policy/builder.nim b/logos_delivery/waku/waku_archive/retention_policy/builder.nim similarity index 100% rename from waku/waku_archive/retention_policy/builder.nim rename to logos_delivery/waku/waku_archive/retention_policy/builder.nim diff --git a/waku/waku_archive/retention_policy/retention_policy_capacity.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_capacity.nim similarity index 100% rename from waku/waku_archive/retention_policy/retention_policy_capacity.nim rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_capacity.nim diff --git a/waku/waku_archive/retention_policy/retention_policy_size.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_size.nim similarity index 100% rename from waku/waku_archive/retention_policy/retention_policy_size.nim rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_size.nim diff --git a/waku/waku_archive/retention_policy/retention_policy_time.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_time.nim similarity index 100% rename from waku/waku_archive/retention_policy/retention_policy_time.nim rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_time.nim diff --git a/waku/waku_core.nim b/logos_delivery/waku/waku_core.nim similarity index 100% rename from waku/waku_core.nim rename to logos_delivery/waku/waku_core.nim diff --git a/waku/waku_core/codecs.nim b/logos_delivery/waku/waku_core/codecs.nim similarity index 100% rename from waku/waku_core/codecs.nim rename to logos_delivery/waku/waku_core/codecs.nim diff --git a/waku/waku_core/message.nim b/logos_delivery/waku/waku_core/message.nim similarity index 100% rename from waku/waku_core/message.nim rename to logos_delivery/waku/waku_core/message.nim diff --git a/waku/waku_core/message/codec.nim b/logos_delivery/waku/waku_core/message/codec.nim similarity index 100% rename from waku/waku_core/message/codec.nim rename to logos_delivery/waku/waku_core/message/codec.nim diff --git a/waku/waku_core/message/default_values.nim b/logos_delivery/waku/waku_core/message/default_values.nim similarity index 100% rename from waku/waku_core/message/default_values.nim rename to logos_delivery/waku/waku_core/message/default_values.nim diff --git a/waku/waku_core/message/digest.nim b/logos_delivery/waku/waku_core/message/digest.nim similarity index 100% rename from waku/waku_core/message/digest.nim rename to logos_delivery/waku/waku_core/message/digest.nim diff --git a/waku/waku_core/message/message.nim b/logos_delivery/waku/waku_core/message/message.nim similarity index 100% rename from waku/waku_core/message/message.nim rename to logos_delivery/waku/waku_core/message/message.nim diff --git a/waku/waku_core/multiaddrstr.nim b/logos_delivery/waku/waku_core/multiaddrstr.nim similarity index 100% rename from waku/waku_core/multiaddrstr.nim rename to logos_delivery/waku/waku_core/multiaddrstr.nim diff --git a/waku/waku_core/peers.nim b/logos_delivery/waku/waku_core/peers.nim similarity index 100% rename from waku/waku_core/peers.nim rename to logos_delivery/waku/waku_core/peers.nim diff --git a/waku/waku_core/subscription.nim b/logos_delivery/waku/waku_core/subscription.nim similarity index 100% rename from waku/waku_core/subscription.nim rename to logos_delivery/waku/waku_core/subscription.nim diff --git a/waku/waku_core/subscription/push_handler.nim b/logos_delivery/waku/waku_core/subscription/push_handler.nim similarity index 100% rename from waku/waku_core/subscription/push_handler.nim rename to logos_delivery/waku/waku_core/subscription/push_handler.nim diff --git a/waku/waku_core/time.nim b/logos_delivery/waku/waku_core/time.nim similarity index 100% rename from waku/waku_core/time.nim rename to logos_delivery/waku/waku_core/time.nim diff --git a/waku/waku_core/topics.nim b/logos_delivery/waku/waku_core/topics.nim similarity index 100% rename from waku/waku_core/topics.nim rename to logos_delivery/waku/waku_core/topics.nim diff --git a/waku/waku_core/topics/content_topic.nim b/logos_delivery/waku/waku_core/topics/content_topic.nim similarity index 100% rename from waku/waku_core/topics/content_topic.nim rename to logos_delivery/waku/waku_core/topics/content_topic.nim diff --git a/waku/waku_core/topics/parsing.nim b/logos_delivery/waku/waku_core/topics/parsing.nim similarity index 100% rename from waku/waku_core/topics/parsing.nim rename to logos_delivery/waku/waku_core/topics/parsing.nim diff --git a/waku/waku_core/topics/pubsub_topic.nim b/logos_delivery/waku/waku_core/topics/pubsub_topic.nim similarity index 100% rename from waku/waku_core/topics/pubsub_topic.nim rename to logos_delivery/waku/waku_core/topics/pubsub_topic.nim diff --git a/waku/waku_core/topics/sharding.nim b/logos_delivery/waku/waku_core/topics/sharding.nim similarity index 100% rename from waku/waku_core/topics/sharding.nim rename to logos_delivery/waku/waku_core/topics/sharding.nim diff --git a/waku/waku_enr.nim b/logos_delivery/waku/waku_enr.nim similarity index 100% rename from waku/waku_enr.nim rename to logos_delivery/waku/waku_enr.nim diff --git a/waku/waku_enr/capabilities.nim b/logos_delivery/waku/waku_enr/capabilities.nim similarity index 100% rename from waku/waku_enr/capabilities.nim rename to logos_delivery/waku/waku_enr/capabilities.nim diff --git a/waku/waku_enr/multiaddr.nim b/logos_delivery/waku/waku_enr/multiaddr.nim similarity index 100% rename from waku/waku_enr/multiaddr.nim rename to logos_delivery/waku/waku_enr/multiaddr.nim diff --git a/waku/waku_enr/sharding.nim b/logos_delivery/waku/waku_enr/sharding.nim similarity index 100% rename from waku/waku_enr/sharding.nim rename to logos_delivery/waku/waku_enr/sharding.nim diff --git a/waku/waku_filter_v2.nim b/logos_delivery/waku/waku_filter_v2.nim similarity index 100% rename from waku/waku_filter_v2.nim rename to logos_delivery/waku/waku_filter_v2.nim diff --git a/waku/waku_filter_v2/client.nim b/logos_delivery/waku/waku_filter_v2/client.nim similarity index 99% rename from waku/waku_filter_v2/client.nim rename to logos_delivery/waku/waku_filter_v2/client.nim index 7798f41b7..6fb473e27 100644 --- a/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/waku/waku_filter_v2/common.nim b/logos_delivery/waku/waku_filter_v2/common.nim similarity index 100% rename from waku/waku_filter_v2/common.nim rename to logos_delivery/waku/waku_filter_v2/common.nim diff --git a/waku/waku_filter_v2/protocol.nim b/logos_delivery/waku/waku_filter_v2/protocol.nim similarity index 100% rename from waku/waku_filter_v2/protocol.nim rename to logos_delivery/waku/waku_filter_v2/protocol.nim diff --git a/waku/waku_filter_v2/protocol_metrics.nim b/logos_delivery/waku/waku_filter_v2/protocol_metrics.nim similarity index 100% rename from waku/waku_filter_v2/protocol_metrics.nim rename to logos_delivery/waku/waku_filter_v2/protocol_metrics.nim diff --git a/waku/waku_filter_v2/rpc.nim b/logos_delivery/waku/waku_filter_v2/rpc.nim similarity index 100% rename from waku/waku_filter_v2/rpc.nim rename to logos_delivery/waku/waku_filter_v2/rpc.nim diff --git a/waku/waku_filter_v2/rpc_codec.nim b/logos_delivery/waku/waku_filter_v2/rpc_codec.nim similarity index 100% rename from waku/waku_filter_v2/rpc_codec.nim rename to logos_delivery/waku/waku_filter_v2/rpc_codec.nim diff --git a/waku/waku_filter_v2/subscriptions.nim b/logos_delivery/waku/waku_filter_v2/subscriptions.nim similarity index 100% rename from waku/waku_filter_v2/subscriptions.nim rename to logos_delivery/waku/waku_filter_v2/subscriptions.nim diff --git a/waku/waku_keystore.nim b/logos_delivery/waku/waku_keystore.nim similarity index 100% rename from waku/waku_keystore.nim rename to logos_delivery/waku/waku_keystore.nim diff --git a/waku/waku_keystore/conversion_utils.nim b/logos_delivery/waku/waku_keystore/conversion_utils.nim similarity index 100% rename from waku/waku_keystore/conversion_utils.nim rename to logos_delivery/waku/waku_keystore/conversion_utils.nim diff --git a/waku/waku_keystore/keyfile.nim b/logos_delivery/waku/waku_keystore/keyfile.nim similarity index 100% rename from waku/waku_keystore/keyfile.nim rename to logos_delivery/waku/waku_keystore/keyfile.nim diff --git a/waku/waku_keystore/keystore.nim b/logos_delivery/waku/waku_keystore/keystore.nim similarity index 100% rename from waku/waku_keystore/keystore.nim rename to logos_delivery/waku/waku_keystore/keystore.nim diff --git a/waku/waku_keystore/protocol_types.nim b/logos_delivery/waku/waku_keystore/protocol_types.nim similarity index 100% rename from waku/waku_keystore/protocol_types.nim rename to logos_delivery/waku/waku_keystore/protocol_types.nim diff --git a/waku/waku_keystore/utils.nim b/logos_delivery/waku/waku_keystore/utils.nim similarity index 100% rename from waku/waku_keystore/utils.nim rename to logos_delivery/waku/waku_keystore/utils.nim diff --git a/waku/waku_lightpush.nim b/logos_delivery/waku/waku_lightpush.nim similarity index 100% rename from waku/waku_lightpush.nim rename to logos_delivery/waku/waku_lightpush.nim diff --git a/waku/waku_lightpush/callbacks.nim b/logos_delivery/waku/waku_lightpush/callbacks.nim similarity index 100% rename from waku/waku_lightpush/callbacks.nim rename to logos_delivery/waku/waku_lightpush/callbacks.nim diff --git a/waku/waku_lightpush/client.nim b/logos_delivery/waku/waku_lightpush/client.nim similarity index 100% rename from waku/waku_lightpush/client.nim rename to logos_delivery/waku/waku_lightpush/client.nim diff --git a/waku/waku_lightpush/common.nim b/logos_delivery/waku/waku_lightpush/common.nim similarity index 100% rename from waku/waku_lightpush/common.nim rename to logos_delivery/waku/waku_lightpush/common.nim diff --git a/waku/waku_lightpush/protocol.nim b/logos_delivery/waku/waku_lightpush/protocol.nim similarity index 100% rename from waku/waku_lightpush/protocol.nim rename to logos_delivery/waku/waku_lightpush/protocol.nim diff --git a/waku/waku_lightpush/protocol_metrics.nim b/logos_delivery/waku/waku_lightpush/protocol_metrics.nim similarity index 100% rename from waku/waku_lightpush/protocol_metrics.nim rename to logos_delivery/waku/waku_lightpush/protocol_metrics.nim diff --git a/waku/waku_lightpush/rpc.nim b/logos_delivery/waku/waku_lightpush/rpc.nim similarity index 100% rename from waku/waku_lightpush/rpc.nim rename to logos_delivery/waku/waku_lightpush/rpc.nim diff --git a/waku/waku_lightpush/rpc_codec.nim b/logos_delivery/waku/waku_lightpush/rpc_codec.nim similarity index 100% rename from waku/waku_lightpush/rpc_codec.nim rename to logos_delivery/waku/waku_lightpush/rpc_codec.nim diff --git a/waku/waku_lightpush/self_req_handler.nim b/logos_delivery/waku/waku_lightpush/self_req_handler.nim similarity index 100% rename from waku/waku_lightpush/self_req_handler.nim rename to logos_delivery/waku/waku_lightpush/self_req_handler.nim diff --git a/waku/waku_lightpush_legacy.nim b/logos_delivery/waku/waku_lightpush_legacy.nim similarity index 100% rename from waku/waku_lightpush_legacy.nim rename to logos_delivery/waku/waku_lightpush_legacy.nim diff --git a/waku/waku_lightpush_legacy/README.md b/logos_delivery/waku/waku_lightpush_legacy/README.md similarity index 100% rename from waku/waku_lightpush_legacy/README.md rename to logos_delivery/waku/waku_lightpush_legacy/README.md diff --git a/waku/waku_lightpush_legacy/callbacks.nim b/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim similarity index 100% rename from waku/waku_lightpush_legacy/callbacks.nim rename to logos_delivery/waku/waku_lightpush_legacy/callbacks.nim diff --git a/waku/waku_lightpush_legacy/client.nim b/logos_delivery/waku/waku_lightpush_legacy/client.nim similarity index 100% rename from waku/waku_lightpush_legacy/client.nim rename to logos_delivery/waku/waku_lightpush_legacy/client.nim diff --git a/waku/waku_lightpush_legacy/common.nim b/logos_delivery/waku/waku_lightpush_legacy/common.nim similarity index 100% rename from waku/waku_lightpush_legacy/common.nim rename to logos_delivery/waku/waku_lightpush_legacy/common.nim diff --git a/waku/waku_lightpush_legacy/protocol.nim b/logos_delivery/waku/waku_lightpush_legacy/protocol.nim similarity index 100% rename from waku/waku_lightpush_legacy/protocol.nim rename to logos_delivery/waku/waku_lightpush_legacy/protocol.nim diff --git a/waku/waku_lightpush_legacy/protocol_metrics.nim b/logos_delivery/waku/waku_lightpush_legacy/protocol_metrics.nim similarity index 100% rename from waku/waku_lightpush_legacy/protocol_metrics.nim rename to logos_delivery/waku/waku_lightpush_legacy/protocol_metrics.nim diff --git a/waku/waku_lightpush_legacy/rpc.nim b/logos_delivery/waku/waku_lightpush_legacy/rpc.nim similarity index 100% rename from waku/waku_lightpush_legacy/rpc.nim rename to logos_delivery/waku/waku_lightpush_legacy/rpc.nim diff --git a/waku/waku_lightpush_legacy/rpc_codec.nim b/logos_delivery/waku/waku_lightpush_legacy/rpc_codec.nim similarity index 100% rename from waku/waku_lightpush_legacy/rpc_codec.nim rename to logos_delivery/waku/waku_lightpush_legacy/rpc_codec.nim diff --git a/waku/waku_lightpush_legacy/self_req_handler.nim b/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim similarity index 100% rename from waku/waku_lightpush_legacy/self_req_handler.nim rename to logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim diff --git a/waku/waku_metadata.nim b/logos_delivery/waku/waku_metadata.nim similarity index 100% rename from waku/waku_metadata.nim rename to logos_delivery/waku/waku_metadata.nim diff --git a/waku/waku_metadata/protocol.nim b/logos_delivery/waku/waku_metadata/protocol.nim similarity index 100% rename from waku/waku_metadata/protocol.nim rename to logos_delivery/waku/waku_metadata/protocol.nim diff --git a/waku/waku_metadata/rpc.nim b/logos_delivery/waku/waku_metadata/rpc.nim similarity index 100% rename from waku/waku_metadata/rpc.nim rename to logos_delivery/waku/waku_metadata/rpc.nim diff --git a/waku/waku_mix.nim b/logos_delivery/waku/waku_mix.nim similarity index 100% rename from waku/waku_mix.nim rename to logos_delivery/waku/waku_mix.nim diff --git a/waku/waku_mix/protocol.nim b/logos_delivery/waku/waku_mix/protocol.nim similarity index 94% rename from waku/waku_mix/protocol.nim rename to logos_delivery/waku/waku_mix/protocol.nim index ac8b69eaf..c0c3adadc 100644 --- a/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/waku/waku_node.nim b/logos_delivery/waku/waku_node.nim similarity index 100% rename from waku/waku_node.nim rename to logos_delivery/waku/waku_node.nim diff --git a/waku/waku_noise/noise.nim b/logos_delivery/waku/waku_noise/noise.nim similarity index 100% rename from waku/waku_noise/noise.nim rename to logos_delivery/waku/waku_noise/noise.nim diff --git a/waku/waku_noise/noise_handshake_processing.nim b/logos_delivery/waku/waku_noise/noise_handshake_processing.nim similarity index 100% rename from waku/waku_noise/noise_handshake_processing.nim rename to logos_delivery/waku/waku_noise/noise_handshake_processing.nim diff --git a/waku/waku_noise/noise_types.nim b/logos_delivery/waku/waku_noise/noise_types.nim similarity index 100% rename from waku/waku_noise/noise_types.nim rename to logos_delivery/waku/waku_noise/noise_types.nim diff --git a/waku/waku_noise/noise_utils.nim b/logos_delivery/waku/waku_noise/noise_utils.nim similarity index 100% rename from waku/waku_noise/noise_utils.nim rename to logos_delivery/waku/waku_noise/noise_utils.nim diff --git a/waku/waku_peer_exchange.nim b/logos_delivery/waku/waku_peer_exchange.nim similarity index 100% rename from waku/waku_peer_exchange.nim rename to logos_delivery/waku/waku_peer_exchange.nim diff --git a/waku/waku_peer_exchange/README.md b/logos_delivery/waku/waku_peer_exchange/README.md similarity index 100% rename from waku/waku_peer_exchange/README.md rename to logos_delivery/waku/waku_peer_exchange/README.md diff --git a/waku/waku_peer_exchange/client.nim b/logos_delivery/waku/waku_peer_exchange/client.nim similarity index 100% rename from waku/waku_peer_exchange/client.nim rename to logos_delivery/waku/waku_peer_exchange/client.nim diff --git a/waku/waku_peer_exchange/common.nim b/logos_delivery/waku/waku_peer_exchange/common.nim similarity index 100% rename from waku/waku_peer_exchange/common.nim rename to logos_delivery/waku/waku_peer_exchange/common.nim diff --git a/waku/waku_peer_exchange/protocol.nim b/logos_delivery/waku/waku_peer_exchange/protocol.nim similarity index 100% rename from waku/waku_peer_exchange/protocol.nim rename to logos_delivery/waku/waku_peer_exchange/protocol.nim diff --git a/waku/waku_peer_exchange/rpc.nim b/logos_delivery/waku/waku_peer_exchange/rpc.nim similarity index 100% rename from waku/waku_peer_exchange/rpc.nim rename to logos_delivery/waku/waku_peer_exchange/rpc.nim diff --git a/waku/waku_peer_exchange/rpc_codec.nim b/logos_delivery/waku/waku_peer_exchange/rpc_codec.nim similarity index 100% rename from waku/waku_peer_exchange/rpc_codec.nim rename to logos_delivery/waku/waku_peer_exchange/rpc_codec.nim diff --git a/logos_delivery/waku/waku_persistency.nim b/logos_delivery/waku/waku_persistency.nim new file mode 100644 index 000000000..dc577199e --- /dev/null +++ b/logos_delivery/waku/waku_persistency.nim @@ -0,0 +1,3 @@ +import logos_delivery/waku/persistency/persistency + +export persistency diff --git a/waku/waku_relay.nim b/logos_delivery/waku/waku_relay.nim similarity index 50% rename from waku/waku_relay.nim rename to logos_delivery/waku/waku_relay.nim index a91033cf1..606fb16e2 100644 --- a/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/waku/waku_relay/message_id.nim b/logos_delivery/waku/waku_relay/message_id.nim similarity index 100% rename from waku/waku_relay/message_id.nim rename to logos_delivery/waku/waku_relay/message_id.nim diff --git a/waku/waku_relay/protocol.nim b/logos_delivery/waku/waku_relay/protocol.nim similarity index 98% rename from waku/waku_relay/protocol.nim rename to logos_delivery/waku/waku_relay/protocol.nim index d0b1ddb48..c35854be3 100644 --- a/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/waku/waku_rendezvous.nim b/logos_delivery/waku/waku_rendezvous.nim similarity index 100% rename from waku/waku_rendezvous.nim rename to logos_delivery/waku/waku_rendezvous.nim diff --git a/waku/waku_rendezvous/client.nim b/logos_delivery/waku/waku_rendezvous/client.nim similarity index 97% rename from waku/waku_rendezvous/client.nim rename to logos_delivery/waku/waku_rendezvous/client.nim index 09e789774..433ce361e 100644 --- a/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/waku/waku_rendezvous/common.nim b/logos_delivery/waku/waku_rendezvous/common.nim similarity index 100% rename from waku/waku_rendezvous/common.nim rename to logos_delivery/waku/waku_rendezvous/common.nim diff --git a/waku/waku_rendezvous/protocol.nim b/logos_delivery/waku/waku_rendezvous/protocol.nim similarity index 100% rename from waku/waku_rendezvous/protocol.nim rename to logos_delivery/waku/waku_rendezvous/protocol.nim diff --git a/waku/waku_rendezvous/waku_peer_record.nim b/logos_delivery/waku/waku_rendezvous/waku_peer_record.nim similarity index 100% rename from waku/waku_rendezvous/waku_peer_record.nim rename to logos_delivery/waku/waku_rendezvous/waku_peer_record.nim diff --git a/waku/waku_rest.nim b/logos_delivery/waku/waku_rest.nim similarity index 100% rename from waku/waku_rest.nim rename to logos_delivery/waku/waku_rest.nim diff --git a/waku/waku_rln_relay.nim b/logos_delivery/waku/waku_rln_relay.nim similarity index 100% rename from waku/waku_rln_relay.nim rename to logos_delivery/waku/waku_rln_relay.nim diff --git a/waku/waku_rln_relay/constants.nim b/logos_delivery/waku/waku_rln_relay/constants.nim similarity index 100% rename from waku/waku_rln_relay/constants.nim rename to logos_delivery/waku/waku_rln_relay/constants.nim diff --git a/waku/waku_rln_relay/contract.nim b/logos_delivery/waku/waku_rln_relay/contract.nim similarity index 100% rename from waku/waku_rln_relay/contract.nim rename to logos_delivery/waku/waku_rln_relay/contract.nim diff --git a/waku/waku_rln_relay/conversion_utils.nim b/logos_delivery/waku/waku_rln_relay/conversion_utils.nim similarity index 100% rename from waku/waku_rln_relay/conversion_utils.nim rename to logos_delivery/waku/waku_rln_relay/conversion_utils.nim diff --git a/waku/waku_rln_relay/group_manager.nim b/logos_delivery/waku/waku_rln_relay/group_manager.nim similarity index 100% rename from waku/waku_rln_relay/group_manager.nim rename to logos_delivery/waku/waku_rln_relay/group_manager.nim diff --git a/waku/waku_rln_relay/group_manager/group_manager_base.nim b/logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim similarity index 100% rename from waku/waku_rln_relay/group_manager/group_manager_base.nim rename to logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim diff --git a/waku/waku_rln_relay/group_manager/on_chain.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim similarity index 100% rename from waku/waku_rln_relay/group_manager/on_chain.nim rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim similarity index 100% rename from waku/waku_rln_relay/group_manager/on_chain/group_manager.nim rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim diff --git a/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim similarity index 100% rename from waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim diff --git a/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim similarity index 100% rename from waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim diff --git a/waku/waku_rln_relay/nonce_manager.nim b/logos_delivery/waku/waku_rln_relay/nonce_manager.nim similarity index 100% rename from waku/waku_rln_relay/nonce_manager.nim rename to logos_delivery/waku/waku_rln_relay/nonce_manager.nim diff --git a/waku/waku_rln_relay/protocol_metrics.nim b/logos_delivery/waku/waku_rln_relay/protocol_metrics.nim similarity index 100% rename from waku/waku_rln_relay/protocol_metrics.nim rename to logos_delivery/waku/waku_rln_relay/protocol_metrics.nim diff --git a/waku/waku_rln_relay/protocol_types.nim b/logos_delivery/waku/waku_rln_relay/protocol_types.nim similarity index 100% rename from waku/waku_rln_relay/protocol_types.nim rename to logos_delivery/waku/waku_rln_relay/protocol_types.nim diff --git a/waku/waku_rln_relay/rln.nim b/logos_delivery/waku/waku_rln_relay/rln.nim similarity index 100% rename from waku/waku_rln_relay/rln.nim rename to logos_delivery/waku/waku_rln_relay/rln.nim diff --git a/waku/waku_rln_relay/rln/rln_interface.nim b/logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim similarity index 100% rename from waku/waku_rln_relay/rln/rln_interface.nim rename to logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim diff --git a/waku/waku_rln_relay/rln/wrappers.nim b/logos_delivery/waku/waku_rln_relay/rln/wrappers.nim similarity index 100% rename from waku/waku_rln_relay/rln/wrappers.nim rename to logos_delivery/waku/waku_rln_relay/rln/wrappers.nim diff --git a/waku/waku_rln_relay/rln_relay.nim b/logos_delivery/waku/waku_rln_relay/rln_relay.nim similarity index 99% rename from waku/waku_rln_relay/rln_relay.nim rename to logos_delivery/waku/waku_rln_relay/rln_relay.nim index 7c36300b2..7c9028dd6 100644 --- a/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/waku/waku_store.nim b/logos_delivery/waku/waku_store.nim similarity index 100% rename from waku/waku_store.nim rename to logos_delivery/waku/waku_store.nim diff --git a/waku/waku_store/client.nim b/logos_delivery/waku/waku_store/client.nim similarity index 100% rename from waku/waku_store/client.nim rename to logos_delivery/waku/waku_store/client.nim diff --git a/waku/waku_store/common.nim b/logos_delivery/waku/waku_store/common.nim similarity index 100% rename from waku/waku_store/common.nim rename to logos_delivery/waku/waku_store/common.nim diff --git a/waku/waku_store/protocol.nim b/logos_delivery/waku/waku_store/protocol.nim similarity index 100% rename from waku/waku_store/protocol.nim rename to logos_delivery/waku/waku_store/protocol.nim diff --git a/waku/waku_store/protocol_metrics.nim b/logos_delivery/waku/waku_store/protocol_metrics.nim similarity index 100% rename from waku/waku_store/protocol_metrics.nim rename to logos_delivery/waku/waku_store/protocol_metrics.nim diff --git a/waku/waku_store/resume.nim b/logos_delivery/waku/waku_store/resume.nim similarity index 100% rename from waku/waku_store/resume.nim rename to logos_delivery/waku/waku_store/resume.nim diff --git a/waku/waku_store/rpc_codec.nim b/logos_delivery/waku/waku_store/rpc_codec.nim similarity index 100% rename from waku/waku_store/rpc_codec.nim rename to logos_delivery/waku/waku_store/rpc_codec.nim diff --git a/waku/waku_store/self_req_handler.nim b/logos_delivery/waku/waku_store/self_req_handler.nim similarity index 100% rename from waku/waku_store/self_req_handler.nim rename to logos_delivery/waku/waku_store/self_req_handler.nim diff --git a/waku/waku_store_sync.nim b/logos_delivery/waku/waku_store_sync.nim similarity index 100% rename from waku/waku_store_sync.nim rename to logos_delivery/waku/waku_store_sync.nim diff --git a/waku/waku_store_sync/codec.nim b/logos_delivery/waku/waku_store_sync/codec.nim similarity index 100% rename from waku/waku_store_sync/codec.nim rename to logos_delivery/waku/waku_store_sync/codec.nim diff --git a/waku/waku_store_sync/common.nim b/logos_delivery/waku/waku_store_sync/common.nim similarity index 100% rename from waku/waku_store_sync/common.nim rename to logos_delivery/waku/waku_store_sync/common.nim diff --git a/waku/waku_store_sync/protocols_metrics.nim b/logos_delivery/waku/waku_store_sync/protocols_metrics.nim similarity index 100% rename from waku/waku_store_sync/protocols_metrics.nim rename to logos_delivery/waku/waku_store_sync/protocols_metrics.nim diff --git a/waku/waku_store_sync/reconciliation.nim b/logos_delivery/waku/waku_store_sync/reconciliation.nim similarity index 100% rename from waku/waku_store_sync/reconciliation.nim rename to logos_delivery/waku/waku_store_sync/reconciliation.nim diff --git a/waku/waku_store_sync/storage/range_processing.nim b/logos_delivery/waku/waku_store_sync/storage/range_processing.nim similarity index 100% rename from waku/waku_store_sync/storage/range_processing.nim rename to logos_delivery/waku/waku_store_sync/storage/range_processing.nim diff --git a/waku/waku_store_sync/storage/seq_storage.nim b/logos_delivery/waku/waku_store_sync/storage/seq_storage.nim similarity index 100% rename from waku/waku_store_sync/storage/seq_storage.nim rename to logos_delivery/waku/waku_store_sync/storage/seq_storage.nim diff --git a/waku/waku_store_sync/storage/storage.nim b/logos_delivery/waku/waku_store_sync/storage/storage.nim similarity index 100% rename from waku/waku_store_sync/storage/storage.nim rename to logos_delivery/waku/waku_store_sync/storage/storage.nim diff --git a/waku/waku_store_sync/transfer.nim b/logos_delivery/waku/waku_store_sync/transfer.nim similarity index 100% rename from waku/waku_store_sync/transfer.nim rename to logos_delivery/waku/waku_store_sync/transfer.nim diff --git a/tests/api/test_api_health.nim b/tests/api/test_api_health.nim index 62fe39b9e..e38439cbd 100644 --- a/tests/api/test_api_health.nim +++ b/tests/api/test_api_health.nim @@ -6,14 +6,15 @@ 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 85e522afc..3280f0609 100644 --- a/tests/api/test_api_receive.nim +++ b/tests/api/test_api_receive.nim @@ -6,20 +6,20 @@ import libp2p/[peerid, peerinfo, crypto/crypto] import brokers/broker_context import ../testlib/[common, wakucore, wakunode, testasync] import ../waku_archive/archive_utils -import waku/messaging_client +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, waku_relay/protocol, waku_archive, waku_archive/common as archive_common, - node/delivery_service/recv_service, ] -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 7cb0e981a..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 waku/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..438c97096 100644 --- a/tests/common/test_sqlite_migrations.nim +++ b/tests/common/test_sqlite_migrations.nim @@ -1,7 +1,8 @@ {.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..f64947614 100644 --- a/tests/incentivization/test_poc_reputation.nim +++ b/tests/incentivization/test_poc_reputation.nim @@ -1,6 +1,8 @@ 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..7925af92d 100644 --- a/tests/node/peer_manager/peer_store/test_migrations.nim +++ b/tests/node/peer_manager/peer_store/test_migrations.nim @@ -1,13 +1,15 @@ 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..aaee96ab3 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,8 @@ 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..e7dd2a151 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,9 @@ 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 be779c586..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, @@ -15,7 +15,6 @@ import node/health_monitor/protocol_health, node/health_monitor/topic_health, node/health_monitor/node_health_monitor, - messaging_client, node/waku_node/relay, node/waku_node/store, node/waku_node/lightpush, @@ -26,7 +25,8 @@ import ] import ../testlib/[wakunode, wakucore], ../waku_archive/archive_utils -import waku/node/subscription_manager +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..be36b8d98 100644 --- a/tests/node/test_wakunode_lightpush.nim +++ b/tests/node/test_wakunode_lightpush.nim @@ -8,7 +8,8 @@ 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..e6addf9cf 100644 --- a/tests/node/utils.nim +++ b/tests/node/utils.nim @@ -1,6 +1,7 @@ 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..10dcd2e66 100644 --- a/tests/test_message_cache.nim +++ b/tests/test_message_cache.nim @@ -1,7 +1,10 @@ {.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..058576d4c 100644 --- a/tests/test_relay_peer_exchange.nim +++ b/tests/test_relay_peer_exchange.nim @@ -7,7 +7,11 @@ 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..aa353f8e5 100644 --- a/tests/test_utils_compat.nim +++ b/tests/test_utils_compat.nim @@ -1,7 +1,11 @@ {.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..d893f0fde 100644 --- a/tests/test_waku_protobufs.nim +++ b/tests/test_waku_protobufs.nim @@ -2,7 +2,10 @@ 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..574e35d7b 100644 --- a/tests/test_wakunode.nim +++ b/tests/test_wakunode.nim @@ -17,7 +17,9 @@ 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..eb1584ec2 100644 --- a/tests/waku_archive/test_driver_queue_index.nim +++ b/tests/waku_archive/test_driver_queue_index.nim @@ -1,7 +1,9 @@ {.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..e612c88e3 100644 --- a/tests/waku_archive/test_partition_manager.nim +++ b/tests/waku_archive/test_partition_manager.nim @@ -1,7 +1,9 @@ {.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..c9948e268 100644 --- a/tests/waku_enr/utils.nim +++ b/tests/waku_enr/utils.nim @@ -6,7 +6,9 @@ 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..c5bd3c558 100644 --- a/tests/waku_filter_v2/test_waku_client.nim +++ b/tests/waku_filter_v2/test_waku_client.nim @@ -3,10 +3,11 @@ 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..9d86df9bb 100644 --- a/tests/waku_keystore/utils.nim +++ b/tests/waku_keystore/utils.nim @@ -4,7 +4,8 @@ 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..8500ad8b2 100644 --- a/tests/waku_lightpush/test_ratelimit.nim +++ b/tests/waku_lightpush/test_ratelimit.nim @@ -3,7 +3,8 @@ 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..8d969a31b 100644 --- a/tests/waku_rln_relay/rln/test_wrappers.nim +++ b/tests/waku_rln_relay/rln/test_wrappers.nim @@ -1,6 +1,9 @@ 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..1e241ec95 100644 --- a/tests/waku_store/store_utils.nim +++ b/tests/waku_store/store_utils.nim @@ -3,7 +3,8 @@ 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..ce9f5f802 100644 --- a/tests/waku_store/test_client.nim +++ b/tests/waku_store/test_client.nim @@ -3,7 +3,8 @@ 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..dc6e8eb28 100644 --- a/tests/wakunode2/test_validators.nim +++ b/tests/wakunode2/test_validators.nim @@ -12,7 +12,8 @@ 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..f14912b85 100644 --- a/tests/wakunode_rest/test_rest_debug_serdes.nim +++ b/tests/wakunode_rest/test_rest_debug_serdes.nim @@ -1,7 +1,9 @@ {.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..12f0ae9da 100644 --- a/tests/wakunode_rest/test_rest_serdes.nim +++ b/tests/wakunode_rest/test_rest_serdes.nim @@ -1,7 +1,9 @@ {.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, diff --git a/tools/sync-nimble-lock.sh b/tools/sync-nimble-lock.sh index b55826327..29d30afb2 100755 --- a/tools/sync-nimble-lock.sh +++ b/tools/sync-nimble-lock.sh @@ -2,7 +2,7 @@ # # sync-nimble-lock.sh # -# Cross-check git-URL pinned `requires` in waku.nimble against nimble.lock and +# Cross-check git-URL pinned `requires` in logos_delivery.nimble against nimble.lock and # sync the lock entry for any pin that CHANGED relative to a git base ref # (default: HEAD) -- and ONLY those entries. No other package is touched. # @@ -19,7 +19,7 @@ # # For each changed pin it updates exactly three fields of the matching lock # entry, preserving all formatting and every other entry byte-for-byte: -# version = "#" + (commit or tag) +# version = "#" + (commit or tag) # vcsRevision = git rev-parse of the ref (resolves tags) # checksums.sha1 = the self-computed checksum # @@ -82,7 +82,7 @@ APPLY = os.environ["SYNC_APPLY"] == "1" BASE = os.environ["SYNC_BASE"] PKGCACHE = os.environ["SYNC_PKGCACHE"] -NIMBLE_FILE = os.path.join(ROOT, "waku.nimble") +NIMBLE_FILE = os.path.join(ROOT, "logos_delivery.nimble") LOCK_FILE = os.path.join(ROOT, "nimble.lock") REQ_RE = re.compile(r'requires\s+"(https?://[^"#]+)#([^"]+)"') @@ -180,7 +180,7 @@ def dep_requires_count(checkout_dir): # detect changes # --------------------------------------------------------------------------- def parse_changed(base): - r = git(["-C", ROOT, "diff", base, "--", "waku.nimble"], check=False) + r = git(["-C", ROOT, "diff", base, "--", "logos_delivery.nimble"], check=False) if r.returncode != 0: fail("git diff against %r failed: %s" % (base, r.stderr.strip())) changed, seen = [], set() @@ -245,7 +245,7 @@ def main(): changed = parse_changed(BASE) if not changed: - print("No changed git-URL `requires` in waku.nimble vs %s — nothing to sync." % BASE) + print("No changed git-URL `requires` in logos_delivery.nimble vs %s — nothing to sync." % BASE) return 0 lock = json.load(open(LOCK_FILE)) @@ -264,13 +264,13 @@ def main(): drift.append((url, rev, hit[0], hit[1].get("version"))) if not drift: - print("nimble.lock already in sync with waku.nimble (%d changed pin(s) checked)." % len(changed)) + print("nimble.lock already in sync with logos_delivery.nimble (%d changed pin(s) checked)." % len(changed)) return 0 - print("Dependency drift (waku.nimble vs nimble.lock):") + print("Dependency drift (logos_delivery.nimble vs nimble.lock):") for url, rev, name, cur in drift: tag = name or "(missing)" - print(" ~ %s [%s]\n waku.nimble: #%s\n nimble.lock: %s" % (url, tag, rev, cur)) + print(" ~ %s [%s]\n logos_delivery.nimble: #%s\n nimble.lock: %s" % (url, tag, rev, cur)) if not APPLY: print("\nRun with --apply to update nimble.lock (computes checksum itself; no `nimble lock`).") diff --git a/waku/waku_persistency.nim b/waku/waku_persistency.nim deleted file mode 100644 index 5eb94e3f0..000000000 --- a/waku/waku_persistency.nim +++ /dev/null @@ -1,3 +0,0 @@ -import waku/persistency/persistency - -export persistency