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_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/constants.nim b/waku/waku_rln_relay/constants.nim similarity index 100% rename from waku/v2/waku_rln_relay/constants.nim rename to waku/waku_rln_relay/constants.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/parameters.key b/waku/waku_rln_relay/parameters.key similarity index 100% rename from waku/v2/waku_rln_relay/parameters.key rename to waku/waku_rln_relay/parameters.key 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