From 5e2e1b6bd0325bdcb4df57ba3416f080db7dbf57 Mon Sep 17 00:00:00 2001 From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com> Date: Wed, 9 Aug 2023 18:11:50 +0100 Subject: [PATCH] chore: remove references to v2 (#1898) * chore: remove references to v2 * fix: lingering rln-relay import path --- .github/workflows/ci-experimental.yml | 19 ++-- .github/workflows/ci.yml | 19 ++-- .github/workflows/pre-release.yml | 4 +- Dockerfile | 2 +- Makefile | 27 ++--- apps/chat2/chat2.nim | 20 ++-- apps/chat2/config_chat2.nim | 2 +- apps/chat2bridge/chat2bridge.nim | 20 ++-- apps/networkmonitor/networkmonitor.nim | 12 +- apps/wakucanary/wakucanary.nim | 8 +- apps/wakunode2/app.nim | 58 +++++----- apps/wakunode2/external_config.nim | 2 +- apps/wakunode2/internal_config.nim | 4 +- apps/wakunode2/wakunode2_validator_signed.nim | 4 +- ci/Jenkinsfile.prs | 4 +- docs/api/{v2 => }/node.md | 0 docs/api/{v2 => }/rest-api.md | 0 docs/tutorial/chat2.md | 6 +- docs/tutorial/db-migration.md | 4 +- examples/{v2 => }/README.md | 2 +- examples/{v2 => }/filter_subscriber.nim | 6 +- examples/{v2 => }/lightpush_publisher.nim | 6 +- examples/{v2 => }/nim.cfg | 0 examples/{v2 => }/publisher.nim | 10 +- examples/{v2 => }/subscriber.nim | 10 +- library/events/json_message_event.nim | 2 +- library/libwaku.nim | 8 +- library/waku_thread/config.nim | 6 +- .../node_lifecycle_request.nim | 2 +- .../peer_manager_request.nim | 2 +- .../protocols/relay_request.nim | 8 +- .../inter_thread_communication/request.nim | 2 +- library/waku_thread/waku_thread.nim | 22 ++-- tests/all_tests_v2.nim | 105 ------------------ tests/all_tests_waku.nim | 105 ++++++++++++++++++ tests/common/test_enr_builder.nim | 2 +- tests/{v2 => }/test_message_cache.nim | 4 +- tests/{v2 => }/test_peer_exchange.nim | 4 +- tests/{v2 => }/test_peer_manager.nim | 16 +-- tests/{v2 => }/test_peer_storage.nim | 4 +- tests/{v2 => }/test_peer_store_extended.nim | 6 +- tests/{v2 => }/test_utils_compat.nim | 4 +- tests/{v2 => }/test_waku_discv5.nim | 4 +- tests/{v2 => }/test_waku_dnsdisc.nim | 6 +- tests/{v2 => }/test_waku_enr.nim | 4 +- tests/{v2 => }/test_waku_filter.nim | 8 +- tests/{v2 => }/test_waku_keepalive.nim | 4 +- tests/{v2 => }/test_waku_keystore.nim | 4 +- tests/{v2 => }/test_waku_keystore_keyfile.nim | 4 +- tests/{v2 => }/test_waku_lightpush.nim | 8 +- tests/{v2 => }/test_waku_noise.nim | 12 +- tests/{v2 => }/test_waku_noise_sessions.nim | 10 +- tests/{v2 => }/test_waku_peer_exchange.nim | 14 +-- tests/{v2 => }/test_waku_rendezvous.nim | 2 +- tests/{v2 => }/test_waku_switch.nim | 2 +- tests/{v2 => }/test_wakunode.nim | 12 +- tests/{v2 => }/test_wakunode_filter.nim | 6 +- tests/{v2 => }/test_wakunode_lightpush.nim | 8 +- tests/{v2 => }/testlib/common.nim | 0 tests/{v2 => }/testlib/testutils.nim | 0 tests/{v2 => }/testlib/wakucore.nim | 2 +- tests/{v2 => }/testlib/wakunode.nim | 8 +- .../waku_archive/test_driver_postgres.nim | 6 +- .../test_driver_postgres_query.nim | 6 +- .../waku_archive/test_driver_queue.nim | 8 +- .../waku_archive/test_driver_queue_index.nim | 4 +- .../test_driver_queue_pagination.nim | 8 +- .../waku_archive/test_driver_queue_query.nim | 6 +- .../waku_archive/test_driver_sqlite.nim | 6 +- .../waku_archive/test_driver_sqlite_query.nim | 6 +- .../waku_archive/test_retention_policy.nim | 10 +- .../waku_archive/test_waku_archive.nim | 6 +- .../waku_core/test_message_digest.nim | 2 +- .../waku_core/test_namespaced_topics.nim | 2 +- tests/{v2 => }/waku_core/test_peers.nim | 2 +- tests/{v2 => }/waku_core/test_sharding.nim | 2 +- tests/{v2 => }/waku_core/test_time.nim | 2 +- .../waku_filter_v2/test_waku_filter.nim | 10 +- .../test_waku_filter_protocol.nim | 10 +- .../waku_relay/resources/test_cert.pem | 0 .../waku_relay/resources/test_key.pem | 0 tests/{v2 => }/waku_relay/test_waku_relay.nim | 6 +- .../waku_relay/test_wakunode_relay.nim | 8 +- .../test_rln_group_manager_onchain.nim | 12 +- .../test_rln_group_manager_static.nim | 8 +- .../waku_rln_relay/test_waku_rln_relay.nim | 10 +- .../test_wakunode_rln_relay.nim | 8 +- tests/{v2 => }/waku_rln_relay/utils.nim | 0 tests/{v2 => }/waku_store/test_resume.nim | 8 +- tests/{v2 => }/waku_store/test_rpc_codec.nim | 6 +- tests/{v2 => }/waku_store/test_waku_store.nim | 8 +- .../waku_store/test_wakunode_store.nim | 14 +-- tests/wakunode2/test_app.nim | 4 +- tests/wakunode2/test_validators.nim | 12 +- .../wakunode_jsonrpc/test_jsonrpc_admin.nim | 20 ++-- .../wakunode_jsonrpc/test_jsonrpc_debug.nim | 8 +- .../wakunode_jsonrpc/test_jsonrpc_filter.nim | 18 +-- .../wakunode_jsonrpc/test_jsonrpc_relay.nim | 16 +-- .../wakunode_jsonrpc/test_jsonrpc_store.nim | 24 ++-- .../wakunode_rest/test_rest_debug.nim | 14 +-- .../wakunode_rest/test_rest_debug_serdes.nim | 4 +- .../wakunode_rest/test_rest_filter.nim | 24 ++-- .../wakunode_rest/test_rest_relay.nim | 20 ++-- .../wakunode_rest/test_rest_relay_serdes.nim | 6 +- .../wakunode_rest/test_rest_serdes.nim | 4 +- .../wakunode_rest/test_rest_store.nim | 30 ++--- waku.nimble | 20 ++-- waku/{v2 => }/README.md | 96 ++++------------ waku/{v2 => }/node/builder.nim | 0 waku/{v2 => }/node/config.nim | 2 +- waku/{v2 => }/node/jsonrpc/admin/callsigs.nim | 0 waku/{v2 => }/node/jsonrpc/admin/client.nim | 0 waku/{v2 => }/node/jsonrpc/admin/handlers.nim | 0 waku/{v2 => }/node/jsonrpc/admin/types.nim | 0 waku/{v2 => }/node/jsonrpc/debug/callsigs.nim | 0 waku/{v2 => }/node/jsonrpc/debug/client.nim | 0 waku/{v2 => }/node/jsonrpc/debug/handlers.nim | 0 .../{v2 => }/node/jsonrpc/filter/callsigs.nim | 0 waku/{v2 => }/node/jsonrpc/filter/client.nim | 0 .../{v2 => }/node/jsonrpc/filter/handlers.nim | 0 waku/{v2 => }/node/jsonrpc/hexstrings.nim | 2 +- waku/{v2 => }/node/jsonrpc/marshalling.nim | 0 waku/{v2 => }/node/jsonrpc/message.nim | 2 +- waku/{v2 => }/node/jsonrpc/relay/callsigs.nim | 0 waku/{v2 => }/node/jsonrpc/relay/client.nim | 0 waku/{v2 => }/node/jsonrpc/relay/handlers.nim | 2 +- waku/{v2 => }/node/jsonrpc/store/callsigs.nim | 0 waku/{v2 => }/node/jsonrpc/store/client.nim | 0 waku/{v2 => }/node/jsonrpc/store/handlers.nim | 0 waku/{v2 => }/node/jsonrpc/store/types.nim | 0 waku/{v2 => }/node/message_cache.nim | 0 waku/{v2 => }/node/peer_manager.nim | 0 .../node/peer_manager/peer_manager.nim | 2 +- .../peer_manager/peer_store/migrations.nim | 4 +- .../peer_manager/peer_store/peer_storage.nim | 0 .../peer_store/waku_peer_storage.nim | 4 +- .../node/peer_manager/waku_peer_store.nim | 2 +- waku/{v2 => }/node/rest/client.nim | 0 waku/{v2 => }/node/rest/debug/client.nim | 0 waku/{v2 => }/node/rest/debug/handlers.nim | 0 waku/{v2 => }/node/rest/debug/openapi.yaml | 0 waku/{v2 => }/node/rest/debug/types.nim | 0 waku/{v2 => }/node/rest/filter/client.nim | 0 waku/{v2 => }/node/rest/filter/handlers.nim | 0 waku/{v2 => }/node/rest/filter/openapi.yaml | 0 waku/{v2 => }/node/rest/filter/types.nim | 2 +- waku/{v2 => }/node/rest/relay/client.nim | 0 waku/{v2 => }/node/rest/relay/handlers.nim | 0 waku/{v2 => }/node/rest/relay/openapi.yaml | 0 waku/{v2 => }/node/rest/relay/topic_cache.nim | 0 waku/{v2 => }/node/rest/relay/types.nim | 2 +- waku/{v2 => }/node/rest/responses.nim | 0 waku/{v2 => }/node/rest/serdes.nim | 0 waku/{v2 => }/node/rest/server.nim | 0 waku/{v2 => }/node/rest/store/client.nim | 0 waku/{v2 => }/node/rest/store/handlers.nim | 2 +- waku/{v2 => }/node/rest/store/openapi.yaml | 0 waku/{v2 => }/node/rest/store/types.nim | 4 +- waku/{v2 => }/node/waku_metrics.nim | 0 waku/{v2 => }/node/waku_node.nim | 0 waku/{v2 => }/node/waku_switch.nim | 0 waku/{v2 => }/utils/DEPRECATION_NOTICE.md | 0 waku/{v2 => }/utils/collector.nim | 0 waku/{v2 => }/utils/noise.nim | 0 waku/{v2 => }/utils/requests.nim | 0 waku/v1/README.md | 3 - waku/v2/waku_filter/README.md | 3 - waku/v2/waku_rln_relay/constants.nim | 56 ---------- waku/v2/waku_store/README.md | 3 - waku/waku.nim | 4 +- waku/{v2 => }/waku_archive.nim | 0 waku/{v2 => }/waku_archive/archive.nim | 4 +- .../{v2 => }/waku_archive/archive_metrics.nim | 0 waku/{v2 => }/waku_archive/common.nim | 0 waku/{v2 => }/waku_archive/driver.nim | 0 waku/{v2 => }/waku_archive/driver/builder.nim | 4 +- .../waku_archive/driver/postgres_driver.nim | 0 .../postgres_driver/postgres_driver.nim | 2 +- .../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/cursor.nim | 0 .../driver/sqlite_driver/migrations.nim | 4 +- .../driver/sqlite_driver/queries.nim | 4 +- .../driver/sqlite_driver/sqlite_driver.nim | 2 +- .../waku_archive/retention_policy.nim | 0 .../waku_archive/retention_policy/builder.nim | 0 .../retention_policy_capacity.nim | 0 .../retention_policy_time.nim | 0 waku/{v2 => }/waku_core.nim | 0 waku/{v2 => }/waku_core/message.nim | 0 waku/{v2 => }/waku_core/message/codec.nim | 2 +- waku/{v2 => }/waku_core/message/digest.nim | 0 waku/{v2 => }/waku_core/message/message.nim | 0 waku/{v2 => }/waku_core/peers.nim | 0 waku/{v2 => }/waku_core/time.nim | 0 waku/{v2 => }/waku_core/topics.nim | 0 .../waku_core/topics/content_topic.nim | 0 waku/{v2 => }/waku_core/topics/parsing.nim | 0 .../waku_core/topics/pubsub_topic.nim | 0 waku/{v2 => }/waku_core/topics/sharding.nim | 0 waku/{v2 => }/waku_discv5.nim | 2 +- waku/{v2 => }/waku_dnsdisc.nim | 0 waku/{v2 => }/waku_enr.nim | 2 +- waku/{v2 => }/waku_enr/capabilities.nim | 2 +- waku/{v2 => }/waku_enr/multiaddr.nim | 2 +- waku/{v2 => }/waku_enr/sharding.nim | 2 +- waku/{v2 => }/waku_filter.nim | 20 ++-- waku/waku_filter/README.md | 3 + waku/{v2 => }/waku_filter/client.nim | 0 waku/{v2 => }/waku_filter/protocol.nim | 0 .../{v2 => }/waku_filter/protocol_metrics.nim | 0 waku/{v2 => }/waku_filter/rpc.nim | 0 waku/{v2 => }/waku_filter/rpc_codec.nim | 2 +- waku/{v2 => }/waku_filter_v2.nim | 0 waku/{v2 => }/waku_filter_v2/client.nim | 0 waku/{v2 => }/waku_filter_v2/common.nim | 0 waku/{v2 => }/waku_filter_v2/protocol.nim | 0 .../waku_filter_v2/protocol_metrics.nim | 0 waku/{v2 => }/waku_filter_v2/rpc.nim | 0 waku/{v2 => }/waku_filter_v2/rpc_codec.nim | 2 +- .../{v2 => }/waku_filter_v2/subscriptions.nim | 0 waku/{v2 => }/waku_keystore.nim | 0 .../waku_keystore/conversion_utils.nim | 0 waku/{v2 => }/waku_keystore/keyfile.nim | 0 waku/{v2 => }/waku_keystore/keystore.nim | 0 .../{v2 => }/waku_keystore/protocol_types.nim | 0 waku/{v2 => }/waku_keystore/utils.nim | 0 waku/{v2 => }/waku_lightpush.nim | 0 waku/{v2 => }/waku_lightpush/README.md | 0 waku/{v2 => }/waku_lightpush/client.nim | 0 waku/{v2 => }/waku_lightpush/protocol.nim | 0 .../waku_lightpush/protocol_metrics.nim | 0 waku/{v2 => }/waku_lightpush/rpc.nim | 0 waku/{v2 => }/waku_lightpush/rpc_codec.nim | 2 +- waku/{v2 => }/waku_node.nim | 0 waku/{v2 => }/waku_noise/noise.nim | 0 .../waku_noise/noise_handshake_processing.nim | 0 waku/{v2 => }/waku_noise/noise_types.nim | 0 waku/{v2 => }/waku_noise/noise_utils.nim | 0 waku/{v2 => }/waku_peer_exchange.nim | 0 waku/{v2 => }/waku_peer_exchange/README.md | 0 waku/{v2 => }/waku_peer_exchange/protocol.nim | 2 +- waku/{v2 => }/waku_peer_exchange/rpc.nim | 0 .../{v2 => }/waku_peer_exchange/rpc_codec.nim | 2 +- waku/{v2 => }/waku_relay.nim | 0 waku/{v2 => }/waku_relay/message_id.nim | 0 waku/{v2 => }/waku_relay/protocol.nim | 0 waku/{v2 => }/waku_rln_relay.nim | 0 waku/{v2 => }/waku_rln_relay/contract.nim | 0 .../waku_rln_relay/conversion_utils.nim | 0 .../{v2 => }/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 .../waku_rln_relay/group_manager/static.nim | 0 .../group_manager/static/group_manager.nim | 0 .../waku_rln_relay/protocol_metrics.nim | 0 .../waku_rln_relay/protocol_types.nim | 2 +- waku/{v2 => }/waku_rln_relay/rln.nim | 0 .../waku_rln_relay/rln/rln_interface.nim | 0 waku/{v2 => }/waku_rln_relay/rln/wrappers.nim | 0 waku/{v2 => }/waku_rln_relay/rln_relay.nim | 0 waku/{v2 => }/waku_store.nim | 0 waku/waku_store/README.md | 3 + waku/{v2 => }/waku_store/client.nim | 0 waku/{v2 => }/waku_store/common.nim | 0 waku/{v2 => }/waku_store/protocol.nim | 0 waku/{v2 => }/waku_store/protocol_metrics.nim | 0 waku/{v2 => }/waku_store/rpc.nim | 0 waku/{v2 => }/waku_store/rpc_codec.nim | 2 +- 272 files changed, 613 insertions(+), 731 deletions(-) rename docs/api/{v2 => }/node.md (100%) rename docs/api/{v2 => }/rest-api.md (100%) rename examples/{v2 => }/README.md (87%) rename examples/{v2 => }/filter_subscriber.nim (96%) rename examples/{v2 => }/lightpush_publisher.nim (94%) rename examples/{v2 => }/nim.cfg (100%) rename examples/{v2 => }/publisher.nim (96%) rename examples/{v2 => }/subscriber.nim (95%) delete mode 100644 tests/all_tests_v2.nim create mode 100644 tests/all_tests_waku.nim rename tests/{v2 => }/test_message_cache.nim (98%) rename tests/{v2 => }/test_peer_exchange.nim (97%) rename tests/{v2 => }/test_peer_manager.nim (99%) rename tests/{v2 => }/test_peer_storage.nim (97%) rename tests/{v2 => }/test_peer_store_extended.nim (98%) rename tests/{v2 => }/test_utils_compat.nim (94%) rename tests/{v2 => }/test_waku_discv5.nim (99%) rename tests/{v2 => }/test_waku_dnsdisc.nim (97%) rename tests/{v2 => }/test_waku_enr.nim (99%) rename tests/{v2 => }/test_waku_filter.nim (98%) rename tests/{v2 => }/test_waku_keepalive.nim (96%) rename tests/{v2 => }/test_waku_keystore.nim (98%) rename tests/{v2 => }/test_waku_keystore_keyfile.nim (99%) rename tests/{v2 => }/test_waku_lightpush.nim (95%) rename tests/{v2 => }/test_waku_noise.nim (99%) rename tests/{v2 => }/test_waku_noise_sessions.nim (98%) rename tests/{v2 => }/test_waku_peer_exchange.nim (97%) rename tests/{v2 => }/test_waku_rendezvous.nim (98%) rename tests/{v2 => }/test_waku_switch.nim (98%) rename tests/{v2 => }/test_wakunode.nim (98%) rename tests/{v2 => }/test_wakunode_filter.nim (95%) rename tests/{v2 => }/test_wakunode_lightpush.nim (93%) rename tests/{v2 => }/testlib/common.nim (100%) rename tests/{v2 => }/testlib/testutils.nim (100%) rename tests/{v2 => }/testlib/wakucore.nim (98%) rename tests/{v2 => }/testlib/wakunode.nim (95%) rename tests/{v2 => }/waku_archive/test_driver_postgres.nim (98%) rename tests/{v2 => }/waku_archive/test_driver_postgres_query.nim (99%) rename tests/{v2 => }/waku_archive/test_driver_queue.nim (95%) rename tests/{v2 => }/waku_archive/test_driver_queue_index.nim (98%) rename tests/{v2 => }/waku_archive/test_driver_queue_pagination.nim (98%) rename tests/{v2 => }/waku_archive/test_driver_queue_query.nim (99%) rename tests/{v2 => }/waku_archive/test_driver_sqlite.nim (92%) rename tests/{v2 => }/waku_archive/test_driver_sqlite_query.nim (99%) rename tests/{v2 => }/waku_archive/test_retention_policy.nim (91%) rename tests/{v2 => }/waku_archive/test_waku_archive.nim (99%) rename tests/{v2 => }/waku_core/test_message_digest.nim (99%) rename tests/{v2 => }/waku_core/test_namespaced_topics.nim (99%) rename tests/{v2 => }/waku_core/test_peers.nim (99%) rename tests/{v2 => }/waku_core/test_sharding.nim (99%) rename tests/{v2 => }/waku_core/test_time.nim (97%) rename tests/{v2 => }/waku_filter_v2/test_waku_filter.nim (98%) rename tests/{v2 => }/waku_filter_v2/test_waku_filter_protocol.nim (98%) rename tests/{v2 => }/waku_relay/resources/test_cert.pem (100%) rename tests/{v2 => }/waku_relay/resources/test_key.pem (100%) rename tests/{v2 => }/waku_relay/test_waku_relay.nim (98%) rename tests/{v2 => }/waku_relay/test_wakunode_relay.nim (99%) rename tests/{v2 => }/waku_rln_relay/test_rln_group_manager_onchain.nim (98%) rename tests/{v2 => }/waku_rln_relay/test_rln_group_manager_static.nim (96%) rename tests/{v2 => }/waku_rln_relay/test_waku_rln_relay.nim (99%) rename tests/{v2 => }/waku_rln_relay/test_wakunode_rln_relay.nim (98%) rename tests/{v2 => }/waku_rln_relay/utils.nim (100%) rename tests/{v2 => }/waku_store/test_resume.nim (98%) rename tests/{v2 => }/waku_store/test_rpc_codec.nim (97%) rename tests/{v2 => }/waku_store/test_waku_store.nim (95%) rename tests/{v2 => }/waku_store/test_wakunode_store.nim (96%) rename tests/{v2 => }/wakunode_jsonrpc/test_jsonrpc_admin.nim (93%) rename tests/{v2 => }/wakunode_jsonrpc/test_jsonrpc_debug.nim (85%) rename tests/{v2 => }/wakunode_jsonrpc/test_jsonrpc_filter.nim (85%) rename tests/{v2 => }/wakunode_jsonrpc/test_jsonrpc_relay.nim (94%) rename tests/{v2 => }/wakunode_jsonrpc/test_jsonrpc_store.nim (92%) rename tests/{v2 => }/wakunode_rest/test_rest_debug.nim (85%) rename tests/{v2 => }/wakunode_rest/test_rest_debug_serdes.nim (92%) rename tests/{v2 => }/wakunode_rest/test_rest_filter.nim (92%) rename tests/{v2 => }/wakunode_rest/test_rest_relay.nim (94%) rename tests/{v2 => }/wakunode_rest/test_rest_relay_serdes.nim (92%) rename tests/{v2 => }/wakunode_rest/test_rest_serdes.nim (96%) rename tests/{v2 => }/wakunode_rest/test_rest_store.nim (96%) rename waku/{v2 => }/README.md (71%) rename waku/{v2 => }/node/builder.nim (100%) rename waku/{v2 => }/node/config.nim (99%) rename waku/{v2 => }/node/jsonrpc/admin/callsigs.nim (100%) rename waku/{v2 => }/node/jsonrpc/admin/client.nim (100%) rename waku/{v2 => }/node/jsonrpc/admin/handlers.nim (100%) rename waku/{v2 => }/node/jsonrpc/admin/types.nim (100%) rename waku/{v2 => }/node/jsonrpc/debug/callsigs.nim (100%) rename waku/{v2 => }/node/jsonrpc/debug/client.nim (100%) rename waku/{v2 => }/node/jsonrpc/debug/handlers.nim (100%) rename waku/{v2 => }/node/jsonrpc/filter/callsigs.nim (100%) rename waku/{v2 => }/node/jsonrpc/filter/client.nim (100%) rename waku/{v2 => }/node/jsonrpc/filter/handlers.nim (100%) rename waku/{v2 => }/node/jsonrpc/hexstrings.nim (69%) rename waku/{v2 => }/node/jsonrpc/marshalling.nim (100%) rename waku/{v2 => }/node/jsonrpc/message.nim (97%) rename waku/{v2 => }/node/jsonrpc/relay/callsigs.nim (100%) rename waku/{v2 => }/node/jsonrpc/relay/client.nim (100%) rename waku/{v2 => }/node/jsonrpc/relay/handlers.nim (99%) rename waku/{v2 => }/node/jsonrpc/store/callsigs.nim (100%) rename waku/{v2 => }/node/jsonrpc/store/client.nim (100%) rename waku/{v2 => }/node/jsonrpc/store/handlers.nim (100%) rename waku/{v2 => }/node/jsonrpc/store/types.nim (100%) rename waku/{v2 => }/node/message_cache.nim (100%) rename waku/{v2 => }/node/peer_manager.nim (100%) rename waku/{v2 => }/node/peer_manager/peer_manager.nim (99%) rename waku/{v2 => }/node/peer_manager/peer_store/migrations.nim (94%) rename waku/{v2 => }/node/peer_manager/peer_store/peer_storage.nim (100%) rename waku/{v2 => }/node/peer_manager/peer_store/waku_peer_storage.nim (98%) rename waku/{v2 => }/node/peer_manager/waku_peer_store.nim (99%) rename waku/{v2 => }/node/rest/client.nim (100%) rename waku/{v2 => }/node/rest/debug/client.nim (100%) rename waku/{v2 => }/node/rest/debug/handlers.nim (100%) rename waku/{v2 => }/node/rest/debug/openapi.yaml (100%) rename waku/{v2 => }/node/rest/debug/types.nim (100%) rename waku/{v2 => }/node/rest/filter/client.nim (100%) rename waku/{v2 => }/node/rest/filter/handlers.nim (100%) rename waku/{v2 => }/node/rest/filter/openapi.yaml (100%) rename waku/{v2 => }/node/rest/filter/types.nim (99%) rename waku/{v2 => }/node/rest/relay/client.nim (100%) rename waku/{v2 => }/node/rest/relay/handlers.nim (100%) rename waku/{v2 => }/node/rest/relay/openapi.yaml (100%) rename waku/{v2 => }/node/rest/relay/topic_cache.nim (100%) rename waku/{v2 => }/node/rest/relay/types.nim (99%) rename waku/{v2 => }/node/rest/responses.nim (100%) rename waku/{v2 => }/node/rest/serdes.nim (100%) rename waku/{v2 => }/node/rest/server.nim (100%) rename waku/{v2 => }/node/rest/store/client.nim (100%) rename waku/{v2 => }/node/rest/store/handlers.nim (99%) rename waku/{v2 => }/node/rest/store/openapi.yaml (100%) rename waku/{v2 => }/node/rest/store/types.nim (99%) rename waku/{v2 => }/node/waku_metrics.nim (100%) rename waku/{v2 => }/node/waku_node.nim (100%) rename waku/{v2 => }/node/waku_switch.nim (100%) rename waku/{v2 => }/utils/DEPRECATION_NOTICE.md (100%) rename waku/{v2 => }/utils/collector.nim (100%) rename waku/{v2 => }/utils/noise.nim (100%) rename waku/{v2 => }/utils/requests.nim (100%) delete mode 100644 waku/v1/README.md delete mode 100644 waku/v2/waku_filter/README.md delete mode 100644 waku/v2/waku_rln_relay/constants.nim delete mode 100644 waku/v2/waku_store/README.md rename waku/{v2 => }/waku_archive.nim (100%) rename waku/{v2 => }/waku_archive/archive.nim (99%) rename waku/{v2 => }/waku_archive/archive_metrics.nim (100%) rename waku/{v2 => }/waku_archive/common.nim (100%) rename waku/{v2 => }/waku_archive/driver.nim (100%) rename waku/{v2 => }/waku_archive/driver/builder.nim (97%) rename waku/{v2 => }/waku_archive/driver/postgres_driver.nim (100%) rename waku/{v2 => }/waku_archive/driver/postgres_driver/postgres_driver.nim (99%) rename waku/{v2 => }/waku_archive/driver/queue_driver.nim (100%) rename waku/{v2 => }/waku_archive/driver/queue_driver/index.nim (100%) rename waku/{v2 => }/waku_archive/driver/queue_driver/queue_driver.nim (100%) rename waku/{v2 => }/waku_archive/driver/sqlite_driver.nim (100%) rename waku/{v2 => }/waku_archive/driver/sqlite_driver/cursor.nim (100%) rename waku/{v2 => }/waku_archive/driver/sqlite_driver/migrations.nim (94%) rename waku/{v2 => }/waku_archive/driver/sqlite_driver/queries.nim (99%) rename waku/{v2 => }/waku_archive/driver/sqlite_driver/sqlite_driver.nim (99%) rename waku/{v2 => }/waku_archive/retention_policy.nim (100%) rename waku/{v2 => }/waku_archive/retention_policy/builder.nim (100%) rename waku/{v2 => }/waku_archive/retention_policy/retention_policy_capacity.nim (100%) rename waku/{v2 => }/waku_archive/retention_policy/retention_policy_time.nim (100%) rename waku/{v2 => }/waku_core.nim (100%) rename waku/{v2 => }/waku_core/message.nim (100%) rename waku/{v2 => }/waku_core/message/codec.nim (98%) rename waku/{v2 => }/waku_core/message/digest.nim (100%) rename waku/{v2 => }/waku_core/message/message.nim (100%) rename waku/{v2 => }/waku_core/peers.nim (100%) rename waku/{v2 => }/waku_core/time.nim (100%) rename waku/{v2 => }/waku_core/topics.nim (100%) rename waku/{v2 => }/waku_core/topics/content_topic.nim (100%) rename waku/{v2 => }/waku_core/topics/parsing.nim (100%) rename waku/{v2 => }/waku_core/topics/pubsub_topic.nim (100%) rename waku/{v2 => }/waku_core/topics/sharding.nim (100%) rename waku/{v2 => }/waku_discv5.nim (99%) rename waku/{v2 => }/waku_dnsdisc.nim (100%) rename waku/{v2 => }/waku_enr.nim (88%) rename waku/{v2 => }/waku_enr/capabilities.nim (99%) rename waku/{v2 => }/waku_enr/multiaddr.nim (99%) rename waku/{v2 => }/waku_enr/sharding.nim (99%) rename waku/{v2 => }/waku_filter.nim (93%) create mode 100644 waku/waku_filter/README.md rename waku/{v2 => }/waku_filter/client.nim (100%) rename waku/{v2 => }/waku_filter/protocol.nim (100%) rename waku/{v2 => }/waku_filter/protocol_metrics.nim (100%) rename waku/{v2 => }/waku_filter/rpc.nim (100%) rename waku/{v2 => }/waku_filter/rpc_codec.nim (99%) rename waku/{v2 => }/waku_filter_v2.nim (100%) rename waku/{v2 => }/waku_filter_v2/client.nim (100%) rename waku/{v2 => }/waku_filter_v2/common.nim (100%) rename waku/{v2 => }/waku_filter_v2/protocol.nim (100%) rename waku/{v2 => }/waku_filter_v2/protocol_metrics.nim (100%) rename waku/{v2 => }/waku_filter_v2/rpc.nim (100%) rename waku/{v2 => }/waku_filter_v2/rpc_codec.nim (99%) rename waku/{v2 => }/waku_filter_v2/subscriptions.nim (100%) rename waku/{v2 => }/waku_keystore.nim (100%) rename waku/{v2 => }/waku_keystore/conversion_utils.nim (100%) rename waku/{v2 => }/waku_keystore/keyfile.nim (100%) rename waku/{v2 => }/waku_keystore/keystore.nim (100%) rename waku/{v2 => }/waku_keystore/protocol_types.nim (100%) rename waku/{v2 => }/waku_keystore/utils.nim (100%) rename waku/{v2 => }/waku_lightpush.nim (100%) rename waku/{v2 => }/waku_lightpush/README.md (100%) rename waku/{v2 => }/waku_lightpush/client.nim (100%) rename waku/{v2 => }/waku_lightpush/protocol.nim (100%) rename waku/{v2 => }/waku_lightpush/protocol_metrics.nim (100%) rename waku/{v2 => }/waku_lightpush/rpc.nim (100%) rename waku/{v2 => }/waku_lightpush/rpc_codec.nim (98%) rename waku/{v2 => }/waku_node.nim (100%) rename waku/{v2 => }/waku_noise/noise.nim (100%) rename waku/{v2 => }/waku_noise/noise_handshake_processing.nim (100%) rename waku/{v2 => }/waku_noise/noise_types.nim (100%) rename waku/{v2 => }/waku_noise/noise_utils.nim (100%) rename waku/{v2 => }/waku_peer_exchange.nim (100%) rename waku/{v2 => }/waku_peer_exchange/README.md (100%) rename waku/{v2 => }/waku_peer_exchange/protocol.nim (99%) rename waku/{v2 => }/waku_peer_exchange/rpc.nim (100%) rename waku/{v2 => }/waku_peer_exchange/rpc_codec.nim (98%) rename waku/{v2 => }/waku_relay.nim (100%) rename waku/{v2 => }/waku_relay/message_id.nim (100%) rename waku/{v2 => }/waku_relay/protocol.nim (100%) rename waku/{v2 => }/waku_rln_relay.nim (100%) rename waku/{v2 => }/waku_rln_relay/contract.nim (100%) rename waku/{v2 => }/waku_rln_relay/conversion_utils.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager/group_manager_base.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager/on_chain.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager/on_chain/group_manager.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager/static.nim (100%) rename waku/{v2 => }/waku_rln_relay/group_manager/static/group_manager.nim (100%) rename waku/{v2 => }/waku_rln_relay/protocol_metrics.nim (100%) rename waku/{v2 => }/waku_rln_relay/protocol_types.nim (99%) rename waku/{v2 => }/waku_rln_relay/rln.nim (100%) rename waku/{v2 => }/waku_rln_relay/rln/rln_interface.nim (100%) rename waku/{v2 => }/waku_rln_relay/rln/wrappers.nim (100%) rename waku/{v2 => }/waku_rln_relay/rln_relay.nim (100%) rename waku/{v2 => }/waku_store.nim (100%) create mode 100644 waku/waku_store/README.md rename waku/{v2 => }/waku_store/client.nim (100%) rename waku/{v2 => }/waku_store/common.nim (100%) rename waku/{v2 => }/waku_store/protocol.nim (100%) rename waku/{v2 => }/waku_store/protocol_metrics.nim (100%) rename waku/{v2 => }/waku_store/rpc.nim (100%) rename waku/{v2 => }/waku_store/rpc_codec.nim (99%) diff --git a/.github/workflows/ci-experimental.yml b/.github/workflows/ci-experimental.yml index 3159dd90e..cf64d12f4 100644 --- a/.github/workflows/ci-experimental.yml +++ b/.github/workflows/ci-experimental.yml @@ -36,18 +36,17 @@ jobs: - 'waku.nimble' v2: - - 'waku/common/**' - - 'waku/v2/**' + - 'waku/**' - 'apps/**' - 'tools/**' - - 'tests/all_tests_v2.nim' - - 'tests/v2/**' + - 'tests/all_tests_waku.nim' + - 'tests/**' outputs: common: ${{ steps.filter.outputs.common }} v2: ${{ steps.filter.outputs.v2 }} - build-v2: + build: needs: changes if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} strategy: @@ -56,7 +55,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 - name: build-v2-${{ matrix.os }} + name: build-${{ matrix.os }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -75,9 +74,9 @@ jobs: key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} - name: Build binaries - run: make V=1 QUICK_AND_DIRTY_COMPILER=1 v2 + run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all - test-v2: + test: needs: changes if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} strategy: @@ -86,7 +85,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 - name: test-v2-${{ matrix.os }} + name: test-${{ matrix.os }} steps: - name: Checkout code @@ -116,4 +115,4 @@ jobs: sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:9.6-alpine fi - make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test2 testwakunode2 + make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test testwakunode2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c956f0aff..cf17fef20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,18 +35,17 @@ jobs: - 'waku.nimble' v2: - - 'waku/common/**' - - 'waku/v2/**' + - 'waku/**' - 'apps/**' - 'tools/**' - 'tests/all_tests_v2.nim' - - 'tests/v2/**' + - 'tests/**' outputs: common: ${{ steps.filter.outputs.common }} v2: ${{ steps.filter.outputs.v2 }} - build-v2: + build: needs: changes if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} strategy: @@ -55,7 +54,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 - name: build-v2-${{ matrix.os }} + name: build-${{ matrix.os }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -74,9 +73,9 @@ jobs: key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} - name: Build binaries - run: make V=1 QUICK_AND_DIRTY_COMPILER=1 v2 tools + run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all tools - test-v2: + test: needs: changes if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} strategy: @@ -85,7 +84,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 - name: test-v2-${{ matrix.os }} + name: test-${{ matrix.os }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -114,7 +113,7 @@ jobs: sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:9.6-alpine fi - make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test2 testwakunode2 + make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 test testwakunode2 build-docker-image: needs: changes @@ -125,7 +124,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 - name: docker-build-v2-${{ matrix.os }} + name: docker-build-${{ matrix.os }} steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 707fe5206..fea18e1c2 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -61,11 +61,9 @@ jobs: chat2\ tools - make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" \ - wakunode1 - tar -cvzf ${{steps.vars.outputs.nwaku}} ./build/wakunode1 ./build/wakunode2 ./build/chat2 + tar -cvzf ${{steps.vars.outputs.nwaku}} ./build/wakunode2 ./build/chat2 tar -cvzf ${{steps.vars.outputs.nwakutools}} ./build/wakucanary ./build/networkmonitor - name: upload artifacts diff --git a/Dockerfile b/Dockerfile index 1c5553f40..c0c264a54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ ARG MAKE_TARGET=wakunode2 LABEL maintainer="jakub@status.im" LABEL source="https://github.com/waku-org/nwaku" -LABEL description="Wakunode: Waku and Whisper client" +LABEL description="Wakunode: Waku client" LABEL commit="unknown" # DevP2P, LibP2P, and JSON RPC ports diff --git a/Makefile b/Makefile index c6901b807..5f46821f0 100644 --- a/Makefile +++ b/Makefile @@ -32,15 +32,12 @@ else # "variables.mk" was included. Business as usual until the end of this file ########## ## Main ## ########## -.PHONY: all test update clean v2 test2 +.PHONY: all test update clean # default target, because it's the first one that doesn't start with '.' -all: | v2 +all: | wakunode2 example2 chat2 chat2bridge -test: | test2 -test2: | testcommon testwaku2 - -v2: | wakunode2 example2 chat2 chat2bridge +test: | testcommon testwaku waku.nims: ln -s waku.nimble $@ @@ -162,14 +159,14 @@ testcommon: | build deps $(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims -############# -## Waku v2 ## -############# -.PHONY: testwaku2 wakunode2 testwakunode2 example2 chat2 chat2bridge +########## +## Waku ## +########## +.PHONY: testwaku wakunode2 testwakunode2 example2 chat2 chat2bridge -testwaku2: | build deps librln +testwaku: | build deps librln echo -e $(BUILD_MSG) "build/$@" && \ - $(ENV_SCRIPT) nim test2 -d:os=$(shell uname) $(NIM_PARAMS) $(EXPERIMENTAL_PARAMS) waku.nims + $(ENV_SCRIPT) nim test -d:os=$(shell uname) $(NIM_PARAMS) $(EXPERIMENTAL_PARAMS) waku.nims wakunode2: | build deps librln echo -e $(BUILD_MSG) "build/$@" && \ @@ -192,9 +189,9 @@ chat2bridge: | build deps $(ENV_SCRIPT) nim chat2bridge $(NIM_PARAMS) waku.nims -################### -## Waku v2 tools ## -################### +################ +## Waku tools ## +################ .PHONY: tools wakucanary networkmonitor tools: networkmonitor wakucanary diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim index afdff154c..5ee69783e 100644 --- a/apps/chat2/chat2.nim +++ b/apps/chat2/chat2.nim @@ -25,15 +25,15 @@ import libp2p/[switch, # manage transports, a single entry poi protocols/secure/secio, # define the protocol of secure input / output, allows encrypted communication that uses public keys to validate signed messages instead of a certificate authority like in TLS nameresolving/dnsresolver]# define DNS resolution import - ../../waku/v2/waku_core, - ../../waku/v2/waku_lightpush, - ../../waku/v2/waku_lightpush/rpc, - ../../waku/v2/waku_filter, - ../../waku/v2/waku_store, - ../../waku/v2/waku_dnsdisc, - ../../waku/v2/waku_node, - ../../waku/v2/node/waku_metrics, - ../../waku/v2/node/peer_manager, + ../../waku/waku_core, + ../../waku/waku_lightpush, + ../../waku/waku_lightpush/rpc, + ../../waku/waku_filter, + ../../waku/waku_store, + ../../waku/waku_dnsdisc, + ../../waku/waku_node, + ../../waku/node/waku_metrics, + ../../waku/node/peer_manager, ../../waku/common/utils/nat, ./config_chat2 @@ -42,7 +42,7 @@ when defined(rln): libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub import - ../../waku/v2/waku_rln_relay + ../../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 4ecf73940..ade32418e 100644 --- a/apps/chat2/config_chat2.nim +++ b/apps/chat2/config_chat2.nim @@ -7,7 +7,7 @@ import nimcrypto/utils, eth/keys import - ../../../waku/v2/waku_core + ../../../waku/waku_core type Fleet* = enum diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index cfa2716a0..4c9f8ba48 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -14,11 +14,11 @@ import # Waku v2 imports libp2p/crypto/crypto, libp2p/errors, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/peer_manager, - ../../waku/v2/waku_filter, - ../../waku/v2/waku_store, + ../../../waku/waku_core, + ../../../waku/waku_node, + ../../../waku/node/peer_manager, + ../../waku/waku_filter, + ../../waku/waku_store, # Chat 2 imports ../chat2/chat2, # Common cli config @@ -216,11 +216,11 @@ proc stop*(cmb: Chat2MatterBridge) {.async.} = when isMainModule: import ../../../waku/common/utils/nat, - ../../waku/v2/node/message_cache, - ../../waku/v2/node/jsonrpc/debug/handlers as debug_api, - ../../waku/v2/node/jsonrpc/filter/handlers as filter_api, - ../../waku/v2/node/jsonrpc/relay/handlers as relay_api, - ../../waku/v2/node/jsonrpc/store/handlers as store_api + ../../waku/node/message_cache, + ../../waku/node/jsonrpc/debug/handlers as debug_api, + ../../waku/node/jsonrpc/filter/handlers as filter_api, + ../../waku/node/jsonrpc/relay/handlers as relay_api, + ../../waku/node/jsonrpc/store/handlers as store_api proc startV2Rpc(node: WakuNode, rpcServer: RpcHttpServer, conf: Chat2MatterbridgeConf) {.raises: [Exception].} = diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim index 3c92400ee..ccd223c9e 100644 --- a/apps/networkmonitor/networkmonitor.nim +++ b/apps/networkmonitor/networkmonitor.nim @@ -20,12 +20,12 @@ import metrics/chronos_httpserver, presto/[route, server, client] import - ../../waku/v2/waku_core, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, - ../../waku/v2/waku_enr, - ../../waku/v2/waku_discv5, - ../../waku/v2/waku_dnsdisc, + ../../waku/waku_core, + ../../waku/node/peer_manager, + ../../waku/waku_node, + ../../waku/waku_enr, + ../../waku/waku_discv5, + ../../waku/waku_dnsdisc, ./networkmonitor_metrics, ./networkmonitor_config, ./networkmonitor_utils diff --git a/apps/wakucanary/wakucanary.nim b/apps/wakucanary/wakucanary.nim index 8b1a51e39..9c860ca8c 100644 --- a/apps/wakucanary/wakucanary.nim +++ b/apps/wakucanary/wakucanary.nim @@ -10,10 +10,10 @@ import libp2p/nameresolving/dnsresolver, libp2p/multicodec import - ../../waku/v2/waku_enr, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_core, - ../../waku/v2/waku_node + ../../waku/waku_enr, + ../../waku/node/peer_manager, + ../../waku/waku_core, + ../../waku/waku_node # protocols and their tag const ProtocolsTable = { diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim index 524e13d14..c50a63ed8 100644 --- a/apps/wakunode2/app.nim +++ b/apps/wakunode2/app.nim @@ -20,41 +20,41 @@ import import ../../waku/common/utils/nat, ../../waku/common/databases/db_sqlite, - ../../waku/v2/waku_archive/driver/builder, - ../../waku/v2/waku_archive/retention_policy/builder, - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, - ../../waku/v2/node/waku_metrics, - ../../waku/v2/node/peer_manager, - ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, - ../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations, - ../../waku/v2/waku_archive, - ../../waku/v2/waku_dnsdisc, - ../../waku/v2/waku_enr, - ../../waku/v2/waku_discv5, - ../../waku/v2/waku_peer_exchange, - ../../waku/v2/waku_store, - ../../waku/v2/waku_lightpush, - ../../waku/v2/waku_filter, + ../../waku/waku_archive/driver/builder, + ../../waku/waku_archive/retention_policy/builder, + ../../waku/waku_core, + ../../waku/waku_node, + ../../waku/node/waku_metrics, + ../../waku/node/peer_manager, + ../../waku/node/peer_manager/peer_store/waku_peer_storage, + ../../waku/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations, + ../../waku/waku_archive, + ../../waku/waku_dnsdisc, + ../../waku/waku_enr, + ../../waku/waku_discv5, + ../../waku/waku_peer_exchange, + ../../waku/waku_store, + ../../waku/waku_lightpush, + ../../waku/waku_filter, ./wakunode2_validator_signed, ./internal_config, ./external_config import - ../../waku/v2/node/message_cache, - ../../waku/v2/node/rest/server, - ../../waku/v2/node/rest/debug/handlers as rest_debug_api, - ../../waku/v2/node/rest/relay/handlers as rest_relay_api, - ../../waku/v2/node/rest/relay/topic_cache, - ../../waku/v2/node/rest/filter/handlers as rest_filter_api, - ../../waku/v2/node/rest/store/handlers as rest_store_api, - ../../waku/v2/node/jsonrpc/admin/handlers as rpc_admin_api, - ../../waku/v2/node/jsonrpc/debug/handlers as rpc_debug_api, - ../../waku/v2/node/jsonrpc/filter/handlers as rpc_filter_api, - ../../waku/v2/node/jsonrpc/relay/handlers as rpc_relay_api, - ../../waku/v2/node/jsonrpc/store/handlers as rpc_store_api + ../../waku/node/message_cache, + ../../waku/node/rest/server, + ../../waku/node/rest/debug/handlers as rest_debug_api, + ../../waku/node/rest/relay/handlers as rest_relay_api, + ../../waku/node/rest/relay/topic_cache, + ../../waku/node/rest/filter/handlers as rest_filter_api, + ../../waku/node/rest/store/handlers as rest_store_api, + ../../waku/node/jsonrpc/admin/handlers as rpc_admin_api, + ../../waku/node/jsonrpc/debug/handlers as rpc_debug_api, + ../../waku/node/jsonrpc/filter/handlers as rpc_filter_api, + ../../waku/node/jsonrpc/relay/handlers as rpc_relay_api, + ../../waku/node/jsonrpc/store/handlers as rpc_store_api when defined(rln): - import ../../waku/v2/waku_rln_relay + import ../../waku/waku_rln_relay logScope: topics = "wakunode app" diff --git a/apps/wakunode2/external_config.nim b/apps/wakunode2/external_config.nim index bfc813cf1..18a083908 100644 --- a/apps/wakunode2/external_config.nim +++ b/apps/wakunode2/external_config.nim @@ -17,7 +17,7 @@ import ../../waku/common/confutils/envvar/defs as confEnvvarDefs, ../../waku/common/confutils/envvar/std/net as confEnvvarNet, ../../waku/common/logging, - ../../waku/v2/waku_enr + ../../waku/waku_enr export confTomlDefs, diff --git a/apps/wakunode2/internal_config.nim b/apps/wakunode2/internal_config.nim index ce58cc9a2..6da34c7c4 100644 --- a/apps/wakunode2/internal_config.nim +++ b/apps/wakunode2/internal_config.nim @@ -6,8 +6,8 @@ import libp2p/multiaddress import ../../waku/common/utils/nat, - ../../waku/v2/node/config, - ../../waku/v2/waku_enr/capabilities, + ../../waku/node/config, + ../../waku/waku_enr/capabilities, ./external_config proc validateExtMultiAddrs*(vals: seq[string]): diff --git a/apps/wakunode2/wakunode2_validator_signed.nim b/apps/wakunode2/wakunode2_validator_signed.nim index 0ce9c4bc7..99b799ea7 100644 --- a/apps/wakunode2/wakunode2_validator_signed.nim +++ b/apps/wakunode2/wakunode2_validator_signed.nim @@ -19,8 +19,8 @@ import const MessageWindowInSec = 5*60 # +- 5 minutes import - ../../waku/v2/waku_relay/protocol, - ../../waku/v2/waku_core + ../../waku/waku_relay/protocol, + ../../waku/waku_core declarePublicCounter waku_msg_validator_signed_outcome, "number of messages for each validation outcome", ["result"] diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs index f574646a4..e775f96b9 100644 --- a/ci/Jenkinsfile.prs +++ b/ci/Jenkinsfile.prs @@ -66,7 +66,7 @@ pipeline { stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} v2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} all") } } } } @@ -77,7 +77,7 @@ pipeline { stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} test2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} EXPERIMENTAL=${params.EXPERIMENTAL} test") } } } } diff --git a/docs/api/v2/node.md b/docs/api/node.md similarity index 100% rename from docs/api/v2/node.md rename to docs/api/node.md diff --git a/docs/api/v2/rest-api.md b/docs/api/rest-api.md similarity index 100% rename from docs/api/v2/rest-api.md rename to docs/api/rest-api.md diff --git a/docs/tutorial/chat2.md b/docs/tutorial/chat2.md index e8224a1fb..d0e8383d4 100644 --- a/docs/tutorial/chat2.md +++ b/docs/tutorial/chat2.md @@ -2,7 +2,7 @@ ## Background -The `chat2` application is a basic command-line chat app using the [Waku v2 suite of protocols](https://specs.vac.dev/specs/waku/v2/waku-v2). +The `chat2` application is a basic command-line chat app using the [Waku v2 suite of protocols](https://rfc.vac.dev/). It optionally connects to a [fleet of nodes](fleets.status.im) to provide end-to-end p2p chat capabilities. Each fleet is a publicly accessible network of Waku v2 peers, providing a bootstrap connection point for new peers, historical message storage, etc. The Waku team is currently using this application on the _production_ fleet for internal testing. @@ -56,7 +56,7 @@ quitting... ## Retrieving historical messages -The `chat2` application can retrieve historical chat messages from a node supporting and running the [Waku v2 store protocol](https://specs.vac.dev/specs/waku/v2/waku-store), and will attempt to do so by default. +The `chat2` application can retrieve historical chat messages from a node supporting and running the [Waku v2 store protocol](https://rfc.vac.dev/spec/13/), and will attempt to do so by default. It's possible to query a *specific* store node by configuring its `multiaddr` as `storenode` when starting the app: ``` @@ -77,7 +77,7 @@ To disable historical message retrieval, use the `--store:false` option: ## Specifying a static peer -In order to connect to a *specific* node as [`relay`](https://specs.vac.dev/specs/waku/v2/waku-relay) peer, define that node's `multiaddr` as a `staticnode` when starting the app: +In order to connect to a *specific* node as [`relay`](https://rfc.vac.dev/spec/11/) peer, define that node's `multiaddr` as a `staticnode` when starting the app: ``` ./build/chat2 --staticnode:/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ diff --git a/docs/tutorial/db-migration.md b/docs/tutorial/db-migration.md index 08deddb30..905d5d1b6 100644 --- a/docs/tutorial/db-migration.md +++ b/docs/tutorial/db-migration.md @@ -4,11 +4,11 @@ This tutorial explains the database migration process in nim-waku. # Contributors Guide ## Database Migration Flow Nim-waku utilizes the built-in `user_version` variable that Sqlite provides for tracking the database versions. -The [user_version](https://github.com/waku-org/nwaku/blob/master/waku/v2/waku_archive/driver/sqlite_driver/migrations.nim) MUST be bumped up for every update on the database e.g, table schema/title change. +The [user_version](https://github.com/waku-org/nwaku/blob/master/waku/waku_archive/driver/sqlite_driver/migrations.nim) MUST be bumped up for every update on the database e.g, table schema/title change. Each update should be accompanied by a migration script to move the content of the old version of the database to the new version. The script MUST be added to the respective folder as explained in [Migration Folder Structure](#migration-folder-structure) with the proper naming as given in [ Migration Script Naming](#migration-file-naming). -The migration is invoked whenever the database `user_version` is behind the target [user_version](https://github.com/waku-org/nwaku/blob/master/waku/v2/waku_archive/driver/sqlite_driver/migrations.nim) indicated in the nim-waku application. +The migration is invoked whenever the database `user_version` is behind the target [user_version](https://github.com/waku-org/nwaku/blob/master/waku/waku_archive/driver/sqlite_driver/migrations.nim) indicated in the nim-waku application. The respective migration scripts located in the [migrations folder](https://github.com/waku-org/nwaku/tree/master/migrations) will be executed to upgrade the database from its old version to the target version. ## Migration Folder Structure diff --git a/examples/v2/README.md b/examples/README.md similarity index 87% rename from examples/v2/README.md rename to examples/README.md index 6a7bdf722..0fdca7dc8 100644 --- a/examples/v2/README.md +++ b/examples/README.md @@ -13,7 +13,7 @@ TODO ## publisher/subscriber -Within `examples/v2` you can find a `publisher` and a `subscriber`. The first one publishes messages to the default pubsub topic on a given content topic, and the second one runs forever listening to that pubsub topic and printing the content it receives. +Within `examples/` you can find a `publisher` and a `subscriber`. The first one publishes messages to the default pubsub topic on a given content topic, and the second one runs forever listening to that pubsub topic and printing the content it receives. **Some notes:** * These examples are meant to work even in if you are behind a firewall and you can't be discovered by discv5. diff --git a/examples/v2/filter_subscriber.nim b/examples/filter_subscriber.nim similarity index 96% rename from examples/v2/filter_subscriber.nim rename to examples/filter_subscriber.nim index 43288a8dd..6c01ec6d0 100644 --- a/examples/v2/filter_subscriber.nim +++ b/examples/filter_subscriber.nim @@ -8,9 +8,9 @@ import stew/results import ../../../waku/common/logging, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_filter_v2/client + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_filter_v2/client const FilterPeer = "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS" # node-01.gc-us-central1-a.wakuv2.test.statusim.net on wakuv2.test diff --git a/examples/v2/lightpush_publisher.nim b/examples/lightpush_publisher.nim similarity index 94% rename from examples/v2/lightpush_publisher.nim rename to examples/lightpush_publisher.nim index bcb753e51..28982594d 100644 --- a/examples/v2/lightpush_publisher.nim +++ b/examples/lightpush_publisher.nim @@ -8,9 +8,9 @@ import stew/results import ../../../waku/common/logging, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_lightpush/client + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_lightpush/client const LightpushPeer = "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ" # node-01.do-ams3.wakuv2.test.statusim.net on wakuv2.test diff --git a/examples/v2/nim.cfg b/examples/nim.cfg similarity index 100% rename from examples/v2/nim.cfg rename to examples/nim.cfg diff --git a/examples/v2/publisher.nim b/examples/publisher.nim similarity index 96% rename from examples/v2/publisher.nim rename to examples/publisher.nim index ffbea8f85..596dea068 100644 --- a/examples/v2/publisher.nim +++ b/examples/publisher.nim @@ -11,11 +11,11 @@ import import ../../../waku/common/logging, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_node, - ../../../waku/v2/waku_enr, - ../../../waku/v2/waku_discv5 + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_node, + ../../../waku/waku_enr, + ../../../waku/waku_discv5 proc now*(): Timestamp = getNanosecondTime(getTime().toUnixFloat()) diff --git a/examples/v2/subscriber.nim b/examples/subscriber.nim similarity index 95% rename from examples/v2/subscriber.nim rename to examples/subscriber.nim index 7c1de589c..63e8f04d0 100644 --- a/examples/v2/subscriber.nim +++ b/examples/subscriber.nim @@ -11,11 +11,11 @@ import import ../../../waku/common/logging, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_node, - ../../../waku/v2/waku_enr, - ../../../waku/v2/waku_discv5 + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_node, + ../../../waku/waku_enr, + ../../../waku/waku_discv5 # An accesible bootstrap node. See wakuv2.prod fleets.status.im const bootstrapNode = "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZl" & diff --git a/library/events/json_message_event.nim b/library/events/json_message_event.nim index 2f86521b9..826291df0 100644 --- a/library/events/json_message_event.nim +++ b/library/events/json_message_event.nim @@ -2,7 +2,7 @@ import std/json import - ../../waku/v2/waku_core/message/message, + ../../waku/waku_core/message/message, ./json_base_event type JsonMessage = ref object diff --git a/library/libwaku.nim b/library/libwaku.nim index df66bff1e..538c06913 100644 --- a/library/libwaku.nim +++ b/library/libwaku.nim @@ -10,10 +10,10 @@ import chronicles, chronos import - ../../waku/v2/waku_core/message/message, - ../../waku/v2/node/waku_node, - ../../waku/v2/waku_core/topics/pubsub_topic, - ../../../waku/v2/waku_relay/protocol, + ../../waku/waku_core/message/message, + ../../waku/node/waku_node, + ../../waku/waku_core/topics/pubsub_topic, + ../../../waku/waku_relay/protocol, ./events/json_message_event, ./waku_thread/waku_thread, ./waku_thread/inter_thread_communication/node_lifecycle_request, diff --git a/library/waku_thread/config.nim b/library/waku_thread/config.nim index fd2186282..6309b6771 100644 --- a/library/waku_thread/config.nim +++ b/library/waku_thread/config.nim @@ -6,10 +6,10 @@ import libp2p/crypto/crypto, libp2p/crypto/secp, stew/shims/net, - ../../waku/v2/waku_enr/capabilities, + ../../waku/waku_enr/capabilities, ../../waku/common/utils/nat, - ../../waku/v2/node/waku_node, - ../../waku/v2/node/config, + ../../waku/node/waku_node, + ../../waku/node/config, ../events/[json_error_event,json_base_event] proc parsePrivateKey(jsonNode: JsonNode, diff --git a/library/waku_thread/inter_thread_communication/node_lifecycle_request.nim b/library/waku_thread/inter_thread_communication/node_lifecycle_request.nim index ffad85172..2f7f92e89 100644 --- a/library/waku_thread/inter_thread_communication/node_lifecycle_request.nim +++ b/library/waku_thread/inter_thread_communication/node_lifecycle_request.nim @@ -6,7 +6,7 @@ import stew/results, stew/shims/net import - ../../../waku/v2/node/waku_node, + ../../../waku/node/waku_node, ./request type diff --git a/library/waku_thread/inter_thread_communication/peer_manager_request.nim b/library/waku_thread/inter_thread_communication/peer_manager_request.nim index e3be6b65e..1d8e4111c 100644 --- a/library/waku_thread/inter_thread_communication/peer_manager_request.nim +++ b/library/waku_thread/inter_thread_communication/peer_manager_request.nim @@ -7,7 +7,7 @@ import stew/results, stew/shims/net import - ../../../waku/v2/node/waku_node, + ../../../waku/node/waku_node, ./request type diff --git a/library/waku_thread/inter_thread_communication/protocols/relay_request.nim b/library/waku_thread/inter_thread_communication/protocols/relay_request.nim index c0fd1340d..21a901036 100644 --- a/library/waku_thread/inter_thread_communication/protocols/relay_request.nim +++ b/library/waku_thread/inter_thread_communication/protocols/relay_request.nim @@ -7,10 +7,10 @@ import stew/results, stew/shims/net import - ../../../../waku/v2/waku_core/message/message, - ../../../../waku/v2/node/waku_node, - ../../../../waku/v2/waku_core/topics/pubsub_topic, - ../../../../waku/v2/waku_relay/protocol, + ../../../../waku/waku_core/message/message, + ../../../../waku/node/waku_node, + ../../../../waku/waku_core/topics/pubsub_topic, + ../../../../waku/waku_relay/protocol, ../request type diff --git a/library/waku_thread/inter_thread_communication/request.nim b/library/waku_thread/inter_thread_communication/request.nim index 4f26e8006..5adcb8eaf 100644 --- a/library/waku_thread/inter_thread_communication/request.nim +++ b/library/waku_thread/inter_thread_communication/request.nim @@ -8,7 +8,7 @@ import import chronos import - ../../../waku/v2/node/waku_node, + ../../../waku/node/waku_node, ../waku_thread type diff --git a/library/waku_thread/waku_thread.nim b/library/waku_thread/waku_thread.nim index 8574dbd99..be029a7c3 100644 --- a/library/waku_thread/waku_thread.nim +++ b/library/waku_thread/waku_thread.nim @@ -12,17 +12,17 @@ import stew/shims/net import ../../../waku/common/enr/builder, - ../../../waku/v2/waku_enr/capabilities, - ../../../waku/v2/waku_enr/multiaddr, - ../../../waku/v2/waku_enr/sharding, - ../../../waku/v2/waku_core/message/message, - ../../../waku/v2/waku_core/topics/pubsub_topic, - ../../../waku/v2/node/peer_manager/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/node/waku_node, - ../../../waku/v2/node/builder, - ../../../waku/v2/node/config, - ../../../waku/v2/waku_relay/protocol, + ../../../waku/waku_enr/capabilities, + ../../../waku/waku_enr/multiaddr, + ../../../waku/waku_enr/sharding, + ../../../waku/waku_core/message/message, + ../../../waku/waku_core/topics/pubsub_topic, + ../../../waku/node/peer_manager/peer_manager, + ../../../waku/waku_core, + ../../../waku/node/waku_node, + ../../../waku/node/builder, + ../../../waku/node/config, + ../../../waku/waku_relay/protocol, ../events/[json_error_event,json_message_event,json_base_event], ../alloc, ./config, diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim deleted file mode 100644 index e7942e23d..000000000 --- a/tests/all_tests_v2.nim +++ /dev/null @@ -1,105 +0,0 @@ -## Waku v2 - -# Waku core test suite -import - ./v2/waku_core/test_namespaced_topics, - ./v2/waku_core/test_time, - ./v2/waku_core/test_message_digest, - ./v2/waku_core/test_peers - - -# Waku archive test suite -import - ./v2/waku_archive/test_driver_queue_index, - ./v2/waku_archive/test_driver_queue_pagination, - ./v2/waku_archive/test_driver_queue_query, - ./v2/waku_archive/test_driver_queue, - ./v2/waku_archive/test_driver_sqlite_query, - ./v2/waku_archive/test_driver_sqlite, - ./v2/waku_archive/test_retention_policy, - ./v2/waku_archive/test_waku_archive - -const os* {.strdefine.} = "" -when os == "Linux": - # GitHub only supports container actions on Linux - # and we need to start a postgress database in a docker container - import - ./v2/waku_archive/test_driver_postgres_query, - ./v2/waku_archive/test_driver_postgres - -# Waku store test suite -import - ./v2/waku_store/test_rpc_codec, - ./v2/waku_store/test_waku_store, - ./v2/waku_store/test_wakunode_store - -when defined(waku_exp_store_resume): - # TODO: Review store resume test cases (#1282) - import ./v2/waku_store/test_resume - - -# Waku relay test suite -import - ./v2/waku_relay/test_waku_relay, - ./v2/waku_relay/test_wakunode_relay - -# Waku filter test suite -import - ./v2/waku_filter_v2/test_waku_filter, - ./v2/waku_filter_v2/test_waku_filter_protocol - -import - # Waku v2 tests - ./v2/test_wakunode, - # Waku LightPush - ./v2/test_waku_lightpush, - ./v2/test_wakunode_lightpush, - # Waku Filter - ./v2/test_waku_filter, - ./v2/test_wakunode_filter, - ./v2/test_waku_peer_exchange, - ./v2/test_peer_store_extended, - ./v2/test_message_cache, - ./v2/test_peer_manager, - ./v2/test_peer_storage, - ./v2/test_waku_keepalive, - ./v2/test_waku_enr, - ./v2/test_waku_dnsdisc, - ./v2/test_waku_discv5, - ./v2/test_peer_exchange, - ./v2/test_waku_noise, - ./v2/test_waku_noise_sessions, - ./v2/test_waku_switch, - ./v2/test_waku_rendezvous - -# Waku Keystore test suite -import - ./v2/test_waku_keystore_keyfile, - ./v2/test_waku_keystore - -## Wakunode JSON-RPC API test suite -import - ./v2/wakunode_jsonrpc/test_jsonrpc_admin, - ./v2/wakunode_jsonrpc/test_jsonrpc_debug, - ./v2/wakunode_jsonrpc/test_jsonrpc_filter, - ./v2/wakunode_jsonrpc/test_jsonrpc_relay, - ./v2/wakunode_jsonrpc/test_jsonrpc_store - -## Wakunode Rest API test suite -import - ./v2/wakunode_rest/test_rest_debug, - ./v2/wakunode_rest/test_rest_debug_serdes, - ./v2/wakunode_rest/test_rest_relay, - ./v2/wakunode_rest/test_rest_relay_serdes, - ./v2/wakunode_rest/test_rest_serdes, - ./v2/wakunode_rest/test_rest_store - - -## Experimental - -when defined(rln): - import - ./v2/waku_rln_relay/test_waku_rln_relay, - ./v2/waku_rln_relay/test_wakunode_rln_relay, - ./v2/waku_rln_relay/test_rln_group_manager_onchain, - ./v2/waku_rln_relay/test_rln_group_manager_static diff --git a/tests/all_tests_waku.nim b/tests/all_tests_waku.nim new file mode 100644 index 000000000..357bfdc23 --- /dev/null +++ b/tests/all_tests_waku.nim @@ -0,0 +1,105 @@ +## Waku v2 + +# Waku core test suite +import + ./waku_core/test_namespaced_topics, + ./waku_core/test_time, + ./waku_core/test_message_digest, + ./waku_core/test_peers + + +# Waku archive test suite +import + ./waku_archive/test_driver_queue_index, + ./waku_archive/test_driver_queue_pagination, + ./waku_archive/test_driver_queue_query, + ./waku_archive/test_driver_queue, + ./waku_archive/test_driver_sqlite_query, + ./waku_archive/test_driver_sqlite, + ./waku_archive/test_retention_policy, + ./waku_archive/test_waku_archive + +const os* {.strdefine.} = "" +when os == "Linux": + # GitHub only supports container actions on Linux + # and we need to start a postgress database in a docker container + import + ./waku_archive/test_driver_postgres_query, + ./waku_archive/test_driver_postgres + +# Waku store test suite +import + ./waku_store/test_rpc_codec, + ./waku_store/test_waku_store, + ./waku_store/test_wakunode_store + +when defined(waku_exp_store_resume): + # TODO: Review store resume test cases (#1282) + import ./waku_store/test_resume + + +# Waku relay test suite +import + ./waku_relay/test_waku_relay, + ./waku_relay/test_wakunode_relay + +# Waku filter test suite +import + ./waku_filter_v2/test_waku_filter, + ./waku_filter_v2/test_waku_filter_protocol + +import + # Waku v2 tests + ./test_wakunode, + # Waku LightPush + ./test_waku_lightpush, + ./test_wakunode_lightpush, + # Waku Filter + ./test_waku_filter, + ./test_wakunode_filter, + ./test_waku_peer_exchange, + ./test_peer_store_extended, + ./test_message_cache, + ./test_peer_manager, + ./test_peer_storage, + ./test_waku_keepalive, + ./test_waku_enr, + ./test_waku_dnsdisc, + ./test_waku_discv5, + ./test_peer_exchange, + ./test_waku_noise, + ./test_waku_noise_sessions, + ./test_waku_switch, + ./test_waku_rendezvous + +# Waku Keystore test suite +import + ./test_waku_keystore_keyfile, + ./test_waku_keystore + +## Wakunode JSON-RPC API test suite +import + ./wakunode_jsonrpc/test_jsonrpc_admin, + ./wakunode_jsonrpc/test_jsonrpc_debug, + ./wakunode_jsonrpc/test_jsonrpc_filter, + ./wakunode_jsonrpc/test_jsonrpc_relay, + ./wakunode_jsonrpc/test_jsonrpc_store + +## Wakunode Rest API test suite +import + ./wakunode_rest/test_rest_debug, + ./wakunode_rest/test_rest_debug_serdes, + ./wakunode_rest/test_rest_relay, + ./wakunode_rest/test_rest_relay_serdes, + ./wakunode_rest/test_rest_serdes, + ./wakunode_rest/test_rest_store + + +## Experimental + +when defined(rln): + import + ./waku_rln_relay/test_waku_rln_relay, + ./waku_rln_relay/test_wakunode_rln_relay, + ./waku_rln_relay/test_rln_group_manager_onchain, + ./waku_rln_relay/test_rln_group_manager_static diff --git a/tests/common/test_enr_builder.nim b/tests/common/test_enr_builder.nim index bb7ff08cb..0c16bb7b4 100644 --- a/tests/common/test_enr_builder.nim +++ b/tests/common/test_enr_builder.nim @@ -7,7 +7,7 @@ import testutils/unittests import ../../waku/common/enr, - ../v2/testlib/wakucore + ../testlib/wakucore suite "nim-eth ENR - builder and typed record": diff --git a/tests/v2/test_message_cache.nim b/tests/test_message_cache.nim similarity index 98% rename from tests/v2/test_message_cache.nim rename to tests/test_message_cache.nim index f18901f75..31fe7cdc3 100644 --- a/tests/v2/test_message_cache.nim +++ b/tests/test_message_cache.nim @@ -5,8 +5,8 @@ import testutils/unittests, chronicles import - ../../waku/v2/waku_core, - ../../waku/v2/node/message_cache, + ../../waku/waku_core, + ../../waku/node/message_cache, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_peer_exchange.nim b/tests/test_peer_exchange.nim similarity index 97% rename from tests/v2/test_peer_exchange.nim rename to tests/test_peer_exchange.nim index 2ee88eaf0..95cb75ee4 100644 --- a/tests/v2/test_peer_exchange.nim +++ b/tests/test_peer_exchange.nim @@ -10,8 +10,8 @@ import libp2p/crypto/crypto, libp2p/protocols/pubsub/gossipsub import - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, + ../../waku/waku_core, + ../../waku/waku_node, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_peer_manager.nim b/tests/test_peer_manager.nim similarity index 99% rename from tests/v2/test_peer_manager.nim rename to tests/test_peer_manager.nim index eeb9e8520..4b85babf7 100644 --- a/tests/v2/test_peer_manager.nim +++ b/tests/test_peer_manager.nim @@ -18,14 +18,14 @@ import libp2p/peerid import ../../waku/common/databases/db_sqlite, - ../../waku/v2/node/peer_manager/peer_manager, - ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, - ../../waku/v2/waku_node, - ../../waku/v2/waku_relay, - ../../waku/v2/waku_store, - ../../waku/v2/waku_filter, - ../../waku/v2/waku_lightpush, - ../../waku/v2/waku_peer_exchange, + ../../waku/node/peer_manager/peer_manager, + ../../waku/node/peer_manager/peer_store/waku_peer_storage, + ../../waku/waku_node, + ../../waku/waku_relay, + ../../waku/waku_store, + ../../waku/waku_filter, + ../../waku/waku_lightpush, + ../../waku/waku_peer_exchange, ./testlib/common, ./testlib/testutils, ./testlib/wakucore, diff --git a/tests/v2/test_peer_storage.nim b/tests/test_peer_storage.nim similarity index 97% rename from tests/v2/test_peer_storage.nim rename to tests/test_peer_storage.nim index 0cd2e20a2..f6d268b46 100644 --- a/tests/v2/test_peer_storage.nim +++ b/tests/test_peer_storage.nim @@ -5,8 +5,8 @@ import libp2p/crypto/crypto import ../../waku/common/databases/db_sqlite, - ../../waku/v2/node/peer_manager/peer_manager, - ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, + ../../waku/node/peer_manager/peer_manager, + ../../waku/node/peer_manager/peer_store/waku_peer_storage, ./testlib/wakucore diff --git a/tests/v2/test_peer_store_extended.nim b/tests/test_peer_store_extended.nim similarity index 98% rename from tests/v2/test_peer_store_extended.nim rename to tests/test_peer_store_extended.nim index 64c6552b5..db70cb51c 100644 --- a/tests/v2/test_peer_store_extended.nim +++ b/tests/test_peer_store_extended.nim @@ -9,9 +9,9 @@ import libp2p/multiaddress, testutils/unittests import - ../../waku/v2/node/peer_manager/peer_manager, - ../../waku/v2/node/peer_manager/waku_peer_store, - ../../waku/v2/waku_node, + ../../waku/node/peer_manager/peer_manager, + ../../waku/node/peer_manager/waku_peer_store, + ../../waku/waku_node, ./testlib/wakucore diff --git a/tests/v2/test_utils_compat.nim b/tests/test_utils_compat.nim similarity index 94% rename from tests/v2/test_utils_compat.nim rename to tests/test_utils_compat.nim index 55c5be781..79411b596 100644 --- a/tests/v2/test_utils_compat.nim +++ b/tests/test_utils_compat.nim @@ -4,8 +4,8 @@ import testutils/unittests import stew/results, - ../../waku/v2/waku_core/message, - ../../waku/v2/waku_core/time, + ../../waku/waku_core/message, + ../../waku/waku_core/time, ./testlib/common suite "Waku Payload": diff --git a/tests/v2/test_waku_discv5.nim b/tests/test_waku_discv5.nim similarity index 99% rename from tests/v2/test_waku_discv5.nim rename to tests/test_waku_discv5.nim index e4ff63f34..f3c58ad4d 100644 --- a/tests/v2/test_waku_discv5.nim +++ b/tests/test_waku_discv5.nim @@ -9,8 +9,8 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - ../../waku/v2/waku_enr, - ../../waku/v2/waku_discv5, + ../../waku/waku_enr, + ../../waku/waku_discv5, ./testlib/common, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_waku_dnsdisc.nim b/tests/test_waku_dnsdisc.nim similarity index 97% rename from tests/v2/test_waku_dnsdisc.nim rename to tests/test_waku_dnsdisc.nim index 4b5e09258..ed9365cca 100644 --- a/tests/v2/test_waku_dnsdisc.nim +++ b/tests/test_waku_dnsdisc.nim @@ -11,9 +11,9 @@ import eth/keys, discovery/dnsdisc/builder import - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, - ../../waku/v2/waku_dnsdisc, + ../../waku/node/peer_manager, + ../../waku/waku_node, + ../../waku/waku_dnsdisc, ./testlib/common, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_waku_enr.nim b/tests/test_waku_enr.nim similarity index 99% rename from tests/v2/test_waku_enr.nim rename to tests/test_waku_enr.nim index 6a7a17ede..a0b2bc1b8 100644 --- a/tests/v2/test_waku_enr.nim +++ b/tests/test_waku_enr.nim @@ -5,8 +5,8 @@ import stew/results, testutils/unittests import - ../../waku/v2/waku_core, - ../../waku/v2/waku_enr, + ../../waku/waku_core, + ../../waku/waku_enr, ./testlib/wakucore diff --git a/tests/v2/test_waku_filter.nim b/tests/test_waku_filter.nim similarity index 98% rename from tests/v2/test_waku_filter.nim rename to tests/test_waku_filter.nim index 9a01a4ec5..36694b0d6 100644 --- a/tests/v2/test_waku_filter.nim +++ b/tests/test_waku_filter.nim @@ -7,10 +7,10 @@ import chronos, libp2p/crypto/crypto import - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_core, - ../../waku/v2/waku_filter, - ../../waku/v2/waku_filter/client, + ../../waku/node/peer_manager, + ../../waku/waku_core, + ../../waku/waku_filter, + ../../waku/waku_filter/client, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_waku_keepalive.nim b/tests/test_waku_keepalive.nim similarity index 96% rename from tests/v2/test_waku_keepalive.nim rename to tests/test_waku_keepalive.nim index 0098cbf7c..24da7bd0c 100644 --- a/tests/v2/test_waku_keepalive.nim +++ b/tests/test_waku_keepalive.nim @@ -12,8 +12,8 @@ import libp2p/stream/connection, libp2p/crypto/crypto import - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, + ../../waku/waku_core, + ../../waku/waku_node, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_waku_keystore.nim b/tests/test_waku_keystore.nim similarity index 98% rename from tests/v2/test_waku_keystore.nim rename to tests/test_waku_keystore.nim index 75f57930f..270feadb7 100644 --- a/tests/v2/test_waku_keystore.nim +++ b/tests/test_waku_keystore.nim @@ -4,10 +4,10 @@ import std/[algorithm, json, options, os], testutils/unittests, chronos, stint import - ../../waku/v2/waku_keystore, + ../../waku/waku_keystore, ./testlib/common -from ../../waku/v2/waku_noise/noise_utils import randomSeqByte +from ../../waku/waku_noise/noise_utils import randomSeqByte procSuite "Credentials test suite": diff --git a/tests/v2/test_waku_keystore_keyfile.nim b/tests/test_waku_keystore_keyfile.nim similarity index 99% rename from tests/v2/test_waku_keystore_keyfile.nim rename to tests/test_waku_keystore_keyfile.nim index d5357ff3c..28bdf30da 100644 --- a/tests/v2/test_waku_keystore_keyfile.nim +++ b/tests/test_waku_keystore_keyfile.nim @@ -6,10 +6,10 @@ import testutils/unittests, chronos, eth/keys import - ../../waku/v2/waku_keystore, + ../../waku/waku_keystore, ./testlib/common -from ../../waku/v2/waku_noise/noise_utils import randomSeqByte +from ../../waku/waku_noise/noise_utils import randomSeqByte suite "KeyFile test suite": diff --git a/tests/v2/test_waku_lightpush.nim b/tests/test_waku_lightpush.nim similarity index 95% rename from tests/v2/test_waku_lightpush.nim rename to tests/test_waku_lightpush.nim index d92c08437..9182a2958 100644 --- a/tests/v2/test_waku_lightpush.nim +++ b/tests/test_waku_lightpush.nim @@ -6,10 +6,10 @@ import chronos, libp2p/crypto/crypto import - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_core, - ../../waku/v2/waku_lightpush, - ../../waku/v2/waku_lightpush/client, + ../../waku/node/peer_manager, + ../../waku/waku_core, + ../../waku/waku_lightpush, + ../../waku/waku_lightpush/client, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_waku_noise.nim b/tests/test_waku_noise.nim similarity index 99% rename from tests/v2/test_waku_noise.nim rename to tests/test_waku_noise.nim index 87751a34b..9c9277292 100644 --- a/tests/v2/test_waku_noise.nim +++ b/tests/test_waku_noise.nim @@ -9,12 +9,12 @@ import libp2p/protobuf/minprotobuf, stew/endians2 import - ../../waku/v2/utils/noise as waku_message_utils, - ../../waku/v2/waku_noise/noise_types, - ../../waku/v2/waku_noise/noise_utils, - ../../waku/v2/waku_noise/noise, - ../../waku/v2/waku_noise/noise_handshake_processing, - ../../waku/v2/waku_core, + ../../waku/utils/noise as waku_message_utils, + ../../waku/waku_noise/noise_types, + ../../waku/waku_noise/noise_utils, + ../../waku/waku_noise/noise, + ../../waku/waku_noise/noise_handshake_processing, + ../../waku/waku_core, ./testlib/common diff --git a/tests/v2/test_waku_noise_sessions.nim b/tests/test_waku_noise_sessions.nim similarity index 98% rename from tests/v2/test_waku_noise_sessions.nim rename to tests/test_waku_noise_sessions.nim index 6faf73a88..75187cba4 100644 --- a/tests/v2/test_waku_noise_sessions.nim +++ b/tests/test_waku_noise_sessions.nim @@ -6,11 +6,11 @@ import testutils/unittests import ../../waku/common/protobuf, - ../../waku/v2/utils/noise as waku_message_utils, - ../../waku/v2/waku_noise/noise_types, - ../../waku/v2/waku_noise/noise_utils, - ../../waku/v2/waku_noise/noise_handshake_processing, - ../../waku/v2/waku_core, + ../../waku/utils/noise as waku_message_utils, + ../../waku/waku_noise/noise_types, + ../../waku/waku_noise/noise_utils, + ../../waku/waku_noise/noise_handshake_processing, + ../../waku/waku_core, ./testlib/common procSuite "Waku Noise Sessions": diff --git a/tests/v2/test_waku_peer_exchange.nim b/tests/test_waku_peer_exchange.nim similarity index 97% rename from tests/v2/test_waku_peer_exchange.nim rename to tests/test_waku_peer_exchange.nim index c8d9fc987..d179ca080 100644 --- a/tests/v2/test_waku_peer_exchange.nim +++ b/tests/test_waku_peer_exchange.nim @@ -14,13 +14,13 @@ import eth/keys, eth/p2p/discoveryv5/enr import - ../../waku/v2/waku_node, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_discv5, - ../../waku/v2/waku_peer_exchange, - ../../waku/v2/waku_peer_exchange/rpc, - ../../waku/v2/waku_peer_exchange/rpc_codec, - ../../waku/v2/waku_peer_exchange/protocol, + ../../waku/waku_node, + ../../waku/node/peer_manager, + ../../waku/waku_discv5, + ../../waku/waku_peer_exchange, + ../../waku/waku_peer_exchange/rpc, + ../../waku/waku_peer_exchange/rpc_codec, + ../../waku/waku_peer_exchange/protocol, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_waku_rendezvous.nim b/tests/test_waku_rendezvous.nim similarity index 98% rename from tests/v2/test_waku_rendezvous.nim rename to tests/test_waku_rendezvous.nim index 7b3950e62..e87950d3f 100644 --- a/tests/v2/test_waku_rendezvous.nim +++ b/tests/test_waku_rendezvous.nim @@ -7,7 +7,7 @@ import libp2p/protocols/rendezvous import - ../../waku/v2/node/waku_switch, + ../../waku/node/waku_switch, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_waku_switch.nim b/tests/test_waku_switch.nim similarity index 98% rename from tests/v2/test_waku_switch.nim rename to tests/test_waku_switch.nim index 47f367885..fe5adfc9b 100644 --- a/tests/v2/test_waku_switch.nim +++ b/tests/test_waku_switch.nim @@ -9,7 +9,7 @@ import libp2p/protocols/connectivity/relay/client, stew/byteutils import - ../../waku/v2/node/waku_switch, + ../../waku/node/waku_switch, ./testlib/common, ./testlib/wakucore diff --git a/tests/v2/test_wakunode.nim b/tests/test_wakunode.nim similarity index 98% rename from tests/v2/test_wakunode.nim rename to tests/test_wakunode.nim index fe1ce1510..5efeb8d3c 100644 --- a/tests/v2/test_wakunode.nim +++ b/tests/test_wakunode.nim @@ -17,11 +17,11 @@ import libp2p/nameresolving/mockresolver, eth/p2p/discoveryv5/enr import - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_relay, - ../../waku/v2/waku_peer_exchange, + ../../waku/waku_core, + ../../waku/waku_node, + ../../waku/node/peer_manager, + ../../waku/waku_relay, + ../../waku/waku_peer_exchange, ./testlib/wakucore, ./testlib/wakunode @@ -155,7 +155,7 @@ suite "WakuNode": bindPort = Port(61004), wsBindPort = Port(8000), wssEnabled = true, - secureKey = "../../waku/v2/node/key_dummy.txt") + secureKey = "../../waku/node/key_dummy.txt") asyncTest "Peer info updates with correct announced addresses": let diff --git a/tests/v2/test_wakunode_filter.nim b/tests/test_wakunode_filter.nim similarity index 95% rename from tests/v2/test_wakunode_filter.nim rename to tests/test_wakunode_filter.nim index 9f7f9b11e..a1f3c7e9a 100644 --- a/tests/v2/test_wakunode_filter.nim +++ b/tests/test_wakunode_filter.nim @@ -7,9 +7,9 @@ import chronos, libp2p/crypto/crypto import - ../../waku/v2/waku_core, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, + ../../waku/waku_core, + ../../waku/node/peer_manager, + ../../waku/waku_node, ./testlib/common, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/test_wakunode_lightpush.nim b/tests/test_wakunode_lightpush.nim similarity index 93% rename from tests/v2/test_wakunode_lightpush.nim rename to tests/test_wakunode_lightpush.nim index d2eddc55e..a4f717bd2 100644 --- a/tests/v2/test_wakunode_lightpush.nim +++ b/tests/test_wakunode_lightpush.nim @@ -8,10 +8,10 @@ import libp2p/crypto/crypto, libp2p/switch import - ../../waku/v2/waku_core, - ../../waku/v2/waku_lightpush, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, + ../../waku/waku_core, + ../../waku/waku_lightpush, + ../../waku/node/peer_manager, + ../../waku/waku_node, ./testlib/common, ./testlib/wakucore, ./testlib/wakunode diff --git a/tests/v2/testlib/common.nim b/tests/testlib/common.nim similarity index 100% rename from tests/v2/testlib/common.nim rename to tests/testlib/common.nim diff --git a/tests/v2/testlib/testutils.nim b/tests/testlib/testutils.nim similarity index 100% rename from tests/v2/testlib/testutils.nim rename to tests/testlib/testutils.nim diff --git a/tests/v2/testlib/wakucore.nim b/tests/testlib/wakucore.nim similarity index 98% rename from tests/v2/testlib/wakucore.nim rename to tests/testlib/wakucore.nim index 9a02249b1..785b76a8c 100644 --- a/tests/v2/testlib/wakucore.nim +++ b/tests/testlib/wakucore.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - ../../../waku/v2/waku_core, + ../../../waku/waku_core, ./common export switch diff --git a/tests/v2/testlib/wakunode.nim b/tests/testlib/wakunode.nim similarity index 95% rename from tests/v2/testlib/wakunode.nim rename to tests/testlib/wakunode.nim index e973ce3f5..ff0d4697b 100644 --- a/tests/v2/testlib/wakunode.nim +++ b/tests/testlib/wakunode.nim @@ -9,10 +9,10 @@ import libp2p/crypto/crypto as libp2p_keys, eth/keys as eth_keys import - ../../../waku/v2/waku_node, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_enr, - ../../../waku/v2/waku_discv5, + ../../../waku/waku_node, + ../../../waku/node/peer_manager, + ../../../waku/waku_enr, + ../../../waku/waku_discv5, ./common diff --git a/tests/v2/waku_archive/test_driver_postgres.nim b/tests/waku_archive/test_driver_postgres.nim similarity index 98% rename from tests/v2/waku_archive/test_driver_postgres.nim rename to tests/waku_archive/test_driver_postgres.nim index a444ae8e8..d0e8d7d19 100644 --- a/tests/v2/waku_archive/test_driver_postgres.nim +++ b/tests/waku_archive/test_driver_postgres.nim @@ -5,9 +5,9 @@ import testutils/unittests, chronos import - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/postgres_driver, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/postgres_driver, + ../../../waku/waku_core, ../testlib/wakucore proc now():int64 = getTime().toUnix() diff --git a/tests/v2/waku_archive/test_driver_postgres_query.nim b/tests/waku_archive/test_driver_postgres_query.nim similarity index 99% rename from tests/v2/waku_archive/test_driver_postgres_query.nim rename to tests/waku_archive/test_driver_postgres_query.nim index 84b832818..cbc1d16d9 100644 --- a/tests/v2/waku_archive/test_driver_postgres_query.nim +++ b/tests/waku_archive/test_driver_postgres_query.nim @@ -6,9 +6,9 @@ import chronos, chronicles import - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/postgres_driver, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/postgres_driver, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_queue.nim b/tests/waku_archive/test_driver_queue.nim similarity index 95% rename from tests/v2/waku_archive/test_driver_queue.nim rename to tests/waku_archive/test_driver_queue.nim index 4340497c8..852697ea0 100644 --- a/tests/v2/waku_archive/test_driver_queue.nim +++ b/tests/waku_archive/test_driver_queue.nim @@ -5,10 +5,10 @@ import stew/results, testutils/unittests import - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, - ../../../waku/v2/waku_archive/driver/queue_driver/index, - ../../../waku/v2/waku_core + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver/queue_driver {.all.}, + ../../../waku/waku_archive/driver/queue_driver/index, + ../../../waku/waku_core # Helper functions diff --git a/tests/v2/waku_archive/test_driver_queue_index.nim b/tests/waku_archive/test_driver_queue_index.nim similarity index 98% rename from tests/v2/waku_archive/test_driver_queue_index.nim rename to tests/waku_archive/test_driver_queue_index.nim index 84324b3d5..d5b113646 100644 --- a/tests/v2/waku_archive/test_driver_queue_index.nim +++ b/tests/waku_archive/test_driver_queue_index.nim @@ -6,8 +6,8 @@ import testutils/unittests, nimcrypto import - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_archive/driver/queue_driver/index + ../../../waku/waku_core, + ../../../waku/waku_archive/driver/queue_driver/index ## Helpers diff --git a/tests/v2/waku_archive/test_driver_queue_pagination.nim b/tests/waku_archive/test_driver_queue_pagination.nim similarity index 98% rename from tests/v2/waku_archive/test_driver_queue_pagination.nim rename to tests/waku_archive/test_driver_queue_pagination.nim index 9afbc5a64..bca694028 100644 --- a/tests/v2/waku_archive/test_driver_queue_pagination.nim +++ b/tests/waku_archive/test_driver_queue_pagination.nim @@ -5,10 +5,10 @@ import testutils/unittests, libp2p/protobuf/minprotobuf import - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, - ../../../waku/v2/waku_archive/driver/queue_driver/index, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver/queue_driver {.all.}, + ../../../waku/waku_archive/driver/queue_driver/index, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_queue_query.nim b/tests/waku_archive/test_driver_queue_query.nim similarity index 99% rename from tests/v2/waku_archive/test_driver_queue_query.nim rename to tests/waku_archive/test_driver_queue_query.nim index 179c3e158..5f25d6d9a 100644 --- a/tests/v2/waku_archive/test_driver_queue_query.nim +++ b/tests/waku_archive/test_driver_queue_query.nim @@ -6,9 +6,9 @@ import chronos, chronicles import - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_sqlite.nim b/tests/waku_archive/test_driver_sqlite.nim similarity index 92% rename from tests/v2/waku_archive/test_driver_sqlite.nim rename to tests/waku_archive/test_driver_sqlite.nim index d31e12d31..7c1bd2e1b 100644 --- a/tests/v2/waku_archive/test_driver_sqlite.nim +++ b/tests/waku_archive/test_driver_sqlite.nim @@ -6,9 +6,9 @@ import chronos import ../../../waku/common/databases/db_sqlite, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/sqlite_driver, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_driver_sqlite_query.nim b/tests/waku_archive/test_driver_sqlite_query.nim similarity index 99% rename from tests/v2/waku_archive/test_driver_sqlite_query.nim rename to tests/waku_archive/test_driver_sqlite_query.nim index 6e25e5fd2..9cf21cfca 100644 --- a/tests/v2/waku_archive/test_driver_sqlite_query.nim +++ b/tests/waku_archive/test_driver_sqlite_query.nim @@ -7,9 +7,9 @@ import chronicles import ../../../waku/common/databases/db_sqlite, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/sqlite_driver, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_retention_policy.nim b/tests/waku_archive/test_retention_policy.nim similarity index 91% rename from tests/v2/waku_archive/test_retention_policy.nim rename to tests/waku_archive/test_retention_policy.nim index 9a45d7e9f..e08455d27 100644 --- a/tests/v2/waku_archive/test_retention_policy.nim +++ b/tests/waku_archive/test_retention_policy.nim @@ -7,11 +7,11 @@ import chronos import ../../../waku/common/databases/db_sqlite, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_archive/retention_policy, - ../../../waku/v2/waku_archive/retention_policy/retention_policy_capacity, + ../../../waku/waku_core, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/sqlite_driver, + ../../../waku/waku_archive/retention_policy, + ../../../waku/waku_archive/retention_policy/retention_policy_capacity, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_archive/test_waku_archive.nim b/tests/waku_archive/test_waku_archive.nim similarity index 99% rename from tests/v2/waku_archive/test_waku_archive.nim rename to tests/waku_archive/test_waku_archive.nim index b71ff413a..dcac1484b 100644 --- a/tests/v2/waku_archive/test_waku_archive.nim +++ b/tests/waku_archive/test_waku_archive.nim @@ -8,9 +8,9 @@ import libp2p/crypto/crypto import ../../../waku/common/databases/db_sqlite, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_archive, + ../../../waku/waku_core, + ../../../waku/waku_archive/driver/sqlite_driver, + ../../../waku/waku_archive, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_core/test_message_digest.nim b/tests/waku_core/test_message_digest.nim similarity index 99% rename from tests/v2/waku_core/test_message_digest.nim rename to tests/waku_core/test_message_digest.nim index 93efcc6f1..ba0a31e0a 100644 --- a/tests/v2/waku_core/test_message_digest.nim +++ b/tests/waku_core/test_message_digest.nim @@ -5,7 +5,7 @@ import stew/byteutils, testutils/unittests import - ../../../waku/v2/waku_core, + ../../../waku/waku_core, ../testlib/wakucore suite "Waku Message - Deterministic hashing": diff --git a/tests/v2/waku_core/test_namespaced_topics.nim b/tests/waku_core/test_namespaced_topics.nim similarity index 99% rename from tests/v2/waku_core/test_namespaced_topics.nim rename to tests/waku_core/test_namespaced_topics.nim index d4fdd5820..9cc977456 100644 --- a/tests/v2/waku_core/test_namespaced_topics.nim +++ b/tests/waku_core/test_namespaced_topics.nim @@ -5,7 +5,7 @@ import stew/results, testutils/unittests import - ../../../waku/v2/waku_core/topics + ../../../waku/waku_core/topics suite "Waku Message - Content topics namespacing": diff --git a/tests/v2/waku_core/test_peers.nim b/tests/waku_core/test_peers.nim similarity index 99% rename from tests/v2/waku_core/test_peers.nim rename to tests/waku_core/test_peers.nim index ec68986eb..76742f487 100644 --- a/tests/v2/waku_core/test_peers.nim +++ b/tests/waku_core/test_peers.nim @@ -7,7 +7,7 @@ import libp2p/peerid, libp2p/errors import - ../../waku/v2/waku_core + ../../waku/waku_core suite "Waku Core - Peers": diff --git a/tests/v2/waku_core/test_sharding.nim b/tests/waku_core/test_sharding.nim similarity index 99% rename from tests/v2/waku_core/test_sharding.nim rename to tests/waku_core/test_sharding.nim index 0eced8534..76e910cc5 100644 --- a/tests/v2/waku_core/test_sharding.nim +++ b/tests/waku_core/test_sharding.nim @@ -9,7 +9,7 @@ import stew/results, testutils/unittests import - ../../../waku/v2/waku_core/topics + ../../../waku/waku_core/topics suite "Waku Sharding": diff --git a/tests/v2/waku_core/test_time.nim b/tests/waku_core/test_time.nim similarity index 97% rename from tests/v2/waku_core/test_time.nim rename to tests/waku_core/test_time.nim index a56da9c01..8d48e5f98 100644 --- a/tests/v2/waku_core/test_time.nim +++ b/tests/waku_core/test_time.nim @@ -3,7 +3,7 @@ import testutils/unittests import - ../../waku/v2/waku_core/time + ../../waku/waku_core/time suite "Waku Core - Time": diff --git a/tests/v2/waku_filter_v2/test_waku_filter.nim b/tests/waku_filter_v2/test_waku_filter.nim similarity index 98% rename from tests/v2/waku_filter_v2/test_waku_filter.nim rename to tests/waku_filter_v2/test_waku_filter.nim index 2aac7607f..39eae6688 100644 --- a/tests/v2/waku_filter_v2/test_waku_filter.nim +++ b/tests/waku_filter_v2/test_waku_filter.nim @@ -7,11 +7,11 @@ import chronicles, libp2p/peerstore import - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_filter_v2, - ../../../waku/v2/waku_filter_v2/client, - ../../../waku/v2/waku_filter_v2/rpc, - ../../../waku/v2/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_filter_v2, + ../../../waku/waku_filter_v2/client, + ../../../waku/waku_filter_v2/rpc, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim b/tests/waku_filter_v2/test_waku_filter_protocol.nim similarity index 98% rename from tests/v2/waku_filter_v2/test_waku_filter_protocol.nim rename to tests/waku_filter_v2/test_waku_filter_protocol.nim index 3b6327ce2..b4eb15a74 100644 --- a/tests/v2/waku_filter_v2/test_waku_filter_protocol.nim +++ b/tests/waku_filter_v2/test_waku_filter_protocol.nim @@ -7,11 +7,11 @@ import chronicles, libp2p/peerstore import - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_filter_v2, - ../../../waku/v2/waku_filter_v2/rpc, - ../../../waku/v2/waku_filter_v2/subscriptions, - ../../../waku/v2/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_filter_v2, + ../../../waku/waku_filter_v2/rpc, + ../../../waku/waku_filter_v2/subscriptions, + ../../../waku/waku_core, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_relay/resources/test_cert.pem b/tests/waku_relay/resources/test_cert.pem similarity index 100% rename from tests/v2/waku_relay/resources/test_cert.pem rename to tests/waku_relay/resources/test_cert.pem diff --git a/tests/v2/waku_relay/resources/test_key.pem b/tests/waku_relay/resources/test_key.pem similarity index 100% rename from tests/v2/waku_relay/resources/test_key.pem rename to tests/waku_relay/resources/test_key.pem diff --git a/tests/v2/waku_relay/test_waku_relay.nim b/tests/waku_relay/test_waku_relay.nim similarity index 98% rename from tests/v2/waku_relay/test_waku_relay.nim rename to tests/waku_relay/test_waku_relay.nim index ff6df1d69..eac196147 100644 --- a/tests/v2/waku_relay/test_waku_relay.nim +++ b/tests/waku_relay/test_waku_relay.nim @@ -9,9 +9,9 @@ import libp2p/protocols/pubsub/pubsub, libp2p/protocols/pubsub/rpc/messages import - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_relay, + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_relay, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_relay/test_wakunode_relay.nim b/tests/waku_relay/test_wakunode_relay.nim similarity index 99% rename from tests/v2/waku_relay/test_wakunode_relay.nim rename to tests/waku_relay/test_wakunode_relay.nim index 59447345f..544fcf62a 100644 --- a/tests/v2/waku_relay/test_wakunode_relay.nim +++ b/tests/waku_relay/test_wakunode_relay.nim @@ -18,10 +18,10 @@ import libp2p/multihash, secp256k1 import - ../../waku/v2/waku_core, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, - ../../waku/v2/waku_relay, + ../../waku/waku_core, + ../../waku/node/peer_manager, + ../../waku/waku_node, + ../../waku/waku_relay, ../testlib/testutils, ../testlib/common, ../testlib/wakucore, diff --git a/tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim similarity index 98% rename from tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim rename to tests/waku_rln_relay/test_rln_group_manager_onchain.nim index 2fc362fa6..ea9deb9b8 100644 --- a/tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -18,12 +18,12 @@ import libp2p/crypto/crypto, eth/keys import - ../../../waku/v2/waku_rln_relay/protocol_types, - ../../../waku/v2/waku_rln_relay/constants, - ../../../waku/v2/waku_rln_relay/contract, - ../../../waku/v2/waku_rln_relay/rln, - ../../../waku/v2/waku_rln_relay/conversion_utils, - ../../../waku/v2/waku_rln_relay/group_manager/on_chain/group_manager, + ../../../waku/waku_rln_relay/protocol_types, + ../../../waku/waku_rln_relay/constants, + ../../../waku/waku_rln_relay/contract, + ../../../waku/waku_rln_relay/rln, + ../../../waku/waku_rln_relay/conversion_utils, + ../../../waku/waku_rln_relay/group_manager/on_chain/group_manager, ../testlib/common, ./utils diff --git a/tests/v2/waku_rln_relay/test_rln_group_manager_static.nim b/tests/waku_rln_relay/test_rln_group_manager_static.nim similarity index 96% rename from tests/v2/waku_rln_relay/test_rln_group_manager_static.nim rename to tests/waku_rln_relay/test_rln_group_manager_static.nim index 285a16397..6030f135e 100644 --- a/tests/v2/waku_rln_relay/test_rln_group_manager_static.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_static.nim @@ -9,10 +9,10 @@ import testutils/unittests, stew/results, options, - ../../../waku/v2/waku_rln_relay/protocol_types, - ../../../waku/v2/waku_rln_relay/rln, - ../../../waku/v2/waku_rln_relay/conversion_utils, - ../../../waku/v2/waku_rln_relay/group_manager/static/group_manager + ../../../waku/waku_rln_relay/protocol_types, + ../../../waku/waku_rln_relay/rln, + ../../../waku/waku_rln_relay/conversion_utils, + ../../../waku/waku_rln_relay/group_manager/static/group_manager import stew/shims/net, diff --git a/tests/v2/waku_rln_relay/test_waku_rln_relay.nim b/tests/waku_rln_relay/test_waku_rln_relay.nim similarity index 99% rename from tests/v2/waku_rln_relay/test_waku_rln_relay.nim rename to tests/waku_rln_relay/test_waku_rln_relay.nim index 9c891aa96..94aebeb6f 100644 --- a/tests/v2/waku_rln_relay/test_waku_rln_relay.nim +++ b/tests/waku_rln_relay/test_waku_rln_relay.nim @@ -11,11 +11,11 @@ import stint, libp2p/crypto/crypto import - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_rln_relay, - ../../../waku/v2/waku_rln_relay/rln, - ../../../waku/v2/waku_rln_relay/protocol_metrics, - ../../../waku/v2/waku_keystore, + ../../../waku/waku_core, + ../../../waku/waku_rln_relay, + ../../../waku/waku_rln_relay/rln, + ../../../waku/waku_rln_relay/protocol_metrics, + ../../../waku/waku_keystore, ../testlib/common const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto" diff --git a/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim similarity index 98% rename from tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim rename to tests/waku_rln_relay/test_wakunode_rln_relay.nim index 1ac356c74..4c4acb572 100644 --- a/tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim +++ b/tests/waku_rln_relay/test_wakunode_rln_relay.nim @@ -14,10 +14,10 @@ import libp2p/protocols/pubsub/pubsub, eth/keys import - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_node, - ../../../waku/v2/waku_rln_relay, - ../../../waku/v2/waku_keystore, + ../../../waku/waku_core, + ../../../waku/waku_node, + ../../../waku/waku_rln_relay, + ../../../waku/waku_keystore, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/waku_rln_relay/utils.nim b/tests/waku_rln_relay/utils.nim similarity index 100% rename from tests/v2/waku_rln_relay/utils.nim rename to tests/waku_rln_relay/utils.nim diff --git a/tests/v2/waku_store/test_resume.nim b/tests/waku_store/test_resume.nim similarity index 98% rename from tests/v2/waku_store/test_resume.nim rename to tests/waku_store/test_resume.nim index 762877e09..ea918ce3c 100644 --- a/tests/v2/waku_store/test_resume.nim +++ b/tests/waku_store/test_resume.nim @@ -8,10 +8,10 @@ import libp2p/crypto/crypto import ../../waku/common/databases/db_sqlite, - ../../waku/v2/node/message_store/sqlite_store, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_core, - ../../waku/v2/waku_store, + ../../waku/node/message_store/sqlite_store, + ../../waku/node/peer_manager, + ../../waku/waku_core, + ../../waku/waku_store, ./testlib/common, ./testlib/switch diff --git a/tests/v2/waku_store/test_rpc_codec.nim b/tests/waku_store/test_rpc_codec.nim similarity index 97% rename from tests/v2/waku_store/test_rpc_codec.nim rename to tests/waku_store/test_rpc_codec.nim index 676b88d59..f8582ab5b 100644 --- a/tests/v2/waku_store/test_rpc_codec.nim +++ b/tests/waku_store/test_rpc_codec.nim @@ -6,9 +6,9 @@ import chronos import ../../../waku/common/protobuf, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_store/rpc, - ../../../waku/v2/waku_store/rpc_codec, + ../../../waku/waku_core, + ../../../waku/waku_store/rpc, + ../../../waku/waku_store/rpc_codec, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_store/test_waku_store.nim b/tests/waku_store/test_waku_store.nim similarity index 95% rename from tests/v2/waku_store/test_waku_store.nim rename to tests/waku_store/test_waku_store.nim index b9f22cf1c..a2db4b4bd 100644 --- a/tests/v2/waku_store/test_waku_store.nim +++ b/tests/waku_store/test_waku_store.nim @@ -7,10 +7,10 @@ import chronicles, libp2p/crypto/crypto import - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_store, - ../../../waku/v2/waku_store/client, + ../../../waku/node/peer_manager, + ../../../waku/waku_core, + ../../../waku/waku_store, + ../../../waku/waku_store/client, ../testlib/common, ../testlib/wakucore diff --git a/tests/v2/waku_store/test_wakunode_store.nim b/tests/waku_store/test_wakunode_store.nim similarity index 96% rename from tests/v2/waku_store/test_wakunode_store.nim rename to tests/waku_store/test_wakunode_store.nim index 3360b3c33..d1fcf9211 100644 --- a/tests/v2/waku_store/test_wakunode_store.nim +++ b/tests/waku_store/test_wakunode_store.nim @@ -14,13 +14,13 @@ import libp2p/protocols/pubsub/gossipsub import ../../../waku/common/databases/db_sqlite, - ../../../waku/v2/waku_core, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/sqlite_driver, - ../../../waku/v2/waku_store, - ../../../waku/v2/waku_filter, - ../../../waku/v2/waku_node, + ../../../waku/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/sqlite_driver, + ../../../waku/waku_store, + ../../../waku/waku_filter, + ../../../waku/waku_node, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode2/test_app.nim b/tests/wakunode2/test_app.nim index a8da0f147..f63a9ee3e 100644 --- a/tests/wakunode2/test_app.nim +++ b/tests/wakunode2/test_app.nim @@ -12,8 +12,8 @@ import import ../../apps/wakunode2/external_config, ../../apps/wakunode2/app, - ../v2/testlib/common, - ../v2/testlib/wakucore + ../testlib/common, + ../testlib/wakucore proc defaultTestWakuNodeConf(): WakuNodeConf = WakuNodeConf( diff --git a/tests/wakunode2/test_validators.nim b/tests/wakunode2/test_validators.nim index 37367e047..d28273358 100644 --- a/tests/wakunode2/test_validators.nim +++ b/tests/wakunode2/test_validators.nim @@ -14,12 +14,12 @@ import secp256k1 import ../../apps/wakunode2/wakunode2_validator_signed, - ../../waku/v2/waku_core, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_node, - ../../waku/v2/waku_relay, - ../v2/testlib/wakucore, - ../v2/testlib/wakunode + ../../waku/waku_core, + ../../waku/node/peer_manager, + ../../waku/waku_node, + ../../waku/waku_relay, + ../testlib/wakucore, + ../testlib/wakunode suite "WakuNode2 - Validators": diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim b/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim similarity index 93% rename from tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim rename to tests/wakunode_jsonrpc/test_jsonrpc_admin.nim index d463ddfbc..97cced003 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim @@ -10,16 +10,16 @@ import libp2p/crypto/crypto, json_rpc/[rpcserver, rpcclient] import - ../../../waku/v2/waku_core, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/jsonrpc/admin/handlers as admin_api, - ../../../waku/v2/node/jsonrpc/admin/client as admin_api_client, - ../../../waku/v2/waku_relay, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver, - ../../../waku/v2/waku_store, - ../../../waku/v2/waku_filter, + ../../../waku/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_node, + ../../../waku/node/jsonrpc/admin/handlers as admin_api, + ../../../waku/node/jsonrpc/admin/client as admin_api_client, + ../../../waku/waku_relay, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver, + ../../../waku/waku_store, + ../../../waku/waku_filter, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_debug.nim b/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim similarity index 85% rename from tests/v2/wakunode_jsonrpc/test_jsonrpc_debug.nim rename to tests/wakunode_jsonrpc/test_jsonrpc_debug.nim index 5e7b3a0bf..5eb438df8 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_debug.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim @@ -9,10 +9,10 @@ import libp2p/crypto/crypto, json_rpc/[rpcserver, rpcclient] import - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/jsonrpc/debug/handlers as debug_api, - ../../../waku/v2/node/jsonrpc/debug/client as debug_api_client, + ../../../waku/node/peer_manager, + ../../../waku/waku_node, + ../../../waku/node/jsonrpc/debug/handlers as debug_api, + ../../../waku/node/jsonrpc/debug/client as debug_api_client, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim b/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim similarity index 85% rename from tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim rename to tests/wakunode_jsonrpc/test_jsonrpc_filter.nim index b41f0c186..ebb5613cb 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim @@ -8,15 +8,15 @@ import libp2p/crypto/crypto, json_rpc/[rpcserver, rpcclient] import - ../../../waku/v2/waku_core, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/message_cache, - ../../../waku/v2/node/jsonrpc/filter/handlers as filter_api, - ../../../waku/v2/node/jsonrpc/filter/client as filter_api_client, - ../../../waku/v2/waku_filter, - ../../../waku/v2/waku_filter/rpc, - ../../../waku/v2/waku_filter/client, + ../../../waku/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_node, + ../../../waku/node/message_cache, + ../../../waku/node/jsonrpc/filter/handlers as filter_api, + ../../../waku/node/jsonrpc/filter/client as filter_api_client, + ../../../waku/waku_filter, + ../../../waku/waku_filter/rpc, + ../../../waku/waku_filter/client, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim b/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim similarity index 94% rename from tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim rename to tests/wakunode_jsonrpc/test_jsonrpc_relay.nim index 19d7c5d6c..b4d12feef 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim @@ -9,14 +9,14 @@ import json_rpc/[rpcserver, rpcclient] import ../../../waku/common/base64, - ../../../waku/v2/waku_core, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/node/message_cache, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/jsonrpc/relay/handlers as relay_api, - ../../../waku/v2/node/jsonrpc/relay/client as relay_api_client, - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_relay, + ../../../waku/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/node/message_cache, + ../../../waku/waku_node, + ../../../waku/node/jsonrpc/relay/handlers as relay_api, + ../../../waku/node/jsonrpc/relay/client as relay_api_client, + ../../../waku/waku_core, + ../../../waku/waku_relay, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim b/tests/wakunode_jsonrpc/test_jsonrpc_store.nim similarity index 92% rename from tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim rename to tests/wakunode_jsonrpc/test_jsonrpc_store.nim index 846fdef7c..f2216bc84 100644 --- a/tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_store.nim @@ -8,18 +8,18 @@ import libp2p/crypto/crypto, json_rpc/[rpcserver, rpcclient] import - ../../../waku/v2/waku_core, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/jsonrpc/store/handlers as store_api, - ../../../waku/v2/node/jsonrpc/store/client as store_api_client, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver, - ../../../waku/v2/waku_store, - ../../../waku/v2/waku_store/rpc, - ../../v2/testlib/common, - ../../v2/testlib/wakucore, - ../../v2/testlib/wakunode + ../../../waku/waku_core, + ../../../waku/node/peer_manager, + ../../../waku/waku_node, + ../../../waku/node/jsonrpc/store/handlers as store_api, + ../../../waku/node/jsonrpc/store/client as store_api_client, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver, + ../../../waku/waku_store, + ../../../waku/waku_store/rpc, + ../testlib/common, + ../testlib/wakucore, + ../testlib/wakunode proc put(store: ArchiveDriver, pubsubTopic: PubsubTopic, message: WakuMessage): Future[Result[void, string]] = diff --git a/tests/v2/wakunode_rest/test_rest_debug.nim b/tests/wakunode_rest/test_rest_debug.nim similarity index 85% rename from tests/v2/wakunode_rest/test_rest_debug.nim rename to tests/wakunode_rest/test_rest_debug.nim index 09df3f786..cc03cf891 100644 --- a/tests/v2/wakunode_rest/test_rest_debug.nim +++ b/tests/wakunode_rest/test_rest_debug.nim @@ -9,13 +9,13 @@ import libp2p/multiaddress, libp2p/crypto/crypto import - ../../waku/v2/waku_node, - ../../waku/v2/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. - ../../waku/v2/node/rest/server, - ../../waku/v2/node/rest/client, - ../../waku/v2/node/rest/responses, - ../../waku/v2/node/rest/debug/handlers as debug_api, - ../../waku/v2/node/rest/debug/client as debug_api_client, + ../../waku/waku_node, + ../../waku/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. + ../../waku/node/rest/server, + ../../waku/node/rest/client, + ../../waku/node/rest/responses, + ../../waku/node/rest/debug/handlers as debug_api, + ../../waku/node/rest/debug/client as debug_api_client, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_rest/test_rest_debug_serdes.nim b/tests/wakunode_rest/test_rest_debug_serdes.nim similarity index 92% rename from tests/v2/wakunode_rest/test_rest_debug_serdes.nim rename to tests/wakunode_rest/test_rest_debug_serdes.nim index 37b32c877..28b931569 100644 --- a/tests/v2/wakunode_rest/test_rest_debug_serdes.nim +++ b/tests/wakunode_rest/test_rest_debug_serdes.nim @@ -6,8 +6,8 @@ import testutils/unittests, json_serialization import - ../../waku/v2/node/rest/serdes, - ../../waku/v2/node/rest/debug/types + ../../waku/node/rest/serdes, + ../../waku/node/rest/debug/types suite "Waku v2 REST API - Debug - serialization": diff --git a/tests/v2/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim similarity index 92% rename from tests/v2/wakunode_rest/test_rest_filter.nim rename to tests/wakunode_rest/test_rest_filter.nim index c17bdccc3..0d6d08b34 100644 --- a/tests/v2/wakunode_rest/test_rest_filter.nim +++ b/tests/wakunode_rest/test_rest_filter.nim @@ -8,19 +8,19 @@ import presto, presto/client as presto_client, libp2p/crypto/crypto import - ../../waku/v2/node/message_cache, + ../../waku/node/message_cache, ../../waku/common/base64, - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, - ../../waku/v2/node/peer_manager, - ../../waku/v2/waku_filter, - ../../waku/v2/node/rest/server, - ../../waku/v2/node/rest/client, - ../../waku/v2/node/rest/responses, - ../../waku/v2/node/rest/filter/types, - ../../waku/v2/node/rest/filter/handlers as filter_api, - ../../waku/v2/node/rest/filter/client as filter_api_client, - ../../waku/v2/waku_relay, + ../../waku/waku_core, + ../../waku/waku_node, + ../../waku/node/peer_manager, + ../../waku/waku_filter, + ../../waku/node/rest/server, + ../../waku/node/rest/client, + ../../waku/node/rest/responses, + ../../waku/node/rest/filter/types, + ../../waku/node/rest/filter/handlers as filter_api, + ../../waku/node/rest/filter/client as filter_api_client, + ../../waku/waku_relay, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim similarity index 94% rename from tests/v2/wakunode_rest/test_rest_relay.nim rename to tests/wakunode_rest/test_rest_relay.nim index e78799e86..2159c052d 100644 --- a/tests/v2/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -9,16 +9,16 @@ import libp2p/crypto/crypto import ../../waku/common/base64, - ../../waku/v2/waku_core, - ../../waku/v2/waku_node, - ../../waku/v2/node/rest/server, - ../../waku/v2/node/rest/client, - ../../waku/v2/node/rest/responses, - ../../waku/v2/node/rest/relay/types, - ../../waku/v2/node/rest/relay/handlers as relay_api, - ../../waku/v2/node/rest/relay/client as relay_api_client, - ../../waku/v2/node/rest/relay/topic_cache, - ../../waku/v2/waku_relay, + ../../waku/waku_core, + ../../waku/waku_node, + ../../waku/node/rest/server, + ../../waku/node/rest/client, + ../../waku/node/rest/responses, + ../../waku/node/rest/relay/types, + ../../waku/node/rest/relay/handlers as relay_api, + ../../waku/node/rest/relay/client as relay_api_client, + ../../waku/node/rest/relay/topic_cache, + ../../waku/waku_relay, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/v2/wakunode_rest/test_rest_relay_serdes.nim b/tests/wakunode_rest/test_rest_relay_serdes.nim similarity index 92% rename from tests/v2/wakunode_rest/test_rest_relay_serdes.nim rename to tests/wakunode_rest/test_rest_relay_serdes.nim index 0ab26fb1a..2a3789370 100644 --- a/tests/v2/wakunode_rest/test_rest_relay_serdes.nim +++ b/tests/wakunode_rest/test_rest_relay_serdes.nim @@ -7,9 +7,9 @@ import json_serialization import ../../waku/common/base64, - ../../waku/v2/node/rest/serdes, - ../../waku/v2/node/rest/relay/types, - ../../waku/v2/waku_core + ../../waku/node/rest/serdes, + ../../waku/node/rest/relay/types, + ../../waku/waku_core diff --git a/tests/v2/wakunode_rest/test_rest_serdes.nim b/tests/wakunode_rest/test_rest_serdes.nim similarity index 96% rename from tests/v2/wakunode_rest/test_rest_serdes.nim rename to tests/wakunode_rest/test_rest_serdes.nim index 884745582..bc9c0880c 100644 --- a/tests/v2/wakunode_rest/test_rest_serdes.nim +++ b/tests/wakunode_rest/test_rest_serdes.nim @@ -6,8 +6,8 @@ import unittest2, json_serialization import - ../../waku/v2/node/rest/serdes, - ../../waku/v2/node/rest/debug/types + ../../waku/node/rest/serdes, + ../../waku/node/rest/debug/types # TODO: Decouple this test suite from the `debug_api` module by defining diff --git a/tests/v2/wakunode_rest/test_rest_store.nim b/tests/wakunode_rest/test_rest_store.nim similarity index 96% rename from tests/v2/wakunode_rest/test_rest_store.nim rename to tests/wakunode_rest/test_rest_store.nim index 17c03355d..a1a251884 100644 --- a/tests/v2/wakunode_rest/test_rest_store.nim +++ b/tests/wakunode_rest/test_rest_store.nim @@ -9,21 +9,21 @@ import presto, presto/client as presto_client, libp2p/crypto/crypto import - ../../../waku/v2/waku_core, - ../../../waku/v2/waku_node, - ../../../waku/v2/node/peer_manager, - ../../../waku/v2/node/rest/server, - ../../../waku/v2/node/rest/client, - ../../../waku/v2/node/rest/responses, - ../../../waku/v2/node/rest/store/handlers as store_api, - ../../../waku/v2/node/rest/store/client as store_api_client, - ../../../waku/v2/node/rest/store/types, - ../../../waku/v2/waku_archive, - ../../../waku/v2/waku_archive/driver/queue_driver, - ../../../waku/v2/waku_store as waku_store, - ../../v2/testlib/common, - ../../v2/testlib/wakucore, - ../../v2/testlib/wakunode + ../../../waku/waku_core, + ../../../waku/waku_node, + ../../../waku/node/peer_manager, + ../../../waku/node/rest/server, + ../../../waku/node/rest/client, + ../../../waku/node/rest/responses, + ../../../waku/node/rest/store/handlers as store_api, + ../../../waku/node/rest/store/client as store_api_client, + ../../../waku/node/rest/store/types, + ../../../waku/waku_archive, + ../../../waku/waku_archive/driver/queue_driver, + ../../../waku/waku_store as waku_store, + ../testlib/common, + ../testlib/wakucore, + ../testlib/wakunode logScope: topics = "waku node rest store_api test" diff --git a/waku.nimble b/waku.nimble index 284766f3d..6f2c6e300 100644 --- a/waku.nimble +++ b/waku.nimble @@ -57,7 +57,7 @@ proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") = task testcommon, "Build & run common tests": test "all_tests_common", "-d:chronicles_log_level=WARN -d:chronosStrictException" -### Waku v2 tasks +### Waku tasks task wakunode2, "Build Waku v2 cli node": let name = "wakunode2" buildBinary name, "apps/wakunode2/" @@ -70,22 +70,22 @@ task networkmonitor, "Build network monitor tool": let name = "networkmonitor" buildBinary name, "apps/networkmonitor/" -task test2, "Build & run Waku v2 tests": - test "all_tests_v2" +task test, "Build & run Waku tests": + test "all_tests_waku" task testwakunode2, "Build & run wakunode2 app tests": test "all_tests_wakunode2" -task example2, "Build Waku v2 example": - buildBinary "publisher", "examples/v2/" - buildBinary "subscriber", "examples/v2/" - buildBinary "filter_subscriber", "examples/v2/" - buildBinary "lightpush_publisher", "examples/v2/" +task example2, "Build Waku examples": + buildBinary "publisher", "examples/" + buildBinary "subscriber", "examples/" + buildBinary "filter_subscriber", "examples/" + buildBinary "lightpush_publisher", "examples/" -task chat2, "Build example Waku v2 chat usage": +task chat2, "Build example Waku chat usage": # NOTE For debugging, set debug level. For chat usage we want minimal log # output to STDOUT. Can be fixed by redirecting logs to file (e.g.) - #buildBinary name, "examples/v2/", "-d:chronicles_log_level=WARN" + #buildBinary name, "examples/", "-d:chronicles_log_level=WARN" let name = "chat2" buildBinary name, "apps/chat2/", "-d:chronicles_sinks=textlines[file] -d:ssl" diff --git a/waku/v2/README.md b/waku/README.md similarity index 71% rename from waku/v2/README.md rename to waku/README.md index b42d30ebc..59f49c10f 100644 --- a/waku/v2/README.md +++ b/waku/README.md @@ -1,12 +1,12 @@ -# Waku v2 +# Waku -This folder contains code related to Waku v2, both as a node and as a protocol. +This folder contains code related to Waku, both as a node and as a protocol. ## Introduction -This is an implementation in Nim of Waku v2, which is currently in draft/beta stage. +This is an implementation in Nim of the Waku suite of protocols. -See [spec](https://specs.vac.dev/specs/waku/v2/waku-v2.html). +See [specifications](https://rfc.vac.dev/spec/10/). ## How to Build & Run @@ -14,7 +14,7 @@ See [spec](https://specs.vac.dev/specs/waku/v2/waku-v2.html). * GNU Make, Bash and the usual POSIX utilities. Git 2.9.4 or newer. -### Wakunode +### Wakunode binary ```bash # The first `make` invocation will update all Git submodules. @@ -38,11 +38,11 @@ Setting up a `wakunode2` on the smallest [digital ocean](https://docs.digitaloce * use Docker. -### Waku v2 Protocol Test Suite +### Waku Protocol Test Suite ```bash -# Run all the Waku v2 tests -make test2 +# Run all the Waku tests +make test ``` To run a specific test. @@ -50,77 +50,34 @@ To run a specific test. # Get a shell with the right environment variables set ./env.sh bash # Run a specific test -nim c -r ./tests/v2/test_waku_filter.nim +nim c -r ./tests/test_waku_filter.nim ``` You can also alter compile options. For example, if you want a less verbose output you can do the following. For more, refer to the [compiler flags](https://nim-lang.org/docs/nimc.html#compiler-usage) and [chronicles documentation](https://github.com/status-im/nim-chronicles#compile-time-configuration). ```bash -nim c -r -d:chronicles_log_level=WARN --verbosity=0 --hints=off ./tests/v2/test_waku_filter.nim +nim c -r -d:chronicles_log_level=WARN --verbosity=0 --hints=off ./tests/test_waku_filter.nim ``` You may also want to change the `outdir` to a folder ignored by git. ```bash -nim c -r -d:chronicles_log_level=WARN --verbosity=0 --hints=off --outdir=build ./tests/v2/test_waku_filter.nim +nim c -r -d:chronicles_log_level=WARN --verbosity=0 --hints=off --outdir=build ./tests/test_waku_filter.nim ``` -### Waku v2 Protocol Example +### Waku Protocol Example -There is a more basic example, more limited in features and configuration than -the `wakunode1`, located in `examples/v2/basic2.nim`. +There are basic examples of both publishing and subscribing, +more limited in features and configuration than the `wakunode2` binary, +located in `examples/`. -There is also a more full featured example in `examples/v2/chat2.nim`. - -### Waku Quick Simulation - -*NOTE: This section might be slightly out of date as it was written for Waku v1.* - -One can set up several nodes, get them connected and then instruct them via the -JSON-RPC interface. This can be done via e.g. web3.js, nim-web3 (needs to be -updated) or simply curl your way out. - -The JSON-RPC interface is currently the same as the one of Whisper. The only -difference is the addition of broadcasting the topics interest when a filter -with a certain set of topics is subcribed. - -The quick simulation uses this approach, `start_network` launches a set of -`wakunode`s, and `quicksim` instructs the nodes through RPC calls. - -Example of how to build and run: -```bash -# Build wakunode + quicksim with metrics enabled -make NIMFLAGS="-d:insecure" wakusim2 - -# Start the simulation nodes, this currently requires multitail to be installed -# TODO Partial support for Waku v2 -./build/start_network2 --topology:FullMesh --amount:6 --test-node-peers:2 -# In another shell run -./build/quicksim2 -``` - -The `start_network2` tool will also provide a `prometheus.yml` with targets -set to all simulation nodes that are started. This way you can easily start -prometheus with this config, e.g.: - -```bash -cd ./metrics/prometheus -prometheus --config.file=prometheus.yml -``` - -A Grafana dashboard containing the example dashboard for each simulation node -is also generated and can be imported in case you have Grafana running. -This dashboard can be found at `./metrics/waku-sim-all-nodes-grafana-dashboard.json` - -To read more details about metrics, see [next](#using-metrics) section. +There is also a more full featured example in `apps/chat2/`. ## Using Metrics -Metrics are available for valid envelopes and dropped envelopes. +Metrics are available for Waku nodes. -To compile in an HTTP endpoint for accessing the metrics we need to provide the -`insecure` flag: ```bash -make NIMFLAGS="-d:insecure" wakunode2 +make wakunode2 ./build/wakunode2 --metrics-server ``` @@ -141,19 +98,10 @@ envelopes available at `metrics/waku-grafana-dashboard.json`. ## Spec support -*This section last updated November 16, 2020* - -All Waku v2 specs, except for bridge, are currently in draft. - -## Docker Image - -By default, the target will be a docker image with `wakunode`, which is the Waku v1 node. -You can change this to `wakunode2`, the Waku v2 node like this: - -```bash -make docker-image MAKE_TARGET=wakunode2 -docker run --rm -it statusteam/nim-waku:latest --help -``` +All Waku RFCs reside at rfc.vac.dev. +Note that Waku specs are titled `WAKU2-XXX` +to differentiate them from a previous legacy version of Waku with RFC titles in the format `WAKU-XXX`. +The legacy Waku protocols are stable, but not under active development. ## Generating and configuring a private key diff --git a/waku/v2/node/builder.nim b/waku/node/builder.nim similarity index 100% rename from waku/v2/node/builder.nim rename to waku/node/builder.nim diff --git a/waku/v2/node/config.nim b/waku/node/config.nim similarity index 99% rename from waku/v2/node/config.nim rename to waku/node/config.nim index f38d5b3ea..2447b6d52 100644 --- a/waku/v2/node/config.nim +++ b/waku/node/config.nim @@ -9,7 +9,7 @@ import stew/shims/net, libp2p/multiaddress import - ../../waku/v2/waku_core/peers + ../../waku/waku_core/peers import ../waku_enr diff --git a/waku/v2/node/jsonrpc/admin/callsigs.nim b/waku/node/jsonrpc/admin/callsigs.nim similarity index 100% rename from waku/v2/node/jsonrpc/admin/callsigs.nim rename to waku/node/jsonrpc/admin/callsigs.nim diff --git a/waku/v2/node/jsonrpc/admin/client.nim b/waku/node/jsonrpc/admin/client.nim similarity index 100% rename from waku/v2/node/jsonrpc/admin/client.nim rename to waku/node/jsonrpc/admin/client.nim diff --git a/waku/v2/node/jsonrpc/admin/handlers.nim b/waku/node/jsonrpc/admin/handlers.nim similarity index 100% rename from waku/v2/node/jsonrpc/admin/handlers.nim rename to waku/node/jsonrpc/admin/handlers.nim diff --git a/waku/v2/node/jsonrpc/admin/types.nim b/waku/node/jsonrpc/admin/types.nim similarity index 100% rename from waku/v2/node/jsonrpc/admin/types.nim rename to waku/node/jsonrpc/admin/types.nim diff --git a/waku/v2/node/jsonrpc/debug/callsigs.nim b/waku/node/jsonrpc/debug/callsigs.nim similarity index 100% rename from waku/v2/node/jsonrpc/debug/callsigs.nim rename to waku/node/jsonrpc/debug/callsigs.nim diff --git a/waku/v2/node/jsonrpc/debug/client.nim b/waku/node/jsonrpc/debug/client.nim similarity index 100% rename from waku/v2/node/jsonrpc/debug/client.nim rename to waku/node/jsonrpc/debug/client.nim diff --git a/waku/v2/node/jsonrpc/debug/handlers.nim b/waku/node/jsonrpc/debug/handlers.nim similarity index 100% rename from waku/v2/node/jsonrpc/debug/handlers.nim rename to waku/node/jsonrpc/debug/handlers.nim diff --git a/waku/v2/node/jsonrpc/filter/callsigs.nim b/waku/node/jsonrpc/filter/callsigs.nim similarity index 100% rename from waku/v2/node/jsonrpc/filter/callsigs.nim rename to waku/node/jsonrpc/filter/callsigs.nim diff --git a/waku/v2/node/jsonrpc/filter/client.nim b/waku/node/jsonrpc/filter/client.nim similarity index 100% rename from waku/v2/node/jsonrpc/filter/client.nim rename to waku/node/jsonrpc/filter/client.nim diff --git a/waku/v2/node/jsonrpc/filter/handlers.nim b/waku/node/jsonrpc/filter/handlers.nim similarity index 100% rename from waku/v2/node/jsonrpc/filter/handlers.nim rename to waku/node/jsonrpc/filter/handlers.nim diff --git a/waku/v2/node/jsonrpc/hexstrings.nim b/waku/node/jsonrpc/hexstrings.nim similarity index 69% rename from waku/v2/node/jsonrpc/hexstrings.nim rename to waku/node/jsonrpc/hexstrings.nim index 314c253a3..52dea5ea0 100644 --- a/waku/v2/node/jsonrpc/hexstrings.nim +++ b/waku/node/jsonrpc/hexstrings.nim @@ -1,6 +1,6 @@ {.deprecated: "import 'waku/common/hexstrings' instead".} -import ../../../common/hexstrings +import ../../common/hexstrings export hexstrings diff --git a/waku/v2/node/jsonrpc/marshalling.nim b/waku/node/jsonrpc/marshalling.nim similarity index 100% rename from waku/v2/node/jsonrpc/marshalling.nim rename to waku/node/jsonrpc/marshalling.nim diff --git a/waku/v2/node/jsonrpc/message.nim b/waku/node/jsonrpc/message.nim similarity index 97% rename from waku/v2/node/jsonrpc/message.nim rename to waku/node/jsonrpc/message.nim index 7a108b198..202e47755 100644 --- a/waku/v2/node/jsonrpc/message.nim +++ b/waku/node/jsonrpc/message.nim @@ -3,7 +3,7 @@ import json, json_rpc/rpcserver import - ../../../common/base64, + ../../common/base64, ../../waku_core diff --git a/waku/v2/node/jsonrpc/relay/callsigs.nim b/waku/node/jsonrpc/relay/callsigs.nim similarity index 100% rename from waku/v2/node/jsonrpc/relay/callsigs.nim rename to waku/node/jsonrpc/relay/callsigs.nim diff --git a/waku/v2/node/jsonrpc/relay/client.nim b/waku/node/jsonrpc/relay/client.nim similarity index 100% rename from waku/v2/node/jsonrpc/relay/client.nim rename to waku/node/jsonrpc/relay/client.nim diff --git a/waku/v2/node/jsonrpc/relay/handlers.nim b/waku/node/jsonrpc/relay/handlers.nim similarity index 99% rename from waku/v2/node/jsonrpc/relay/handlers.nim rename to waku/node/jsonrpc/relay/handlers.nim index 419aedb1e..e4ec71dd9 100644 --- a/waku/v2/node/jsonrpc/relay/handlers.nim +++ b/waku/node/jsonrpc/relay/handlers.nim @@ -10,7 +10,7 @@ import eth/keys, nimcrypto/sysrand import - ../../../../common/base64, + ../../../common/base64, ../../../waku_core, ../../../waku_relay, ../../waku_node, diff --git a/waku/v2/node/jsonrpc/store/callsigs.nim b/waku/node/jsonrpc/store/callsigs.nim similarity index 100% rename from waku/v2/node/jsonrpc/store/callsigs.nim rename to waku/node/jsonrpc/store/callsigs.nim diff --git a/waku/v2/node/jsonrpc/store/client.nim b/waku/node/jsonrpc/store/client.nim similarity index 100% rename from waku/v2/node/jsonrpc/store/client.nim rename to waku/node/jsonrpc/store/client.nim diff --git a/waku/v2/node/jsonrpc/store/handlers.nim b/waku/node/jsonrpc/store/handlers.nim similarity index 100% rename from waku/v2/node/jsonrpc/store/handlers.nim rename to waku/node/jsonrpc/store/handlers.nim diff --git a/waku/v2/node/jsonrpc/store/types.nim b/waku/node/jsonrpc/store/types.nim similarity index 100% rename from waku/v2/node/jsonrpc/store/types.nim rename to waku/node/jsonrpc/store/types.nim diff --git a/waku/v2/node/message_cache.nim b/waku/node/message_cache.nim similarity index 100% rename from waku/v2/node/message_cache.nim rename to waku/node/message_cache.nim diff --git a/waku/v2/node/peer_manager.nim b/waku/node/peer_manager.nim similarity index 100% rename from waku/v2/node/peer_manager.nim rename to waku/node/peer_manager.nim diff --git a/waku/v2/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim similarity index 99% rename from waku/v2/node/peer_manager/peer_manager.nim rename to waku/node/peer_manager/peer_manager.nim index 05ccf2834..a5fecce0b 100644 --- a/waku/v2/node/peer_manager/peer_manager.nim +++ b/waku/node/peer_manager/peer_manager.nim @@ -13,7 +13,7 @@ import libp2p/muxers/muxer, libp2p/nameresolving/nameresolver import - ../../../common/nimchronos, + ../../common/nimchronos, ../../waku_core, ../../waku_relay, ./peer_store/peer_storage, diff --git a/waku/v2/node/peer_manager/peer_store/migrations.nim b/waku/node/peer_manager/peer_store/migrations.nim similarity index 94% rename from waku/v2/node/peer_manager/peer_store/migrations.nim rename to waku/node/peer_manager/peer_store/migrations.nim index a008bb222..7c375bd7d 100644 --- a/waku/v2/node/peer_manager/peer_store/migrations.nim +++ b/waku/node/peer_manager/peer_store/migrations.nim @@ -9,8 +9,8 @@ import stew/results, chronicles import - ../../../../common/databases/db_sqlite, - ../../../../common/databases/common + ../../../common/databases/db_sqlite, + ../../../common/databases/common logScope: diff --git a/waku/v2/node/peer_manager/peer_store/peer_storage.nim b/waku/node/peer_manager/peer_store/peer_storage.nim similarity index 100% rename from waku/v2/node/peer_manager/peer_store/peer_storage.nim rename to waku/node/peer_manager/peer_store/peer_storage.nim diff --git a/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim b/waku/node/peer_manager/peer_store/waku_peer_storage.nim similarity index 98% rename from waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim rename to waku/node/peer_manager/peer_store/waku_peer_storage.nim index 858363234..4f9777380 100644 --- a/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim +++ b/waku/node/peer_manager/peer_store/waku_peer_storage.nim @@ -10,8 +10,8 @@ import sqlite3_abi, libp2p/protobuf/minprotobuf import - ../../../../common/databases/db_sqlite, - ../../../../common/databases/common, + ../../../common/databases/db_sqlite, + ../../../common/databases/common, ../../../waku_core, ../waku_peer_store, ./peer_storage diff --git a/waku/v2/node/peer_manager/waku_peer_store.nim b/waku/node/peer_manager/waku_peer_store.nim similarity index 99% rename from waku/v2/node/peer_manager/waku_peer_store.nim rename to waku/node/peer_manager/waku_peer_store.nim index 7d1d93eea..03a6f6e3c 100644 --- a/waku/v2/node/peer_manager/waku_peer_store.nim +++ b/waku/node/peer_manager/waku_peer_store.nim @@ -12,7 +12,7 @@ import import ../../waku_core, - ../../../common/utils/sequence + ../../common/utils/sequence export peerstore, builders diff --git a/waku/v2/node/rest/client.nim b/waku/node/rest/client.nim similarity index 100% rename from waku/v2/node/rest/client.nim rename to waku/node/rest/client.nim diff --git a/waku/v2/node/rest/debug/client.nim b/waku/node/rest/debug/client.nim similarity index 100% rename from waku/v2/node/rest/debug/client.nim rename to waku/node/rest/debug/client.nim diff --git a/waku/v2/node/rest/debug/handlers.nim b/waku/node/rest/debug/handlers.nim similarity index 100% rename from waku/v2/node/rest/debug/handlers.nim rename to waku/node/rest/debug/handlers.nim diff --git a/waku/v2/node/rest/debug/openapi.yaml b/waku/node/rest/debug/openapi.yaml similarity index 100% rename from waku/v2/node/rest/debug/openapi.yaml rename to waku/node/rest/debug/openapi.yaml diff --git a/waku/v2/node/rest/debug/types.nim b/waku/node/rest/debug/types.nim similarity index 100% rename from waku/v2/node/rest/debug/types.nim rename to waku/node/rest/debug/types.nim diff --git a/waku/v2/node/rest/filter/client.nim b/waku/node/rest/filter/client.nim similarity index 100% rename from waku/v2/node/rest/filter/client.nim rename to waku/node/rest/filter/client.nim diff --git a/waku/v2/node/rest/filter/handlers.nim b/waku/node/rest/filter/handlers.nim similarity index 100% rename from waku/v2/node/rest/filter/handlers.nim rename to waku/node/rest/filter/handlers.nim diff --git a/waku/v2/node/rest/filter/openapi.yaml b/waku/node/rest/filter/openapi.yaml similarity index 100% rename from waku/v2/node/rest/filter/openapi.yaml rename to waku/node/rest/filter/openapi.yaml diff --git a/waku/v2/node/rest/filter/types.nim b/waku/node/rest/filter/types.nim similarity index 99% rename from waku/v2/node/rest/filter/types.nim rename to waku/node/rest/filter/types.nim index 22b2ee4da..6b8fdb871 100644 --- a/waku/v2/node/rest/filter/types.nim +++ b/waku/node/rest/filter/types.nim @@ -10,7 +10,7 @@ import json_serialization/std/options, presto/[route, client, common] import - ../../../../common/base64, + ../../../common/base64, ../../../waku_core, ../serdes diff --git a/waku/v2/node/rest/relay/client.nim b/waku/node/rest/relay/client.nim similarity index 100% rename from waku/v2/node/rest/relay/client.nim rename to waku/node/rest/relay/client.nim diff --git a/waku/v2/node/rest/relay/handlers.nim b/waku/node/rest/relay/handlers.nim similarity index 100% rename from waku/v2/node/rest/relay/handlers.nim rename to waku/node/rest/relay/handlers.nim diff --git a/waku/v2/node/rest/relay/openapi.yaml b/waku/node/rest/relay/openapi.yaml similarity index 100% rename from waku/v2/node/rest/relay/openapi.yaml rename to waku/node/rest/relay/openapi.yaml diff --git a/waku/v2/node/rest/relay/topic_cache.nim b/waku/node/rest/relay/topic_cache.nim similarity index 100% rename from waku/v2/node/rest/relay/topic_cache.nim rename to waku/node/rest/relay/topic_cache.nim diff --git a/waku/v2/node/rest/relay/types.nim b/waku/node/rest/relay/types.nim similarity index 99% rename from waku/v2/node/rest/relay/types.nim rename to waku/node/rest/relay/types.nim index 680ff2f03..bf7ebce90 100644 --- a/waku/v2/node/rest/relay/types.nim +++ b/waku/node/rest/relay/types.nim @@ -10,7 +10,7 @@ import json_serialization/std/options, presto/[route, client, common] import - ../../../../common/base64, + ../../../common/base64, ../../../waku_core, ../serdes diff --git a/waku/v2/node/rest/responses.nim b/waku/node/rest/responses.nim similarity index 100% rename from waku/v2/node/rest/responses.nim rename to waku/node/rest/responses.nim diff --git a/waku/v2/node/rest/serdes.nim b/waku/node/rest/serdes.nim similarity index 100% rename from waku/v2/node/rest/serdes.nim rename to waku/node/rest/serdes.nim diff --git a/waku/v2/node/rest/server.nim b/waku/node/rest/server.nim similarity index 100% rename from waku/v2/node/rest/server.nim rename to waku/node/rest/server.nim diff --git a/waku/v2/node/rest/store/client.nim b/waku/node/rest/store/client.nim similarity index 100% rename from waku/v2/node/rest/store/client.nim rename to waku/node/rest/store/client.nim diff --git a/waku/v2/node/rest/store/handlers.nim b/waku/node/rest/store/handlers.nim similarity index 99% rename from waku/v2/node/rest/store/handlers.nim rename to waku/node/rest/store/handlers.nim index 57174da4a..04f47c9b9 100644 --- a/waku/v2/node/rest/store/handlers.nim +++ b/waku/node/rest/store/handlers.nim @@ -10,7 +10,7 @@ import json_serialization, presto/route import - ../../../../common/base64, + ../../../common/base64, ../../../waku_core, ../../../waku_store/common, ../../waku_node, diff --git a/waku/v2/node/rest/store/openapi.yaml b/waku/node/rest/store/openapi.yaml similarity index 100% rename from waku/v2/node/rest/store/openapi.yaml rename to waku/node/rest/store/openapi.yaml diff --git a/waku/v2/node/rest/store/types.nim b/waku/node/rest/store/types.nim similarity index 99% rename from waku/v2/node/rest/store/types.nim rename to waku/node/rest/store/types.nim index db86318ec..92da532a9 100644 --- a/waku/v2/node/rest/store/types.nim +++ b/waku/node/rest/store/types.nim @@ -12,7 +12,7 @@ import presto/[route, client, common] import ../../../waku_store/common as waku_store_common, - ../../../../common/base64, + ../../../common/base64, ../../../waku_core, ../serdes @@ -68,7 +68,7 @@ proc parseMsgDigest*(input: Option[string]): return err(base64Decoded.error) let base64DecodedArr = base64Decoded.get() - # Next snippet inspired by "nwaku/waku/v2/waku_archive/archive.nim" + # Next snippet inspired by "nwaku/waku/waku_archive/archive.nim" # TODO: Improve coherence of MessageDigest type messageDigest = block: var data: array[32, byte] diff --git a/waku/v2/node/waku_metrics.nim b/waku/node/waku_metrics.nim similarity index 100% rename from waku/v2/node/waku_metrics.nim rename to waku/node/waku_metrics.nim diff --git a/waku/v2/node/waku_node.nim b/waku/node/waku_node.nim similarity index 100% rename from waku/v2/node/waku_node.nim rename to waku/node/waku_node.nim diff --git a/waku/v2/node/waku_switch.nim b/waku/node/waku_switch.nim similarity index 100% rename from waku/v2/node/waku_switch.nim rename to waku/node/waku_switch.nim diff --git a/waku/v2/utils/DEPRECATION_NOTICE.md b/waku/utils/DEPRECATION_NOTICE.md similarity index 100% rename from waku/v2/utils/DEPRECATION_NOTICE.md rename to waku/utils/DEPRECATION_NOTICE.md diff --git a/waku/v2/utils/collector.nim b/waku/utils/collector.nim similarity index 100% rename from waku/v2/utils/collector.nim rename to waku/utils/collector.nim diff --git a/waku/v2/utils/noise.nim b/waku/utils/noise.nim similarity index 100% rename from waku/v2/utils/noise.nim rename to waku/utils/noise.nim diff --git a/waku/v2/utils/requests.nim b/waku/utils/requests.nim similarity index 100% rename from waku/v2/utils/requests.nim rename to waku/utils/requests.nim diff --git a/waku/v1/README.md b/waku/v1/README.md deleted file mode 100644 index ea16cfa6d..000000000 --- a/waku/v1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Waku v1 - -Note that the legacy Waku v1 code has been moved to https://github.com/waku-org/waku-legacy. diff --git a/waku/v2/waku_filter/README.md b/waku/v2/waku_filter/README.md deleted file mode 100644 index 8fd844684..000000000 --- a/waku/v2/waku_filter/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Waku Filter protocol - -The filter protocol implements bandwidth preserving filtering for light nodes. See https://github.com/vacp2p/specs/blob/master/specs/waku/v2/waku-store.md for more information. diff --git a/waku/v2/waku_rln_relay/constants.nim b/waku/v2/waku_rln_relay/constants.nim deleted file mode 100644 index c0632e25f..000000000 --- a/waku/v2/waku_rln_relay/constants.nim +++ /dev/null @@ -1,56 +0,0 @@ -import - stint - -import - ../waku_keystore - - -# Acceptable roots for merkle root validation of incoming messages -const AcceptableRootWindowSize* = 5 - -# RLN membership key and index files path -const - RlnCredentialsFilename* = "rlnCredentials.txt" - -# inputs of the membership contract constructor -# TODO may be able to make these constants private and put them inside the waku_rln_relay_utils -const - MembershipFee* = 1000000000000000.u256 - # the current implementation of the rln lib supports a circuit for Merkle tree with depth 20 - MerkleTreeDepth* = 20 - EthClient* = "ws://127.0.0.1:8540" - -const - # the size of poseidon hash output in bits - HashBitSize* = 256 - # the size of poseidon hash output as the number hex digits - HashHexSize* = int(HashBitSize/4) - -const - DefaultRlnTreePath* = "rln_tree.db" - -# temporary variables to test waku-rln-relay performance in the static group mode -const - StaticGroupSize* = 100 - # StaticGroupKeys is a static list of 100 membership keys in the form of (identity key, identity commitment) - # keys are created locally, using createMembershipList proc from waku_rln_relay_utils module, and the results are hardcoded in here - # this list is temporary and is created to test the performance of waku-rln-relay for the static groups - # in the later versions, this static hardcoded group will be replaced with a dynamic one - -const - StaticGroupKeys* = @[("2de8ad2cd30e993ff870a31596df4161343d6f05cfe8501884b807eb22dec066", "11ddb7419b09e862027c0ff978d60fd8fece82b31ede62f5e5b931d9986c383d", "022eb3ca06ca2634c5e5a63bde6cc40455cbdda928236f6ca2495f749172ea53", "0d8bae46e9af5072c2042a4c6960fcfcb5ec945479a4683827aaf1ab8a63e07a"), ("11ab22ee14e4f53ca76120588a33513a5f212dfa6e24175826cdea72482723a3", "263555637d443f73e6ff88ac5fd95cf1c525e52005ff080f2767a8e56fcb86f8", "19a76ef9a5a868bec4b62434e437d90680e36b9d0099302a9adce38a519c7040", "07061c488d0103f01b7334cd175dcdcbaea4bcb18a3847cd9186866536d246d0"), ("0acc4beab8a4fe06b775ba52b36d7d8d7890fb62da415277de02bb8d7cbfaca2", "06649c699e795cd10588844aaa481481a718788ba7a138b413f7c735a0f76a3b", "00a0400ed331a6a74dbf3e361f7df612c318f1ebedae26f739e80827e36bb5df", "0cb30c063d0363d5547bfd01b62500b61d2f6d434d7728d96cd7b8219175d85c"), ("04d56ee5bd17cbda45b2fd5b85c2a147c1d91ac675eaee991859abe314e8509c", "091b97505778841b632fbe6cfce2552e091ea1e71ee0266dfd542ad73e4da476", "2bd71275649625675d418d46347de784bf93952d3b29cb9e24a95962c570c3ff", "0a54271b9bfeeebd7467b4306aeef7b36ba71d4eaa6ef4b6ba311872d2cc1d4a"), ("215833d966a2d3650c3b3d38829d2dca39b4b557c5e35a3783c41436d54415bd", "28c7c326b89a097da2a3254de930f98b05c3e1a1f6909c20afc4ef67d58948fd", "23d336beac7ea57e699537ae0270a3d7dd7476bb59835468be0b46b336513a00", "05f5d750eb243da48f07e3629451068fab8f9d7c551906af0caca00d2c94c50a"), ("24520de883497eb171445202d7a82b98f6afa3827bb8064dd568e0546d08f49e", "157ec42e00e8d810ea94f834541a3d0bcc6029c4115269354d3baceb084bed9e", "0954402b0b26bdb7a2da1312cf65ef616dba71fa7c1459e421def2337897116a", "2bf5d1b7e98b51ae9cc300669d6e6d2a6c8d2de575519c6d53dda0c0d0bdde30"), ("295fa4839e238b1410df304a44e2b59234bc9f87c1e8c8bc09075c64ae16e2b9", "2f90313f25959ed8f080c5a54df6991e460cad3d6312e3b18d029ad05f8e28a8", "0f0c817957603df4edbf7cc3a046e68f09ea7870a31192c48f1fc12e45032031", "1839a530aa56b1f50856a85926c1842e678754e9c3dc059e34eee0bc70f88dd4"), ("1d0c99e03b6aa94e01f29decd6148230471a5b8e60753b659ed2a891c4e89698", "13d29e820f34e02477c7713a246e662705f33c92dc2e69695228d593e115260d", "006fe254e1c8fbe34555e51224ef97f0ea4eb005168cbd8885a5d99ee73da095", "119b0cebca96186bc219066d781258e04e386097f3c03080a494ae8d01e2bb31"), ("217fd32fb7bd401ef0229aa2dd1c93c591772bc970249e52621f76a6d529fff3", "0113d56afd15a5ec23eff9d434f4547fdbb3c82029a622391585f5000633f583", "1f677a1bab221a4d5d1c281b635133b9376906dceab0fb36510cb0c2b08efca2", "2971c74b6c9f324a30a83b32d211850230250ade39740055576f0dc85fb98cf0"), ("2d420d4da783d075faf6aceb5405766f49d08a06a57932f9e0fc58ffb41b4198", "272849724f0faf574008a29597fa21d8f86cdaf3973cfea19a50b59119621a3f", "18189e9e10e820cf3c667c8346b9527213ff3a1945f687138316bb0bb5e65ca4", "056ca699b1c87b5e8598665ef129318935dd3e96492b79113d2451fbae9f1cc6"), ("1fe33b9a7284967bcd69b14f648a7e4667a59a59e030030abc12864dcf64a681", "1fa7f7a31f8d313d919765e6b4a0e681ca3e1e6f95cbb48d893fad389e1d8859", "2692bb4ca076936d3079735d5c9a6add5a1f02a968b00599a1478114a04891d9", "12b4157333b5b07b785db8a30c73b5c474c5f2649ef47a63d78f1b998cbf59e4"), ("1d053812ffbe4d4da6e21cb3b8728a60bb6cb2420e29998e78c4ce965c35ec8d", "09d840b025919e2c2b381ecc5bf9fc2dd599e83ea1c2825d17299cb34ab9f6b2", "1824d455c9577d65db341e59ebc7b6cf940bf54af49ae800fb0dc5f32014d249", "2012a26ab7b783808fbcf8b2cc58158a2db725d277c9520b65e5d36e5dc6b052"), ("132a653c9148ae4f992f223df26541e11d39953e273e47a863ba631c318090b5", "20010c72714dc65285a0201f7bb1cf464e030b0fbf2d2be3177667066a9d07da", "1b3dd5b82723da7f939d882125322f91f74279d0cd858c45e09011a51a4de962", "2601a3ed3ff4a7718f0019a3939c08fc3a9a5a8180a68daaa7bf34cc486bc757"), ("2f656d8a0c07ac9b2de82be9d3cbf4535cdf169cbc2b355155d9e0ed256cc33d", "1f7c9c1aa1dca7354f135849012aa5968b37ae729b2847694f65355895d41984", "00b8302bd41850608f88ef1b0e6949b08e850fd8d1044b3d23b7224aca5ea7d5", "2c1d654b251d138a3a6be82f784e54b05ce5b6501ce2d59b89021d20abca7516"), ("168c45a2df3f7f5dc9305277cd8b78d023f817ba5ad198a1ea6b1f23aa002478", "0f50c493b68eaf26cfab59c903ef583f03348d9e839806af0522759d64afac60", "2d1e68d056c1928fe7a44b96cb2333888ef3a169be54f4dd5438fc0de23554d7", "10e58fa7abc99dcafc5f4e08181c095c78aaac093e3a5c5e356e8e53b2049a99"), ("0b543803e520e8ca645d8d324399c14e5cd1e6d5c2e371f2316beda99403471a", "0ae42ba2beaeecc65174318588f875ed9d4bffdc8a40cb4862dfbbe39254dce4", "2a5b829ec8871ee4260f83688978295a5b553cfb92a8e307bcab0a9d0e2d9320", "0d67d9161644b0a09e230f28e95b2f70558ae09260383b97b6f53bb791e72aa5"), ("273961e60d8b20fea6b34446911f6922e95b5948f0c673f260f8b2e40727ced7", "0c0cd7f50d1472d3246ae86f605e3c3adc8865c8ad4799ad0f738ac710f71661", "2764d7522256fc102b5ec886e11938cfbae7b85fddc4b8ee2b40180178bdc118", "26d8a135115208aa2321b57befda6602fcc048cb988426d1d2f4888aa7b6a652"), ("2d6d3b281a2d50cc5bafe3255c353247642966092a48ab570510c865c20f3691", "0300a6f79f78c1e0dbefe938800922046fc2d5ffc4e7d5dd9fc3958145ad7858", "0f7123bb490708bcdc2b16685ce3515fd1c62680e3cd628c15ad663bd1dd10f8", "1ca0d6fb94e3acb89299d8c5724f55f14eb82875d5c6d3e769ed2afcf7ec3b6a"), ("205b991d7685b23c17abff32b668b09a1236742c0f3b35f4bbf92f61cbf2946d", "0cf3674c678049376d9e0c24e6fc8c1ff7e5cbd00971a23aab01efe1dca3d712", "27bd23a401958d102829f7cc4f2812ffb457fd5d4af84d603bb6de2cd81a2d0a", "26feb04420e100cb694a9e54cc4bc09848c99981e3d1d240a299a84fffec42bc"), ("1230a623220b9c5246888bb15f98c646c85adba671bedf1facc7061f7d3a2cdd", "1e5da8d9c840a6fc6c46616d1b49d8c83328f3cde51ffb2a6d418da63b0827c2", "0ecc20de9b74105a5da2db218396997059e9ed61c2a2aaadd278acf4c6d715b8", "03fd0919740fb0d2d71827d1e904ddc23f386706edd61dfd88cea89c87df5620"), ("0116df196a2fbcaeae5ec4a5ae817aec779881cf9aaeb315f8906d6b9fad453b", "133f0939bf05bfa523e51c6e9e4c96c125f10dc733f5166b0eca1c902a08a698", "1784c2ec594b121b2784ea4a9b44f259bef8a499939406d7859041226bc9b80f", "06f5089423022496743bafca22605c04e570887e349d109aaa3342cae557879f"), ("12c80c6764d68e018713802998171001446c58d493b3add50643679bc506a894", "02c63445f57a532a0fa201eeefe1a5cc065f301a6e01f339c1ab7a2fc3c346b7", "1487669cc19664d349e43eecef1202b4706d79baa0fde4a44396b33d8232c6f1", "21c5219a7a414bed8e4a41d6586cd0791fa512166fc4615b643fb26d24cdc16e"), ("2f4ee97ca44c2508af67ef15ad5bf317adef767f2ba80ced53cd3a6136cdb1f8", "2f903d2bfad210c4556c790e271af0f4979c63516b6f61cfb34eecedfcc641ec", "1a5c10c4cfac10834e5dbe29cc7d0e9d07c25f90b9f528fe87fcbea3b3738c57", "11587341d004eb538887cda6cbb2ffc33ac819cd4884eb06585a706c4efc4228"), ("2146e9aac9c2eb448f738c0c67069a8eeed3e4de24e76aaaf4ae1bd94637a35d", "190fd021acd70b4c4465048dcbb2f42178e84a2586672a6fd29653aadcb7e580", "1fb396f784fcf88e50e6f005d1097916f62262677caf055e867a711f9486a732", "0489a13f0398f99063227918013c9da644565e62896d97ac520ef99c35fc0ca7"), ("2dfed889b0b401205fc5e0b69728a732fe6aa3a3abcec3fe55edd671041344e5", "16886eded16061974adc5889a7a289283bc9c4103447fc971fef722e0627d8bb", "1ec4c39a2ec0a2671ec26045f307418b7d0bd92076b5a5e5997f13a08ff34f82", "0829b6f724b6d33060c3545c04708aff599cfc783aabb2cf50395a9de5505795"), ("0dc00687f68023c9f79e4b01c94caca14a318aa24123f924eccadb5acd3ae674", "1a6a4b9d8804c109888b1e67c31f19e816d485077722c57377dc98462882a778", "0771ca89a28322686f809dff401b626a205f05d98086f194c9cb0ab697010004", "0a3d44533de845efbd99458b03d0fdad1c94c0e94ff98203141906c316943caa"), ("05a6550fa6a01e2ee1eb13676f3e1d10afdaa571555a85e6c36749948cbe5fd6", "296c1a3f9a2dce1ba04e126883f026b96e3b24c7f20a2622fefa80fec566dd72", "0786dafe3c7aa093f2a6d474a62574cf96ac755c9b7a22138000a4d86d0b6e28", "2d82b28b0fb43d8f66b0ac548c099f5b03811f5fd3d64e79f48fc6a11fb368e8"), ("0d3799c90302e2622222b85f6919062bb3cf20920ab42a515f047bcbeca8bfcc", "07945b9c2ceb366148736f997ea3567b2b88bb7b2f1bbd7152f7cac3a15356eb", "0cd858026c5a2a8fcecd92568fae21bbae89c0de60a966edcdd842dcf20b5bb8", "0080ead6d9c19c515e29072519d458ce942337e725dcacbbe2a0037a7d357c1e"), ("1aadfd7495ddad900e6298f8e3b05f76b1b38790982f00dc1cc3c2a0d7b7a0b0", "2d4d02617233f6c596469a454225d5312209f83d9bf7ef7042986f4bc0d2f263", "17dd395569064dac45abac3f165dab42b4e2522d4bf3973d7f427a9895382598", "0a77dc303ee2cdac0b1f0afc6d033ba1fff4d3b4a5d0585288fc0da640de4b36"), ("15b569e4a54a91a7c18007a46fc5d9bb2367b383a0e1d2327b667cead37600d6", "222e9a22f44cbe8e704ce52aa4edf54dc98bdc7240911d12c4f41b56dcf6edfb", "1122b5efe8686520a0e24ba534ccec09428d921d9bd290284910f615627e0dfd", "0d5bf9b92a7a3d942a68773b0fa3ddbb31f8abff8c1cf7c175b03a73bb5f04d3"), ("09f5e4a584ebfd2bd07837020ebb47ba881c864da25a96c6c99ebc8046073651", "26b819e34bce5e8e20acc0a8370385d476307c2512a1655d550ef16230df6b39", "1ae05de2fb9296093f5dd47502627c35a50a1a0adfe59e2ca1fe09d0e9ab5192", "09c90c0a107d8798593de1764f90fbace04bc8ac2695eda0ed3011b7f6084a29"), ("0f5503c833ae007dbbb53bc06c6abf4c7c68f52996abb2b115e870544868be01", "2760cf6b2471fc666674216dab356c6167e978d9b36fe871caf959e32254f6b7", "2def3b0bc44bc2d52a6f3e66e43b4a8aa048c66260ef7d8ff8b3ee9837a1b423", "0cdbb3cb827cd02819f8a08149bb9bb957a180aeafa18706df01e0edc41a89eb"), ("065a3762cc9fd71b13ab5dbac9905d73b9a2adafaf5379e0f6d1a3b788735a83", "09a50a6e15d90468e6ab37b988804e44308530a2d9113a62607bb436cba7d21f", "08fe67b723b3c7d0a3eb1e041d1fed917a21750c966fff993c648b1fedc90083", "0808d4a78df10cd77889fabc546147acb93f94ee617019531719ea52a853bcb3"), ("2adbce35c09adaea1f97a2fc639e1f2a1a975ccfee9509cced16760c7c9a75c2", "2cdeddb0628dc4b46d60ae9c6fb2a7c3f7fd04689851d91db654f9ba30d77522", "061ea76a71766cbdab24bb18e513dedfbaecf7dae6121d90e756360b5ca21a76", "0fea769786c8eb3e48489a92e1aed1965e61ee40be7f3fa3c15544fc6cdde7f0"), ("138227c591792141525d9a128ab021f427c968b41927c13110dd3debcd5bb79b", "2111e1d4acdf7b4b0d46708deee5f5a4b93d7138798245075e591ef43af6c86a", "24e8c1dd992d18ff1646a911a4506ae64b59adf99a757191d8b15f294f23d39f", "056a158c1aac62d6e5587120a40f84716583bed992d31399b31a8c5ff48811f3"), ("1cfca16420e617a17fe29ab96b468f5f6c63ad0a2fcaf1627ae53994bd9bf6e5", "037c3af3a9591d1cffde88b2383a27a3472e219c14545e8975a5b02bd7db8735", "1fdb4510b85aec27c60c977e1eb04318c560549a8237fa75788305e9376d1c1c", "244e22cc2f20498c300bb6d4b482e0fb0b70cc38b74f100d27b7f1a536fc3b3f"), ("165c1c813e61d12e8203a378b681a6e56d38a152e3ff39ef35ab8a74162f6739", "18fab342e96343933108180ed6a96e018e9f46764379bd25ec53a02625deaeb1", "0aca6ad6b91aa0e4ad51b8e32eec62c770d2dddf69381010020b4c294834204e", "227bd6205ee4047bf5c16fbe8914e69e41d28b92c9d2fc901319bf6946aacdcb"), ("0aa16c2106010e06debee4558bf893415c689ab661c9f1538e62350315e7343e", "0305bd43adc89116b436e004e0fc7b49975631339dd0e5e608229552edf6364d", "1e37cd06cce3965a566a2080b2087be3e85af2776f9f293c4bf2edb92fd94102", "037931a869e246df195a3f367df6221abcfba5f4a230a5d335de6b3f1d4af07d"), ("0e7ba80ad7b271230438317de4ee9f2a3789a495d85ea75e2320f3dbdddcc3bb", "113d9847fb222673b086881eaf6e90a72ca9cba676d22d3e4f3644c8e8244b79", "1c10febb6e6bc82aed81c3a80ec34aa6bb7a14dc45eeb1272e7cb4d19c3eb1e5", "1d657c9ee4a8a2b31a02e6f5ad79da3b71f22685da66d48be63b8c96ca7dca01"), ("2f7756ac206f83fce0e090a93f81a08563ae66594415db7a86668533ea19069c", "27d4c173a56e32bbfc470de7380488fb03c4783c1465a6f6f4ab9d9be7b81337", "2bbe945d4f20dd95b444343b86cc44a69b91a26e60c1f05754c76941f200c28f", "2e046ee0d56a92d75055b7c72766420cac23ee530076fd81917704141e4a3037"), ("25a136bee3451a9bbf51a30e507eb281cbd6a56f160a51b849643d0b054e703f", "1839a68781e571545fdab3e8b04f9997006896fe580ce0e40d5c0f30a17b743c", "18c1217077424801cbeff7c71ea24327a3c7eaa01c43681d14f045982afe6869", "04cff8f2dd2248c6c34f312884af6b7ec6875570e795daf7cdf3b302a2f8d360"), ("149975c4626c7c621e05af3c1059b90bab8fdbd8d11378343f8a13d36401e88d", "1978d1d3ff6483f9b26adfd2fc287d4a3f4972a9a00ae4a16490807c5238b6d2", "26b04d8f9d4071eafac8877bc305533f241cd03e857ca84bd689bdbca7f9f7f2", "2e2869ba9d0894a917ab3a8f5c03a6aa92737a2bf8739bf894c012168d730e33"), ("05be359a5d595637d1f4e9948d17a611401a8ad583aa78d73aefe5cac3417e68", "265dacea532a6793395aa5e9cd3c2f19a9cdee9bd2229f9ec0ee0987f178439a", "1a28c25b66f03ac6749551d2a6056466f85b7b5e5db738110913734f6bafa5b6", "2d55b1ac28d0b2baf29bfbcbfde960f1bdf18bf28d52bf306d774a64c5a04faf"), ("0acb23e044e518a88df2345f9cb6e331520f89af0f2c092a09b63716d83b029c", "15d2bc8ded95329ae9174bc01a4c12a48aa3399441dc1ff408b4fdaf181634d5", "2ccd822fd559347040e4fdfa2e7690d1af03f3d523cac219a7cf06f881f1859e", "0bb7770a6df49da10b3e2babe1f5881d2ef4f40e49d99a6a848ec1f2dca72e4c"), ("1d9c9f55deea40422f37828e0816fe18b1acd665e96392d376bdec709d31862e", "02f9d59214040c035861d50b4e238e47a75460d03d58a217892f89c63a9685ea", "12cacfaa5924f4bba951f13cd3df068f2c11fe99166a4c59732ab1adeab418d0", "258e4273c1c463d211ca2a87866136192b0c0564cd91bf0a4fb037fea0a781e6"), ("1611e0ef464c8903e6b6b23f9cdca49a09d66c1ccd4cc113f9a6bd6b20e9d1f1", "0744b00b48d373789adbbdd0be955e4887e2d68337ef477a5defa2b5ce6eea84", "162a1e3e6f8b7e91e8f3b44bf83ca18909190811bbd28b579be19b385c7bb524", "16ce06eaa8ef6e70e30564051e0f6d2b5752142cffff3937c6a33713dc87937d"), ("115d5f4bc2dd803a71af2a43a230115dc2725a180beb7df1b88a2259e2053412", "10daf1f8f9e13d9ec374327c2b51b4cf2ba45e57ac2a45694aff64f6916aa889", "18433218813243ecef035e369a64b46a704a13fe6c80858c6ce90034f6357bb0", "04fdbb0aa628440f438a57f0f213dcda509ca8f1d0cea93556b30d4d01c5bc10"), ("09de472ca52c06d076c3798403302eaa75803ed28e4d81f63f2bf488b69a88f6", "12759012df29f9c911a8b44c41d13974b7be3591eda2bb6f75ab41799e4712ad", "13d7626694617b0a492c90996660b665bf093f931891663bcaf7084c7cf59509", "15a646e677c3e76c021715ee48ea0430e1f279b739f8d8a129c46afabd26290c"), ("1bc3c21386512fd3aa169484671be058fd471f9d4a899a6be4cc16a83b483c8a", "07e711c6993c9f370fd6100b468b7300ed1fbd3238712cf8e65052672171ce2c", "025e58dc2bc1483098410d9b3c4a17eab6102f89a6183aca299026b9f1615b16", "140229fe33aab22020f29e9b2432ba65065e4d6bd1494c359e6b086266f8aec6"), ("1525b676c8981f9c5e544b44133e94f312baf24b42cbd459c41f92e24ea02cef", "123a0dc832ffcb70c94f1cf1bb8f1c7809f66a4773fccc3006d3110e60414f36", "2a645289284773a2efbb11823419b4ea22cd71ab2a8b814139e6375ba459acdd", "2d5105e8567086d71a2cce2046c449768bfea36645be00f17e4339fed306bfed"), ("288857614a0f17a228c98105ae993e48bcdb25a876fff0a2b9e1db52aa7cfb12", "28d0e7dd79b3df14a6112bda58932a8a4ae65180b614919e7a8f32a3eeeeba39", "124d335735701f8f2e7af829f5b326c053c7fdc0bfbe9299f0d2cb4bf432f5ad", "13a602a334d937687a5a7710dd7085bb342dd5fc9f2261fccae20cd39ea7d45d"), ("078e9560c3ac30232a3450e8f9a487c55e6e37728dd1abdf5ecebc56a2f1b691", "24d0478044359d16d5477892983d609a261f84b444214f2325346bfbdcd8452a", "1ec8e1362fe0816a633a02d4f1e80df5ad3dfbbc5fdc91ce3b4600e6e969c551", "0377f7c3c95b5799fa0bf03a76e7b85d436154f680a9eeb6b9b107a214787786"), ("03da01bde649b5d23817740ef1fd2afe0d8fa3aa35add446e3c2165a5ee20c7f", "11c1a1006f436bb062d34cbfd4f65a37970c0cf4375b968e9afc39dedec5a1f5", "12ca4ee75899ddf27179b38880b4a0019b3d24cccd220a17ae2924b03fbd1594", "2c41274935645dadfdac964a5845201c4962560ee8cc4932969b374ad55ea4a4"), ("1acc4748897f2319e9840230c603fee339eee1ae480317666de5bfe935b17a92", "1adcd69d17130e4e2d9349457735ebdf09d3279d81e577877ea969025647062b", "05b9178f7b8962377d922cf18942f88f994369079e7107d79f48b1c7ecdd0f75", "15a764bb5eb2cf17cbc6eddd7479e85d2de5a53d8961ad7e47e7481739580ae5"), ("28045d48040ecea6e8ffa983f27422c12c9a32b6f93259c91d37b1b7282085e6", "146ac2fe6a594fbb4ad66cad23becdce68461fbfe9b1cf5e6d160f2e3b47299b", "1160d22d7b3298f58f65553d1332bf93669d26fd550b48317bfaaee8d5df09f3", "2ee983b7b21cde8ebdf78a4461abd510496f940a8524569e4df0203e449a415a"), ("1a67133e1153ca967805fd36a138b113537f2dcd6bee07d89de2549541848fe8", "1a0214be9ac7f2ecb4e60953efa1d4da075e180b90de1320c48736b502272134", "27f3091c65ccf894f34a37a47c62368725969aaf0f83f11dd8693f5d3cee06ab", "0f09d248f2e5542e69a5d3f8cc4fdf88603fb563cb12a861f7511c98028a20bc"), ("03a5d3830dcb353dc60546ba371901c2546bab426bcfa7a3aab986d67cd75a36", "01c05ed73a97503b50f58f265ea6809ba990c3fef2dc4c7ac364524c4682968d", "1ece48a1732f79a80629222c9183f5928c96d4cad35bc67ce066e2db5df1df18", "0c897ca901854557c05b01a58d15d4e39ea85f69840c29cf5a7077420a2014f0"), ("30482bfb8cd460b37ad4b18d41a3ac4a19678bbf4eeb23df0a1f17ae293c2e59", "1be551bd7b10a217a68e982369e50e686642892bf52023a65fdb665a08b294d5", "14d3a66b20b691f7f5c676c4496bce6eac351a2fbdbb0551567e01682cbd563e", "245019483fc1811216ef3de643147c9a4dfe0c305165fa3dd5082c2828ae781d"), ("0b9f0b77879dd07829838d350ea748dad8315df92eda8a09a06ae803b52433e8", "19d0ca56369e4f1bd8328de20ce700bda523f3061b9fa27c6e41c72707ef84f6", "2d731edfd266ae50b1ae70d22e3a9cea52bf052318240c6ff43ce25e0d26ac59", "2115a2054a4a502f18bd51c023220afae7f666c98bf27fdc7bbcb98a7c3220a7"), ("053d4993e28cc2ccc565bf58cdd11707fa5a23bafacf48e0738851b7dc7cba86", "0b936c7981c946de2f6a212355f09abd15f17ee7cb1d839f68ce110484ad9b1d", "24d042c178799097ad2f73892cd2a667c54d9a27df62db765d783ecbc0e632e5", "28f150ec05f4aac631cf20bf530bc08df7dab9b6372df9a01210ea7ca68a90d9"), ("0bb355cf5de29b2e15823def2571259dc74adc246e14bb815a31f29517a3adf4", "28ced5bad892909a16d7c1ee56eea5400d816a126e4e44fbbe8a48f1db8d014b", "1f64a07121a479444254e65b6c6cbcb94669fdde074f598b653654a62294f2ec", "27e1c7393ef111b8fb531cf65c72009a1b4ddbdaa8708d709a835652a2a7d49e"), ("2f673f5f870d491c69c0435ee13b4c8e861e6eeae494416ee9429a78ead553e6", "13742c523d2fd99a3082fe6556c81ed61130e2965e5aa6a6ebe1b962ed1e9da5", "2eb3fb08e15d8a2f09895eaf0c599a7177e37b2eaf7e24b7a36a9e48c7d975ce", "138c90876961451a808920cfda3c2768d647e9b6659aa45888091d5b41c92c01"), ("1b279e5fe04439739a57fef9ae89460ebfc9b25e9e14823bf0d0ea60854e3655", "0ff39bfc718daba8ffade09ee5a296dfd844a65fdb1ba041991581bcb4a9d1c0", "259de05683020849eb06d1416da4b4e5840af03316cf206ca01a30ada34582b6", "1354c7a215ee36091f67853a1300821c742d31a128542b1b4bfc0d849ae84369"), ("0a42be19ff6acea717f247d0ddb3af24a22fa35b05d1f98bc99de3e1906885a7", "0b42f7a1b093dd2a6e193a48c8147b0042cd2a33b4947cae1df0da22061b4f69", "144c7d59971c8c57497f3dc42dbd3465305c181a5bef7849a0e5aa3fe765a2af", "2a8968087625cb77ac8ff378c126b18af6af4bc3853b42dfc7b7f13d9ed2b7c6"), ("2cedf85a730cf1b685beda07c884488ee6af197eb48e484db7ff463405ea9451", "2b0f7c30e47a315a1621a962dbd7ebd9dace0060f5ad57d669eee0730d1b642c", "2875faea6e2d98e623589585409a16ffb363c30daba00e9f9c04bf4b418cf286", "1b0af6541739aa72b91b2da05a8efa65cdb26a1d8ecc0cc0c2b75a8bb5724196"), ("2ae8bf17e5431c4e490ee932e16cb4d9e55d16b0d3ed890ba7a4c793158eef10", "19ac467898482e9dac2baba1562ea504a37247b72f93703f7bd7bd1926909ff7", "218201f9512cbfd8afec322da50972558b183a50a9fb8c7eb66ac8ef0ed5bc18", "1175ad4f6fff309ac6ee415975421776a910ce721b125bfd027dc70422d4a000"), ("15d86af8963d33f8d74b7baacb24a7d05ca826ddfbd9e4122a4afd51d77a949e", "2eac91f3d0a76bcad0d776d4730cfd126ce6ac45a2a81a05eb65d857490108c3", "29233274802a5b2d8041635463b156d1cd779f0c5009007e4b11b17ce959cf20", "11702232063b55b92cc7491b3a1e28719be901a4a04efc54f844b322fa7ba85f"), ("0e534fdbb94b67fab3591cb7fadfc9065c1f7105e43d152b843073f252b9d67d", "140894d438cd675e7b728f72c2a1caed5d59314343c3cf7da67a31c7933b8e68", "0838af0f022cf6eeee7f1d7219f42b7e4882be01d8719566a720a0879e612753", "2722e88784451b4909e8f9aaefe2d61d8446242f1e4d4a60a3e205bbef61d200"), ("0d3858ba3f2abbea60584c7f3a1cca0fd5499e7f578a920c15689fae683e2c10", "0026cca08282ad624eebe4bd2040365e7733245b983b761eb6c3fe07a64a2e95", "07b05395164f77c9b3879c7b466d29445515a358947c9df9cf15f24dbd3aa771", "02ac50fd9d54446077163f0c44a7a071ce1950d97a1fa7323ef069e9eb6c7908"), ("1d5b1cab3fcbcafd5df48d4ceb8b523ad69c15efa00fb13562f78a36fef1e025", "0d1bfa26a14e8b62348032f24ed9dcd1f1f26903b047bcdf8e55e46f31a8152e", "08b8d63746dc89688ba14b06f43f555c81fffa6bb61b53b10aea8a4a653a33aa", "00d635fc0e8f77ffa3551705b112949d6c4fbd8f4fb725be2a6fa5e80958f925"), ("0f641c4ec00b3dc902e655e8b1adc205d510aee7e9f1c42dc8fa79d97d1e7c00", "151db8eb6d5afbc184eab5c8ccf78b5c480d96b03037a0c7bfc9447132b6a601", "18a12a1e7147b63046f266d2a0da18b4fe11833b935d24855bda1ef845c1c471", "28b0db4b66d7d70d9ee033e2327e3875455e74256769255725c6efec20755709"), ("1a1c01ec0431a37fe70c552d7c0f61884f393f61f3f56e65a47e648f7fe21905", "2f5959c33370a833feb0cd0cafc172522f7cc557f1a087163c3e58888fd74d47", "2ed8528b478370dc1bda869a4d532940c09b91ea8d468f5743b20c76c9cfb962", "2a56e627a133a00a1ac09302d0999e93a7523aa2bd076ee7c7e8b126c0386a20"), ("102c3b0452b4fe0941e7d48fa688a879350b5c853e2c784c7aebbd1f56dbd7a5", "063d1c4199129d0e9455635362c52c9a4e9cbc47b9a552511b4fd2f88c1ee5ae", "037b9e440035f9cd5ba1241bed7d231d0095fbbb9f9c4bcca2348e3d172e25ad", "2c1bfb2c73ba38f332b92270348b6c4e46f5b7db64df4b3286a1660aeec7a335"), ("13eaab664792f60698f6d3a805b1e1d2b022db50c43ed36dcffe91adc6f6ea62", "1e09b7b25afb4d9e9e54f0c629cd91f9708ea68124e96644df0358e9de3f5a0c", "062a451e555686c3440435990c1d01761222244f37eec105a096b8c085c6ae25", "0f38234ac951490fffe7dafbbe51d8595e45b6cdbd35eac0064de517c70fa81b"), ("0b43651f0b0428a35de9198a094dc89e24dd312f76f135380d6c1fbaf09ddb94", "0a299fcec2d58a5dbfbe0a6d3959f7eb917532dea24fb005a6af69578eecf2df", "253b83ec9924123a182ea50a78b22839f0f3da4e64c83a0cd2994c00a9ccd267", "02eb4bbb65921bb1c3490c4c8c2fb67f6df5723cdebd72ff6272ac1f167be36c"), ("2079f45fb6956af1f2bafd60f1f5aaf88edfcaa457f3723586b0809b70f2d347", "223cfa7528ecbd533ef1377443604a16ae29954dbd1af91cb98f7e2985f22e8d", "1de1d663c28d45f511e5cfa2653a8b78ca615f9dad70e9308c78076414c11b43", "160ef23a48521ef3d0580309153f8794a6012c04c7822363e217a06ed9338d7c"), ("09303702cf5b7ae9b8c344cfc4f5ec65d01122e625b6cc5d8af93bd62c406b7e", "0794bba36cbd98002023c13172a687b872d63939f6a9230b0e0045a3739adda0", "195a2521d450622ad65bbe3af7ab543cbd4f1ddcf996fac3b4167d1b2c111b4a", "22c7096816650e9422380bd97620b0b531b73b964513d1c04567a297c69d55c5"), ("262e1fef656acd766d8a4b82fd239d0b5944ab1bb6b57816392dc9b0e9234462", "187ece88f5c70b2a65fcf1693dd81b580836f24e7c812b42e9e1e43653388935", "15bc5e9790848aa852a77fea27e7b3889928e6fc8939f632a0aea1aab8368d55", "027dce453827b37e79fef82b56aef1343485310fba4e767a521654db5da30e6d"), ("147b474a0cbbfc629d30880b6b2d2d2397beec1124471aa3b9f693ed5168496e", "026ae7fe174d87aca57671f97c4dbc5e09a322103cc56d81d3f2d278474e72e7", "1c85cc18a5d56ebc22db1612948045f52f59db5620af270204b11d7aad2ae007", "1db4d3ef5a93bdddcaed9e4c97f7ee00b0cecd1623a3c456f81e44ea688dbaaa"), ("12e3ea5692729aa114ef93abf94c1333a25943eb830a3620557f2827de98cb6e", "2935b4c6947ac07770473837a9f1e52ae5ee3fe73b1e7b229ab51be7a2d946b4", "1b5ed93c65d71c6ef23e3ff6c1e6110e9a86822f79e537f42a2217f726f3fa00", "03a4a5f4dc95358f9274767da666d6167528ed2d844bc68118de01a0d98c9299"), ("1eaccc5c180dc5363f973c0a8b5f66dd1278c837769b48722ba5b058dc43be43", "2ea223ace807093bb610a287f523d193560073b9b2485975a76f065cd762a7e1", "224677f701bf32c3d07ba58efa1347cac50c2ddd85bf275dbcc6f8949afdaec1", "09c6c0800a5d66aa73e5332182a2e504c5de9acf064f56d8f68827c3a41b6b8c"), ("06da02e21a1fa7023b4aa612515bc144e8e387e574f12d6220e7bbb35d432845", "0bc7c2f858f957690d4b26fbccb16665efa4421999d9b51999d19ed4f0fc83eb", "2755b25d79e05e3503c8f7d6aa55cf12cc2d7e56de705287cae328b89e0cdd77", "25275c6705b80bbd8d60f370de08154dd82527b25486bab21dae3ed632276d5b"), ("0b3c0c13f2436948d0c8549350060c218af3b44f60ddb2cbcd891e1ef565ac80", "27231ed9c7230915aaf9597711abab241171e0e27a4b4a959a502f4e1c56640e", "0194fb9ac68b223d73022523023fe5769a018117591de6891cd152fe8847d55e", "150162d0063ea23267b36654b0dcd02bf312ba8521b4fda787db0a03071402a2"), ("28a9cd34f4244ad6c93879c90241f0b9646ca951d7188d750e7f3d950ea90a2e", "00d3149066fe7f78404185db5aaa2d5db9ff734e282830395302b0fcded9823c", "2c782b5e544fa56ad3447f0dbfbf9e4dca3e60cc7830fdbdb21e5100f24db2fd", "00ee274ea6df380969371c0daf34fd2420dc55890ffa6a8332f19dbbe5b552fb"), ("0ae796b57a05ab6977f73d0171078e32ebe92dfae94292a9bff12015dea15534", "001a8ff98d149891ae02c5f3e9ef14027085663d5fe4f655f630557c68f75d03", "28779cdfbe806a646915c115149dbd990d4aab7f4613f7d604593f90609ea56f", "15346345d59885de47eda8093b55b75fdee1e3b81e06cbe18816bee8f79b7371"), ("0846615c138473cd30621416f2efac6b949bb334534c90cf149b9526a4c2ea46", "09671ae0e2a806e623b4d60ed15eea55e501ae41c781064289009aff152ad133", "1b8860f58938bd656cc7e3bd45e70ec1e5d88167e7f465f175e8940bc71ffd64", "1c73e79002a4d6f102921cf947c6b0a51885acfc0e7234a6ead5be034c13b97c"), ("278f97261eacbe09ce5e35436bff601f56ce67a62c3f619924e1409072d013d5", "2650415f4edcced1bcfcc18211e84e2eda41a6d7d7afef402d0695730ce9eaa7", "2a55ef81807af7d514bd1790e32d2dea7d6624acddfd379fc1db525c21d2d246", "0aa3a82171b1ea6703afec3707fb98a6f3fe069d9a1a193e9fb21216af8adfb6"), ("18da37f89c631baec3fe0dfc5fbc2b7abb8a0761c81cd3fd511a56469c5820fe", "3048d89b856b0730550d2a91104c4386db5c5e134dd951ed95293ed66dc46823", "17152a1e8c25d7fd372c352d2f607355eab904d50f3c94ce35f77c19ace8746f", "1deda369a6182a492f049ac9817f6ef3ebc158817b6b2de1926fbff8b874041c"), ("150fb68164e011be67ffde47c166279ffff5d701296d9250d039a8e755fcdc7d", "1345557d87b9db9d6d5ad1e2cd3bd266bcb27f5c093414b34806384e03c062cb", "0b35ad4db700375aca9e444dda33a08ef942f21bbd6ddf30f7e268203782fc4a", "26c1bad66fcbe4fee85f1f9e73349d18371043a0dee0599055d617ec71996ee4"), ("1a148f8a457b42830c34545a4accdfc1fde289f09d40ab38f11a967fc541f9fe", "25763da3d512f69548640fe115796be216f728649ba652697198861b688d05e0", "2576def12e58d34cccd48c12e963b93a929b91ed2906eb6e8b9848a471787e86", "14c2768d1441466bcd54bfe022f50799f32348790f85a61db590197c093da99a"), ("18a8d241b5c76d61db23696d79c634425214c8f3dc13d414411ca61e8a72223c", "0963977a9f82b767a9e2aa7bc2a70b82f440ae2882bb78ff46fc7199f2317e2b", "0501378508f3f4c4f569eeda41626fd94d59af82c05b4fe127a7c3b9b20dad1c", "29c1ef75583cbd175eb34b2583b43e7e4ecd68008268e31c945127dc15737836"), ("2f420a3b42cabc78c3804794232a9276a947c497e8e590640e4ac142f6bee057", "27457c22d9a344a4609c35473ba64046251a404ff60da967161366eebdaeaecb", "016faa994d3130859029a6e8df7ab268361a3a3ed3e85bf13ddb8b5edbafac85", "22f16cc6150e13d909d7b928ac7f02dfbdd2ee1be7c9d052411becb1f6134670"), ("0fbb74f3c014aceec5adb459988a5a3f66649ed09788ffbf7e2b21691073f87b", "02bc677759f9e91d6b5d92703a350f0742c918cbd9f2be43399e2e373810a57d", "270211fbee7723a8c9b5d1640a843f29335953587cb641eef5bbd4d035c3e43a", "00908849226addddd34e7cf6c23f289b08dcf801a7fc1eaaa271143df3cf44ea"), ("1dfd5b762b89ff0c9e63bcc16159449993f32835708bf6d22974da45448fc174", "2a615689d584dd478176c92e4b2156c429cb9f4ec29f32029807cabf1f6f5729", "2f204d7ebba1c7f34872c21a0c12f3ab66ef17394e720a465cea6932766779c6", "086398612dd2fe9c17f91c89568f91e3cbc722381cbc713bf98ed1c47d7d4e7f"), ("0e2082a73fa233c9a81849ea7d8892ee3fb236c97076eb7c2a5fe4ccdf426cc5", "029576c3743409b9cd59c2117f6f0a8dc9d8684b72630928244a33c6288282f3", "13641d459a687b166340190a9c79d9f11cf0ea57c14d975310328a9e24b8da89", "2108d0dba482c072da3bc0d973b7c498ba8edcb3cf38537da0ee3a7e715e0fcf"), ("2f4fb50043d4f39e59e2a86ab5df51a7463929fd9bc082c5bf9136182ea86e19", "14d5e53acd259b59fe35123380d0aef9fbe7c0429c456ffbcede7db0762c2a2c", "20f4c1f1fcf7a77160b02c7b3abe1d5851cb7be7cc3a6d62134fe449e86ca99b", "0c0311cd9978a19fe59f6f480059120c2759f74584e3981813f13d871ddb9814"), ("124aee738cdabc3fb60e24f2dd845a7cdbd3939aff9e9f5cfc98ab6700c6c2ee", "19bb3a958205dfd40fc9c94e375016cff6a17b3b3075ebe8b6b34a09e7b1fafd", "2595be6d65d511b6e0fe790c5f4aad0a5213d40cd490febbf4100f4f44314db2", "1dce61aec04e8d0aa0aef5fc0492b1fbc292e99a1e485e68456c0985ae4095af"), ("1ea0d1c7bcecdb91fdfc20c08d0f8fd4e27cc33e667c34e00bf9dceb6d5613bc", "1ea08f34053277d81440078e2f949030bed602c3b5f10e639f049813a6a66bad", "2b6ef02aa647456c23962109da0b43955383edcd2ca4531ce1fcaa84ef6c20e1", "2df64820d779c6066ca83e9121e94ce9e401185c05cb9422cc23be91ce654440"), ("22e844870735033cf76801a3c7c35a37ed4b2ccbf21c745c745337d20ed0c26a", "0721d0db4965e7b114a91e3f39cb17038bfb0d4f24db1dd067def7353656d5eb", "1aa4cafdf3441b1209d8a46accda68eca48b24b6072280b688703cde443f98f1", "15b116f08da9d67ead6b0454dbd96b33c6ecfbed71751bfba7e69849f5e66bba"), ("04820a29928ac4b2099d12bf7bfe733d39b76b5cc70cfd95150e37072847e635", "19f42966dcc7d571259a78a79e70fb9a7d0cbfc76e552c34581a3bbf0528d865", "05c40968820e343b3957125f484a59327bea56694bb9ee0f2b4d0281b7bdb92c", "143e3170fb81d62a3fd2f37eb452b8ac41fd64a71e9b066ef71b035df0411b53")] - - # StaticGroupMerkleRoot is the root of the Merkle tree constructed from the StaticGroupKeys above - # only identity commitments are used for the Merkle tree construction - # the root is created locally, using createMembershipList proc from waku_rln_relay_utils module, and the result is hardcoded in here - StaticGroupMerkleRoot* = "25caa6e82a7476394b0ad5bfbca174a0a842479e70eaaeee14fa8096e49072ca" - -const EpochUnitSeconds* = float64(10) # the rln-relay epoch length in seconds -const MaxClockGapSeconds* = 20.0 # the maximum clock difference between peers in seconds - -# maximum allowed gap between the epochs of messages' RateLimitProofs -const MaxEpochGap* = uint64(MaxClockGapSeconds/EpochUnitSeconds) - -# RLN Keystore defaults -const - RLNAppInfo* = AppInfo(application: "nwaku-rln-relay", appIdentifier: "01234567890abcdef", version: "0.1") diff --git a/waku/v2/waku_store/README.md b/waku/v2/waku_store/README.md deleted file mode 100644 index f5adaf484..000000000 --- a/waku/v2/waku_store/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Waku Store protocol - -The store protocol implements historical message support. See https://github.com/vacp2p/specs/blob/master/specs/waku/v2/waku-store.md for more information. diff --git a/waku/waku.nim b/waku/waku.nim index c266635b8..6a7669aab 100644 --- a/waku/waku.nim +++ b/waku/waku.nim @@ -4,6 +4,6 @@ # - MIT ([LICENSE-MIT](../LICENSE-MIT) or http://opensource.org/licenses/MIT) # - APACHEv2 ([LICENSE-APACHEv2](../LICENSE-APACHEv2) or https://www.apache.org/licenses/LICENSE-2.0) -## An implementation of the [Waku v1](https://specs.vac.dev/specs/waku/waku.html) and [Waku v2](https://specs.vac.dev/specs/waku/v2/waku-v2.html) in nim. -import v2/waku_node as wakunode2 +## An implementation of [Waku v2](https://rfc.vac.dev/spec/10/) in nim. +import waku_node as wakunode2 export wakunode2 diff --git a/waku/v2/waku_archive.nim b/waku/waku_archive.nim similarity index 100% rename from waku/v2/waku_archive.nim rename to waku/waku_archive.nim diff --git a/waku/v2/waku_archive/archive.nim b/waku/waku_archive/archive.nim similarity index 99% rename from waku/v2/waku_archive/archive.nim rename to waku/waku_archive/archive.nim index 36f3d9f64..abdb6f94c 100644 --- a/waku/v2/waku_archive/archive.nim +++ b/waku/waku_archive/archive.nim @@ -11,8 +11,8 @@ import regex, metrics import - ../../common/databases/dburl, - ../../common/databases/db_sqlite, + ../common/databases/dburl, + ../common/databases/db_sqlite, ./driver, ./driver/queue_driver, ./driver/sqlite_driver, diff --git a/waku/v2/waku_archive/archive_metrics.nim b/waku/waku_archive/archive_metrics.nim similarity index 100% rename from waku/v2/waku_archive/archive_metrics.nim rename to waku/waku_archive/archive_metrics.nim diff --git a/waku/v2/waku_archive/common.nim b/waku/waku_archive/common.nim similarity index 100% rename from waku/v2/waku_archive/common.nim rename to waku/waku_archive/common.nim diff --git a/waku/v2/waku_archive/driver.nim b/waku/waku_archive/driver.nim similarity index 100% rename from waku/v2/waku_archive/driver.nim rename to waku/waku_archive/driver.nim diff --git a/waku/v2/waku_archive/driver/builder.nim b/waku/waku_archive/driver/builder.nim similarity index 97% rename from waku/v2/waku_archive/driver/builder.nim rename to waku/waku_archive/driver/builder.nim index 76e676b49..1e8567350 100644 --- a/waku/v2/waku_archive/driver/builder.nim +++ b/waku/waku_archive/driver/builder.nim @@ -10,8 +10,8 @@ import chronos import ../driver, - ../../../common/databases/dburl, - ../../../common/databases/db_sqlite, + ../../common/databases/dburl, + ../../common/databases/db_sqlite, ./sqlite_driver, ./sqlite_driver/migrations as archive_driver_sqlite_migrations, ./queue_driver, diff --git a/waku/v2/waku_archive/driver/postgres_driver.nim b/waku/waku_archive/driver/postgres_driver.nim similarity index 100% rename from waku/v2/waku_archive/driver/postgres_driver.nim rename to waku/waku_archive/driver/postgres_driver.nim diff --git a/waku/v2/waku_archive/driver/postgres_driver/postgres_driver.nim b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim similarity index 99% rename from waku/v2/waku_archive/driver/postgres_driver/postgres_driver.nim rename to waku/waku_archive/driver/postgres_driver/postgres_driver.nim index e3840bb81..17dc1ee93 100644 --- a/waku/v2/waku_archive/driver/postgres_driver/postgres_driver.nim +++ b/waku/waku_archive/driver/postgres_driver/postgres_driver.nim @@ -12,7 +12,7 @@ import ../../../waku_core, ../../common, ../../driver, - ../../../../common/databases/db_postgres as waku_postgres + ../../../common/databases/db_postgres as waku_postgres export postgres_driver diff --git a/waku/v2/waku_archive/driver/queue_driver.nim b/waku/waku_archive/driver/queue_driver.nim similarity index 100% rename from waku/v2/waku_archive/driver/queue_driver.nim rename to waku/waku_archive/driver/queue_driver.nim diff --git a/waku/v2/waku_archive/driver/queue_driver/index.nim b/waku/waku_archive/driver/queue_driver/index.nim similarity index 100% rename from waku/v2/waku_archive/driver/queue_driver/index.nim rename to waku/waku_archive/driver/queue_driver/index.nim diff --git a/waku/v2/waku_archive/driver/queue_driver/queue_driver.nim b/waku/waku_archive/driver/queue_driver/queue_driver.nim similarity index 100% rename from waku/v2/waku_archive/driver/queue_driver/queue_driver.nim rename to waku/waku_archive/driver/queue_driver/queue_driver.nim diff --git a/waku/v2/waku_archive/driver/sqlite_driver.nim b/waku/waku_archive/driver/sqlite_driver.nim similarity index 100% rename from waku/v2/waku_archive/driver/sqlite_driver.nim rename to waku/waku_archive/driver/sqlite_driver.nim diff --git a/waku/v2/waku_archive/driver/sqlite_driver/cursor.nim b/waku/waku_archive/driver/sqlite_driver/cursor.nim similarity index 100% rename from waku/v2/waku_archive/driver/sqlite_driver/cursor.nim rename to waku/waku_archive/driver/sqlite_driver/cursor.nim diff --git a/waku/v2/waku_archive/driver/sqlite_driver/migrations.nim b/waku/waku_archive/driver/sqlite_driver/migrations.nim similarity index 94% rename from waku/v2/waku_archive/driver/sqlite_driver/migrations.nim rename to waku/waku_archive/driver/sqlite_driver/migrations.nim index 3d63a8f32..772fc5656 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/migrations.nim +++ b/waku/waku_archive/driver/sqlite_driver/migrations.nim @@ -5,8 +5,8 @@ import stew/results, chronicles import - ../../../../common/databases/db_sqlite, - ../../../../common/databases/common + ../../../common/databases/db_sqlite, + ../../../common/databases/common logScope: diff --git a/waku/v2/waku_archive/driver/sqlite_driver/queries.nim b/waku/waku_archive/driver/sqlite_driver/queries.nim similarity index 99% rename from waku/v2/waku_archive/driver/sqlite_driver/queries.nim rename to waku/waku_archive/driver/sqlite_driver/queries.nim index f879b0e81..2e218d97d 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/queries.nim +++ b/waku/waku_archive/driver/sqlite_driver/queries.nim @@ -8,8 +8,8 @@ import stew/[results, byteutils], sqlite3_abi import - ../../../../common/databases/db_sqlite, - ../../../../common/databases/common, + ../../../common/databases/db_sqlite, + ../../../common/databases/common, ../../../waku_core, ./cursor diff --git a/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim b/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim similarity index 99% rename from waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim rename to waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim index 705b82eb0..8746838a9 100644 --- a/waku/v2/waku_archive/driver/sqlite_driver/sqlite_driver.nim +++ b/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim @@ -11,7 +11,7 @@ import chronicles, chronos import - ../../../../common/databases/db_sqlite, + ../../../common/databases/db_sqlite, ../../../waku_core, ../../common, ../../driver, diff --git a/waku/v2/waku_archive/retention_policy.nim b/waku/waku_archive/retention_policy.nim similarity index 100% rename from waku/v2/waku_archive/retention_policy.nim rename to waku/waku_archive/retention_policy.nim diff --git a/waku/v2/waku_archive/retention_policy/builder.nim b/waku/waku_archive/retention_policy/builder.nim similarity index 100% rename from waku/v2/waku_archive/retention_policy/builder.nim rename to waku/waku_archive/retention_policy/builder.nim diff --git a/waku/v2/waku_archive/retention_policy/retention_policy_capacity.nim b/waku/waku_archive/retention_policy/retention_policy_capacity.nim similarity index 100% rename from waku/v2/waku_archive/retention_policy/retention_policy_capacity.nim rename to waku/waku_archive/retention_policy/retention_policy_capacity.nim diff --git a/waku/v2/waku_archive/retention_policy/retention_policy_time.nim b/waku/waku_archive/retention_policy/retention_policy_time.nim similarity index 100% rename from waku/v2/waku_archive/retention_policy/retention_policy_time.nim rename to waku/waku_archive/retention_policy/retention_policy_time.nim diff --git a/waku/v2/waku_core.nim b/waku/waku_core.nim similarity index 100% rename from waku/v2/waku_core.nim rename to waku/waku_core.nim diff --git a/waku/v2/waku_core/message.nim b/waku/waku_core/message.nim similarity index 100% rename from waku/v2/waku_core/message.nim rename to waku/waku_core/message.nim diff --git a/waku/v2/waku_core/message/codec.nim b/waku/waku_core/message/codec.nim similarity index 98% rename from waku/v2/waku_core/message/codec.nim rename to waku/waku_core/message/codec.nim index 70a5ca0b1..1e92535e7 100644 --- a/waku/v2/waku_core/message/codec.nim +++ b/waku/waku_core/message/codec.nim @@ -9,7 +9,7 @@ else: import - ../../../common/protobuf, + ../../common/protobuf, ../topics, ../time, ./message diff --git a/waku/v2/waku_core/message/digest.nim b/waku/waku_core/message/digest.nim similarity index 100% rename from waku/v2/waku_core/message/digest.nim rename to waku/waku_core/message/digest.nim diff --git a/waku/v2/waku_core/message/message.nim b/waku/waku_core/message/message.nim similarity index 100% rename from waku/v2/waku_core/message/message.nim rename to waku/waku_core/message/message.nim diff --git a/waku/v2/waku_core/peers.nim b/waku/waku_core/peers.nim similarity index 100% rename from waku/v2/waku_core/peers.nim rename to waku/waku_core/peers.nim diff --git a/waku/v2/waku_core/time.nim b/waku/waku_core/time.nim similarity index 100% rename from waku/v2/waku_core/time.nim rename to waku/waku_core/time.nim diff --git a/waku/v2/waku_core/topics.nim b/waku/waku_core/topics.nim similarity index 100% rename from waku/v2/waku_core/topics.nim rename to waku/waku_core/topics.nim diff --git a/waku/v2/waku_core/topics/content_topic.nim b/waku/waku_core/topics/content_topic.nim similarity index 100% rename from waku/v2/waku_core/topics/content_topic.nim rename to waku/waku_core/topics/content_topic.nim diff --git a/waku/v2/waku_core/topics/parsing.nim b/waku/waku_core/topics/parsing.nim similarity index 100% rename from waku/v2/waku_core/topics/parsing.nim rename to waku/waku_core/topics/parsing.nim diff --git a/waku/v2/waku_core/topics/pubsub_topic.nim b/waku/waku_core/topics/pubsub_topic.nim similarity index 100% rename from waku/v2/waku_core/topics/pubsub_topic.nim rename to waku/waku_core/topics/pubsub_topic.nim diff --git a/waku/v2/waku_core/topics/sharding.nim b/waku/waku_core/topics/sharding.nim similarity index 100% rename from waku/v2/waku_core/topics/sharding.nim rename to waku/waku_core/topics/sharding.nim diff --git a/waku/v2/waku_discv5.nim b/waku/waku_discv5.nim similarity index 99% rename from waku/v2/waku_discv5.nim rename to waku/waku_discv5.nim index 563af399f..32406fb64 100644 --- a/waku/v2/waku_discv5.nim +++ b/waku/waku_discv5.nim @@ -15,7 +15,7 @@ import eth/p2p/discoveryv5/node, eth/p2p/discoveryv5/protocol import - ../../waku/v2/node/peer_manager/peer_manager, + ./node/peer_manager/peer_manager, ./waku_core, ./waku_enr diff --git a/waku/v2/waku_dnsdisc.nim b/waku/waku_dnsdisc.nim similarity index 100% rename from waku/v2/waku_dnsdisc.nim rename to waku/waku_dnsdisc.nim diff --git a/waku/v2/waku_enr.nim b/waku/waku_enr.nim similarity index 88% rename from waku/v2/waku_enr.nim rename to waku/waku_enr.nim index 913eda577..c3f220abb 100644 --- a/waku/v2/waku_enr.nim +++ b/waku/waku_enr.nim @@ -1,5 +1,5 @@ import - ../common/enr, + ./common/enr, ./waku_enr/capabilities, ./waku_enr/multiaddr, ./waku_enr/sharding diff --git a/waku/v2/waku_enr/capabilities.nim b/waku/waku_enr/capabilities.nim similarity index 99% rename from waku/v2/waku_enr/capabilities.nim rename to waku/waku_enr/capabilities.nim index 0045dc57e..7702338ad 100644 --- a/waku/v2/waku_enr/capabilities.nim +++ b/waku/waku_enr/capabilities.nim @@ -10,7 +10,7 @@ import eth/keys, libp2p/crypto/crypto import - ../../common/enr + ../common/enr const CapabilitiesEnrField* = "waku2" diff --git a/waku/v2/waku_enr/multiaddr.nim b/waku/waku_enr/multiaddr.nim similarity index 99% rename from waku/v2/waku_enr/multiaddr.nim rename to waku/waku_enr/multiaddr.nim index 60df2d796..8c205cbe2 100644 --- a/waku/v2/waku_enr/multiaddr.nim +++ b/waku/waku_enr/multiaddr.nim @@ -11,7 +11,7 @@ import libp2p/[multiaddress, multicodec], libp2p/crypto/crypto import - ../../common/enr + ../common/enr const MultiaddrEnrField* = "multiaddrs" diff --git a/waku/v2/waku_enr/sharding.nim b/waku/waku_enr/sharding.nim similarity index 99% rename from waku/v2/waku_enr/sharding.nim rename to waku/waku_enr/sharding.nim index e1f1abc7e..e431b0c59 100644 --- a/waku/v2/waku_enr/sharding.nim +++ b/waku/waku_enr/sharding.nim @@ -12,7 +12,7 @@ import libp2p/[multiaddress, multicodec], libp2p/crypto/crypto import - ../../common/enr, + ../common/enr, ../waku_core logScope: diff --git a/waku/v2/waku_filter.nim b/waku/waku_filter.nim similarity index 93% rename from waku/v2/waku_filter.nim rename to waku/waku_filter.nim index 0d714e081..c093e01c0 100644 --- a/waku/v2/waku_filter.nim +++ b/waku/waku_filter.nim @@ -1,10 +1,10 @@ -when (NimMajor, NimMinor) < (1, 4): - {.push raises: [Defect].} -else: - {.push raises: [].} - -import - ./waku_filter/protocol - -export - protocol +when (NimMajor, NimMinor) < (1, 4): + {.push raises: [Defect].} +else: + {.push raises: [].} + +import + ./waku_filter/protocol + +export + protocol diff --git a/waku/waku_filter/README.md b/waku/waku_filter/README.md new file mode 100644 index 000000000..2deb6f170 --- /dev/null +++ b/waku/waku_filter/README.md @@ -0,0 +1,3 @@ +# Waku Filter protocol + +The filter protocol implements bandwidth preserving filtering for light nodes. See https://rfc.vac.dev/spec/12/ for more information. diff --git a/waku/v2/waku_filter/client.nim b/waku/waku_filter/client.nim similarity index 100% rename from waku/v2/waku_filter/client.nim rename to waku/waku_filter/client.nim diff --git a/waku/v2/waku_filter/protocol.nim b/waku/waku_filter/protocol.nim similarity index 100% rename from waku/v2/waku_filter/protocol.nim rename to waku/waku_filter/protocol.nim diff --git a/waku/v2/waku_filter/protocol_metrics.nim b/waku/waku_filter/protocol_metrics.nim similarity index 100% rename from waku/v2/waku_filter/protocol_metrics.nim rename to waku/waku_filter/protocol_metrics.nim diff --git a/waku/v2/waku_filter/rpc.nim b/waku/waku_filter/rpc.nim similarity index 100% rename from waku/v2/waku_filter/rpc.nim rename to waku/waku_filter/rpc.nim diff --git a/waku/v2/waku_filter/rpc_codec.nim b/waku/waku_filter/rpc_codec.nim similarity index 99% rename from waku/v2/waku_filter/rpc_codec.nim rename to waku/waku_filter/rpc_codec.nim index 8b82a471c..ea1dddfa7 100644 --- a/waku/v2/waku_filter/rpc_codec.nim +++ b/waku/waku_filter/rpc_codec.nim @@ -6,7 +6,7 @@ else: import std/options import - ../../common/protobuf, + ../common/protobuf, ../waku_core, ./rpc diff --git a/waku/v2/waku_filter_v2.nim b/waku/waku_filter_v2.nim similarity index 100% rename from waku/v2/waku_filter_v2.nim rename to waku/waku_filter_v2.nim diff --git a/waku/v2/waku_filter_v2/client.nim b/waku/waku_filter_v2/client.nim similarity index 100% rename from waku/v2/waku_filter_v2/client.nim rename to waku/waku_filter_v2/client.nim diff --git a/waku/v2/waku_filter_v2/common.nim b/waku/waku_filter_v2/common.nim similarity index 100% rename from waku/v2/waku_filter_v2/common.nim rename to waku/waku_filter_v2/common.nim diff --git a/waku/v2/waku_filter_v2/protocol.nim b/waku/waku_filter_v2/protocol.nim similarity index 100% rename from waku/v2/waku_filter_v2/protocol.nim rename to waku/waku_filter_v2/protocol.nim diff --git a/waku/v2/waku_filter_v2/protocol_metrics.nim b/waku/waku_filter_v2/protocol_metrics.nim similarity index 100% rename from waku/v2/waku_filter_v2/protocol_metrics.nim rename to waku/waku_filter_v2/protocol_metrics.nim diff --git a/waku/v2/waku_filter_v2/rpc.nim b/waku/waku_filter_v2/rpc.nim similarity index 100% rename from waku/v2/waku_filter_v2/rpc.nim rename to waku/waku_filter_v2/rpc.nim diff --git a/waku/v2/waku_filter_v2/rpc_codec.nim b/waku/waku_filter_v2/rpc_codec.nim similarity index 99% rename from waku/v2/waku_filter_v2/rpc_codec.nim rename to waku/waku_filter_v2/rpc_codec.nim index dcd787dc2..e96263352 100644 --- a/waku/v2/waku_filter_v2/rpc_codec.nim +++ b/waku/waku_filter_v2/rpc_codec.nim @@ -6,7 +6,7 @@ else: import std/options import - ../../common/protobuf, + ../common/protobuf, ../waku_core, ./rpc diff --git a/waku/v2/waku_filter_v2/subscriptions.nim b/waku/waku_filter_v2/subscriptions.nim similarity index 100% rename from waku/v2/waku_filter_v2/subscriptions.nim rename to waku/waku_filter_v2/subscriptions.nim diff --git a/waku/v2/waku_keystore.nim b/waku/waku_keystore.nim similarity index 100% rename from waku/v2/waku_keystore.nim rename to waku/waku_keystore.nim diff --git a/waku/v2/waku_keystore/conversion_utils.nim b/waku/waku_keystore/conversion_utils.nim similarity index 100% rename from waku/v2/waku_keystore/conversion_utils.nim rename to waku/waku_keystore/conversion_utils.nim diff --git a/waku/v2/waku_keystore/keyfile.nim b/waku/waku_keystore/keyfile.nim similarity index 100% rename from waku/v2/waku_keystore/keyfile.nim rename to waku/waku_keystore/keyfile.nim diff --git a/waku/v2/waku_keystore/keystore.nim b/waku/waku_keystore/keystore.nim similarity index 100% rename from waku/v2/waku_keystore/keystore.nim rename to waku/waku_keystore/keystore.nim diff --git a/waku/v2/waku_keystore/protocol_types.nim b/waku/waku_keystore/protocol_types.nim similarity index 100% rename from waku/v2/waku_keystore/protocol_types.nim rename to waku/waku_keystore/protocol_types.nim diff --git a/waku/v2/waku_keystore/utils.nim b/waku/waku_keystore/utils.nim similarity index 100% rename from waku/v2/waku_keystore/utils.nim rename to waku/waku_keystore/utils.nim diff --git a/waku/v2/waku_lightpush.nim b/waku/waku_lightpush.nim similarity index 100% rename from waku/v2/waku_lightpush.nim rename to waku/waku_lightpush.nim diff --git a/waku/v2/waku_lightpush/README.md b/waku/waku_lightpush/README.md similarity index 100% rename from waku/v2/waku_lightpush/README.md rename to waku/waku_lightpush/README.md diff --git a/waku/v2/waku_lightpush/client.nim b/waku/waku_lightpush/client.nim similarity index 100% rename from waku/v2/waku_lightpush/client.nim rename to waku/waku_lightpush/client.nim diff --git a/waku/v2/waku_lightpush/protocol.nim b/waku/waku_lightpush/protocol.nim similarity index 100% rename from waku/v2/waku_lightpush/protocol.nim rename to waku/waku_lightpush/protocol.nim diff --git a/waku/v2/waku_lightpush/protocol_metrics.nim b/waku/waku_lightpush/protocol_metrics.nim similarity index 100% rename from waku/v2/waku_lightpush/protocol_metrics.nim rename to waku/waku_lightpush/protocol_metrics.nim diff --git a/waku/v2/waku_lightpush/rpc.nim b/waku/waku_lightpush/rpc.nim similarity index 100% rename from waku/v2/waku_lightpush/rpc.nim rename to waku/waku_lightpush/rpc.nim diff --git a/waku/v2/waku_lightpush/rpc_codec.nim b/waku/waku_lightpush/rpc_codec.nim similarity index 98% rename from waku/v2/waku_lightpush/rpc_codec.nim rename to waku/waku_lightpush/rpc_codec.nim index caa146269..432a671ea 100644 --- a/waku/v2/waku_lightpush/rpc_codec.nim +++ b/waku/waku_lightpush/rpc_codec.nim @@ -7,7 +7,7 @@ else: import std/options import - ../../common/protobuf, + ../common/protobuf, ../waku_core, ./rpc diff --git a/waku/v2/waku_node.nim b/waku/waku_node.nim similarity index 100% rename from waku/v2/waku_node.nim rename to waku/waku_node.nim diff --git a/waku/v2/waku_noise/noise.nim b/waku/waku_noise/noise.nim similarity index 100% rename from waku/v2/waku_noise/noise.nim rename to waku/waku_noise/noise.nim diff --git a/waku/v2/waku_noise/noise_handshake_processing.nim b/waku/waku_noise/noise_handshake_processing.nim similarity index 100% rename from waku/v2/waku_noise/noise_handshake_processing.nim rename to waku/waku_noise/noise_handshake_processing.nim diff --git a/waku/v2/waku_noise/noise_types.nim b/waku/waku_noise/noise_types.nim similarity index 100% rename from waku/v2/waku_noise/noise_types.nim rename to waku/waku_noise/noise_types.nim diff --git a/waku/v2/waku_noise/noise_utils.nim b/waku/waku_noise/noise_utils.nim similarity index 100% rename from waku/v2/waku_noise/noise_utils.nim rename to waku/waku_noise/noise_utils.nim diff --git a/waku/v2/waku_peer_exchange.nim b/waku/waku_peer_exchange.nim similarity index 100% rename from waku/v2/waku_peer_exchange.nim rename to waku/waku_peer_exchange.nim diff --git a/waku/v2/waku_peer_exchange/README.md b/waku/waku_peer_exchange/README.md similarity index 100% rename from waku/v2/waku_peer_exchange/README.md rename to waku/waku_peer_exchange/README.md diff --git a/waku/v2/waku_peer_exchange/protocol.nim b/waku/waku_peer_exchange/protocol.nim similarity index 99% rename from waku/v2/waku_peer_exchange/protocol.nim rename to waku/waku_peer_exchange/protocol.nim index 73cc2b969..613c07eff 100644 --- a/waku/v2/waku_peer_exchange/protocol.nim +++ b/waku/waku_peer_exchange/protocol.nim @@ -8,7 +8,7 @@ import libp2p/crypto/crypto, eth/p2p/discoveryv5/enr import - ../../common/nimchronos, + ../common/nimchronos, ../node/peer_manager, ../waku_core, ../waku_discv5, diff --git a/waku/v2/waku_peer_exchange/rpc.nim b/waku/waku_peer_exchange/rpc.nim similarity index 100% rename from waku/v2/waku_peer_exchange/rpc.nim rename to waku/waku_peer_exchange/rpc.nim diff --git a/waku/v2/waku_peer_exchange/rpc_codec.nim b/waku/waku_peer_exchange/rpc_codec.nim similarity index 98% rename from waku/v2/waku_peer_exchange/rpc_codec.nim rename to waku/waku_peer_exchange/rpc_codec.nim index bfeac7b21..da82aed36 100644 --- a/waku/v2/waku_peer_exchange/rpc_codec.nim +++ b/waku/waku_peer_exchange/rpc_codec.nim @@ -5,7 +5,7 @@ else: import - ../../common/protobuf, + ../common/protobuf, ./rpc diff --git a/waku/v2/waku_relay.nim b/waku/waku_relay.nim similarity index 100% rename from waku/v2/waku_relay.nim rename to waku/waku_relay.nim diff --git a/waku/v2/waku_relay/message_id.nim b/waku/waku_relay/message_id.nim similarity index 100% rename from waku/v2/waku_relay/message_id.nim rename to waku/waku_relay/message_id.nim diff --git a/waku/v2/waku_relay/protocol.nim b/waku/waku_relay/protocol.nim similarity index 100% rename from waku/v2/waku_relay/protocol.nim rename to waku/waku_relay/protocol.nim diff --git a/waku/v2/waku_rln_relay.nim b/waku/waku_rln_relay.nim similarity index 100% rename from waku/v2/waku_rln_relay.nim rename to waku/waku_rln_relay.nim diff --git a/waku/v2/waku_rln_relay/contract.nim b/waku/waku_rln_relay/contract.nim similarity index 100% rename from waku/v2/waku_rln_relay/contract.nim rename to waku/waku_rln_relay/contract.nim diff --git a/waku/v2/waku_rln_relay/conversion_utils.nim b/waku/waku_rln_relay/conversion_utils.nim similarity index 100% rename from waku/v2/waku_rln_relay/conversion_utils.nim rename to waku/waku_rln_relay/conversion_utils.nim diff --git a/waku/v2/waku_rln_relay/group_manager.nim b/waku/waku_rln_relay/group_manager.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager.nim rename to waku/waku_rln_relay/group_manager.nim diff --git a/waku/v2/waku_rln_relay/group_manager/group_manager_base.nim b/waku/waku_rln_relay/group_manager/group_manager_base.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager/group_manager_base.nim rename to waku/waku_rln_relay/group_manager/group_manager_base.nim diff --git a/waku/v2/waku_rln_relay/group_manager/on_chain.nim b/waku/waku_rln_relay/group_manager/on_chain.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager/on_chain.nim rename to waku/waku_rln_relay/group_manager/on_chain.nim diff --git a/waku/v2/waku_rln_relay/group_manager/on_chain/group_manager.nim b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager/on_chain/group_manager.nim rename to waku/waku_rln_relay/group_manager/on_chain/group_manager.nim diff --git a/waku/v2/waku_rln_relay/group_manager/static.nim b/waku/waku_rln_relay/group_manager/static.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager/static.nim rename to waku/waku_rln_relay/group_manager/static.nim diff --git a/waku/v2/waku_rln_relay/group_manager/static/group_manager.nim b/waku/waku_rln_relay/group_manager/static/group_manager.nim similarity index 100% rename from waku/v2/waku_rln_relay/group_manager/static/group_manager.nim rename to waku/waku_rln_relay/group_manager/static/group_manager.nim diff --git a/waku/v2/waku_rln_relay/protocol_metrics.nim b/waku/waku_rln_relay/protocol_metrics.nim similarity index 100% rename from waku/v2/waku_rln_relay/protocol_metrics.nim rename to waku/waku_rln_relay/protocol_metrics.nim diff --git a/waku/v2/waku_rln_relay/protocol_types.nim b/waku/waku_rln_relay/protocol_types.nim similarity index 99% rename from waku/v2/waku_rln_relay/protocol_types.nim rename to waku/waku_rln_relay/protocol_types.nim index e836cab32..83ccfb89b 100644 --- a/waku/v2/waku_rln_relay/protocol_types.nim +++ b/waku/waku_rln_relay/protocol_types.nim @@ -12,7 +12,7 @@ import import ../waku_core, ../waku_keystore, - ../../common/protobuf + ../common/protobuf export waku_keystore, diff --git a/waku/v2/waku_rln_relay/rln.nim b/waku/waku_rln_relay/rln.nim similarity index 100% rename from waku/v2/waku_rln_relay/rln.nim rename to waku/waku_rln_relay/rln.nim diff --git a/waku/v2/waku_rln_relay/rln/rln_interface.nim b/waku/waku_rln_relay/rln/rln_interface.nim similarity index 100% rename from waku/v2/waku_rln_relay/rln/rln_interface.nim rename to waku/waku_rln_relay/rln/rln_interface.nim diff --git a/waku/v2/waku_rln_relay/rln/wrappers.nim b/waku/waku_rln_relay/rln/wrappers.nim similarity index 100% rename from waku/v2/waku_rln_relay/rln/wrappers.nim rename to waku/waku_rln_relay/rln/wrappers.nim diff --git a/waku/v2/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim similarity index 100% rename from waku/v2/waku_rln_relay/rln_relay.nim rename to waku/waku_rln_relay/rln_relay.nim diff --git a/waku/v2/waku_store.nim b/waku/waku_store.nim similarity index 100% rename from waku/v2/waku_store.nim rename to waku/waku_store.nim diff --git a/waku/waku_store/README.md b/waku/waku_store/README.md new file mode 100644 index 000000000..f2068734f --- /dev/null +++ b/waku/waku_store/README.md @@ -0,0 +1,3 @@ +# Waku Store protocol + +The store protocol implements historical message support. See https://rfc.vac.dev/spec/13/ for more information. diff --git a/waku/v2/waku_store/client.nim b/waku/waku_store/client.nim similarity index 100% rename from waku/v2/waku_store/client.nim rename to waku/waku_store/client.nim diff --git a/waku/v2/waku_store/common.nim b/waku/waku_store/common.nim similarity index 100% rename from waku/v2/waku_store/common.nim rename to waku/waku_store/common.nim diff --git a/waku/v2/waku_store/protocol.nim b/waku/waku_store/protocol.nim similarity index 100% rename from waku/v2/waku_store/protocol.nim rename to waku/waku_store/protocol.nim diff --git a/waku/v2/waku_store/protocol_metrics.nim b/waku/waku_store/protocol_metrics.nim similarity index 100% rename from waku/v2/waku_store/protocol_metrics.nim rename to waku/waku_store/protocol_metrics.nim diff --git a/waku/v2/waku_store/rpc.nim b/waku/waku_store/rpc.nim similarity index 100% rename from waku/v2/waku_store/rpc.nim rename to waku/waku_store/rpc.nim diff --git a/waku/v2/waku_store/rpc_codec.nim b/waku/waku_store/rpc_codec.nim similarity index 99% rename from waku/v2/waku_store/rpc_codec.nim rename to waku/waku_store/rpc_codec.nim index 47c372f6f..3223fb7ec 100644 --- a/waku/v2/waku_store/rpc_codec.nim +++ b/waku/waku_store/rpc_codec.nim @@ -7,7 +7,7 @@ import std/options, nimcrypto/hash import - ../../common/protobuf, + ../common/protobuf, ../waku_core, ./common, ./rpc