logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-07 16:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove references to v2 (#1898)

Browse Source 
* chore: remove references to v2

* fix: lingering rln-relay import path
This commit is contained in:
Hanno Cornelius 2023-08-09 18:11:50 +01:00 committed by GitHub
parent 0828b72afb
commit 5e2e1b6bd0
272 changed files with 613 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/ci-experimental.yml vendored
View File

@ -36,18 +36,17 @@ jobs:
- 'waku.nimble' - 'waku.nimble'
v2: v2:
- 'waku/common/**' - 'waku/**'
- 'waku/v2/**'
- 'apps/**' - 'apps/**'
- 'tools/**' - 'tools/**'
- 'tests/all_tests_v2.nim' - 'tests/all_tests_waku.nim'
- 'tests/v2/**' - 'tests/**'
outputs: outputs:
common: ${{ steps.filter.outputs.common }} common: ${{ steps.filter.outputs.common }}
v2: ${{ steps.filter.outputs.v2 }} v2: ${{ steps.filter.outputs.v2 }}
build-v2: build:
needs: changes needs: changes
if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }}
strategy: strategy:
@ -56,7 +55,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
name: build-v2-${{ matrix.os }} name: build-${{ matrix.os }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -75,9 +74,9 @@ jobs:
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
- name: Build binaries - 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 needs: changes
if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }}
strategy: strategy:
@ -86,7 +85,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
name: test-v2-${{ matrix.os }} name: test-${{ matrix.os }}
steps: steps:
- name: Checkout code - name: Checkout code
@ -116,4 +115,4 @@ jobs:
sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:9.6-alpine sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:9.6-alpine
fi 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

19
.github/workflows/ci.yml vendored
View File

@ -35,18 +35,17 @@ jobs:
- 'waku.nimble' - 'waku.nimble'
v2: v2:
- 'waku/common/**' - 'waku/**'
- 'waku/v2/**'
- 'apps/**' - 'apps/**'
- 'tools/**' - 'tools/**'
- 'tests/all_tests_v2.nim' - 'tests/all_tests_v2.nim'
- 'tests/v2/**' - 'tests/**'
outputs: outputs:
common: ${{ steps.filter.outputs.common }} common: ${{ steps.filter.outputs.common }}
v2: ${{ steps.filter.outputs.v2 }} v2: ${{ steps.filter.outputs.v2 }}
build-v2: build:
needs: changes needs: changes
if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }}
strategy: strategy:
@ -55,7 +54,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
name: build-v2-${{ matrix.os }} name: build-${{ matrix.os }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -74,9 +73,9 @@ jobs:
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
- name: Build binaries - 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 needs: changes
if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }} if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' }}
strategy: strategy:
@ -85,7 +84,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
name: test-v2-${{ matrix.os }} name: test-${{ matrix.os }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 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 sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:9.6-alpine
fi 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: build-docker-image:
needs: changes needs: changes
@ -125,7 +124,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
name: docker-build-v2-${{ matrix.os }} name: docker-build-${{ matrix.os }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3

4
.github/workflows/pre-release.yml vendored
View File

@ -61,11 +61,9 @@ jobs:
chat2\ chat2\
tools 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 tar -cvzf ${{steps.vars.outputs.nwakutools}} ./build/wakucanary ./build/networkmonitor
- name: upload artifacts - name: upload artifacts

2
Dockerfile
View File

@ -33,7 +33,7 @@ ARG MAKE_TARGET=wakunode2
LABEL maintainer="jakub@status.im" LABEL maintainer="jakub@status.im"
LABEL source="https://github.com/waku-org/nwaku" LABEL source="https://github.com/waku-org/nwaku"
LABEL description="Wakunode: Waku and Whisper client" LABEL description="Wakunode: Waku client"
LABEL commit="unknown" LABEL commit="unknown"
# DevP2P, LibP2P, and JSON RPC ports # DevP2P, LibP2P, and JSON RPC ports

27
Makefile
View File

@ -32,15 +32,12 @@ else # "variables.mk" was included. Business as usual until the end of this file
########## ##########
## Main ## ## 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 '.' # default target, because it's the first one that doesn't start with '.'
all: | v2 all: | wakunode2 example2 chat2 chat2bridge
test: | test2 test: | testcommon testwaku
test2: | testcommon testwaku2
v2: | wakunode2 example2 chat2 chat2bridge
waku.nims: waku.nims:
ln -s waku.nimble $@ ln -s waku.nimble $@
@ -162,14 +159,14 @@ testcommon: | build deps
$(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims $(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims
############# ##########
## Waku v2 ## ## Waku ##
############# ##########
.PHONY: testwaku2 wakunode2 testwakunode2 example2 chat2 chat2bridge .PHONY: testwaku wakunode2 testwakunode2 example2 chat2 chat2bridge
testwaku2: | build deps librln testwaku: | build deps librln
echo -e $(BUILD_MSG) "build/$@" && \ 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 wakunode2: | build deps librln
echo -e $(BUILD_MSG) "build/$@" && \ echo -e $(BUILD_MSG) "build/$@" && \
@ -192,9 +189,9 @@ chat2bridge: | build deps
$(ENV_SCRIPT) nim chat2bridge $(NIM_PARAMS) waku.nims $(ENV_SCRIPT) nim chat2bridge $(NIM_PARAMS) waku.nims
################### ################
## Waku v2 tools ## ## Waku tools ##
################### ################
.PHONY: tools wakucanary networkmonitor .PHONY: tools wakucanary networkmonitor
tools: networkmonitor wakucanary tools: networkmonitor wakucanary

20
apps/chat2/chat2.nim
View File

@ -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 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 nameresolving/dnsresolver]# define DNS resolution
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_lightpush, ../../waku/waku_lightpush,
../../waku/v2/waku_lightpush/rpc, ../../waku/waku_lightpush/rpc,
../../waku/v2/waku_filter, ../../waku/waku_filter,
../../waku/v2/waku_store, ../../waku/waku_store,
../../waku/v2/waku_dnsdisc, ../../waku/waku_dnsdisc,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/node/waku_metrics, ../../waku/node/waku_metrics,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/common/utils/nat, ../../waku/common/utils/nat,
./config_chat2 ./config_chat2
@ -42,7 +42,7 @@ when defined(rln):
libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/rpc/messages,
libp2p/protocols/pubsub/pubsub libp2p/protocols/pubsub/pubsub
import import
../../waku/v2/waku_rln_relay ../../waku/waku_rln_relay
const Help = """ const Help = """
Commands: /[?|help|connect|nick|exit] Commands: /[?|help|connect|nick|exit]

2
apps/chat2/config_chat2.nim
View File

@ -7,7 +7,7 @@ import
nimcrypto/utils, nimcrypto/utils,
eth/keys eth/keys
import import
../../../waku/v2/waku_core ../../../waku/waku_core
type type
Fleet* = enum Fleet* = enum

20
apps/chat2bridge/chat2bridge.nim
View File

@ -14,11 +14,11 @@ import
# Waku v2 imports # Waku v2 imports
libp2p/crypto/crypto, libp2p/crypto/crypto,
libp2p/errors, libp2p/errors,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../waku/v2/waku_filter, ../../waku/waku_filter,
../../waku/v2/waku_store, ../../waku/waku_store,
# Chat 2 imports # Chat 2 imports
../chat2/chat2, ../chat2/chat2,
# Common cli config # Common cli config
@ -216,11 +216,11 @@ proc stop*(cmb: Chat2MatterBridge) {.async.} =
when isMainModule: when isMainModule:
import import
../../../waku/common/utils/nat, ../../../waku/common/utils/nat,
../../waku/v2/node/message_cache, ../../waku/node/message_cache,
../../waku/v2/node/jsonrpc/debug/handlers as debug_api, ../../waku/node/jsonrpc/debug/handlers as debug_api,
../../waku/v2/node/jsonrpc/filter/handlers as filter_api, ../../waku/node/jsonrpc/filter/handlers as filter_api,
../../waku/v2/node/jsonrpc/relay/handlers as relay_api, ../../waku/node/jsonrpc/relay/handlers as relay_api,
../../waku/v2/node/jsonrpc/store/handlers as store_api ../../waku/node/jsonrpc/store/handlers as store_api
proc startV2Rpc(node: WakuNode, rpcServer: RpcHttpServer, conf: Chat2MatterbridgeConf) {.raises: [Exception].} = proc startV2Rpc(node: WakuNode, rpcServer: RpcHttpServer, conf: Chat2MatterbridgeConf) {.raises: [Exception].} =

12
apps/networkmonitor/networkmonitor.nim
View File

@ -20,12 +20,12 @@ import
metrics/chronos_httpserver, metrics/chronos_httpserver,
presto/[route, server, client] presto/[route, server, client]
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/waku_enr, ../../waku/waku_enr,
../../waku/v2/waku_discv5, ../../waku/waku_discv5,
../../waku/v2/waku_dnsdisc, ../../waku/waku_dnsdisc,
./networkmonitor_metrics, ./networkmonitor_metrics,
./networkmonitor_config, ./networkmonitor_config,
./networkmonitor_utils ./networkmonitor_utils

8
apps/wakucanary/wakucanary.nim
View File

@ -10,10 +10,10 @@ import
libp2p/nameresolving/dnsresolver, libp2p/nameresolving/dnsresolver,
libp2p/multicodec libp2p/multicodec
import import
../../waku/v2/waku_enr, ../../waku/waku_enr,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_node ../../waku/waku_node
# protocols and their tag # protocols and their tag
const ProtocolsTable = { const ProtocolsTable = {

58
apps/wakunode2/app.nim
View File

@ -20,41 +20,41 @@ import
import import
../../waku/common/utils/nat, ../../waku/common/utils/nat,
../../waku/common/databases/db_sqlite, ../../waku/common/databases/db_sqlite,
../../waku/v2/waku_archive/driver/builder, ../../waku/waku_archive/driver/builder,
../../waku/v2/waku_archive/retention_policy/builder, ../../waku/waku_archive/retention_policy/builder,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/node/waku_metrics, ../../waku/node/waku_metrics,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, ../../waku/node/peer_manager/peer_store/waku_peer_storage,
../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations, ../../waku/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
../../waku/v2/waku_archive, ../../waku/waku_archive,
../../waku/v2/waku_dnsdisc, ../../waku/waku_dnsdisc,
../../waku/v2/waku_enr, ../../waku/waku_enr,
../../waku/v2/waku_discv5, ../../waku/waku_discv5,
../../waku/v2/waku_peer_exchange, ../../waku/waku_peer_exchange,
../../waku/v2/waku_store, ../../waku/waku_store,
../../waku/v2/waku_lightpush, ../../waku/waku_lightpush,
../../waku/v2/waku_filter, ../../waku/waku_filter,
./wakunode2_validator_signed, ./wakunode2_validator_signed,
./internal_config, ./internal_config,
./external_config ./external_config
import import
../../waku/v2/node/message_cache, ../../waku/node/message_cache,
../../waku/v2/node/rest/server, ../../waku/node/rest/server,
../../waku/v2/node/rest/debug/handlers as rest_debug_api, ../../waku/node/rest/debug/handlers as rest_debug_api,
../../waku/v2/node/rest/relay/handlers as rest_relay_api, ../../waku/node/rest/relay/handlers as rest_relay_api,
../../waku/v2/node/rest/relay/topic_cache, ../../waku/node/rest/relay/topic_cache,
../../waku/v2/node/rest/filter/handlers as rest_filter_api, ../../waku/node/rest/filter/handlers as rest_filter_api,
../../waku/v2/node/rest/store/handlers as rest_store_api, ../../waku/node/rest/store/handlers as rest_store_api,
../../waku/v2/node/jsonrpc/admin/handlers as rpc_admin_api, ../../waku/node/jsonrpc/admin/handlers as rpc_admin_api,
../../waku/v2/node/jsonrpc/debug/handlers as rpc_debug_api, ../../waku/node/jsonrpc/debug/handlers as rpc_debug_api,
../../waku/v2/node/jsonrpc/filter/handlers as rpc_filter_api, ../../waku/node/jsonrpc/filter/handlers as rpc_filter_api,
../../waku/v2/node/jsonrpc/relay/handlers as rpc_relay_api, ../../waku/node/jsonrpc/relay/handlers as rpc_relay_api,
../../waku/v2/node/jsonrpc/store/handlers as rpc_store_api ../../waku/node/jsonrpc/store/handlers as rpc_store_api
when defined(rln): when defined(rln):
import ../../waku/v2/waku_rln_relay import ../../waku/waku_rln_relay
logScope: logScope:
topics = "wakunode app" topics = "wakunode app"

2
apps/wakunode2/external_config.nim
View File

@ -17,7 +17,7 @@ import
../../waku/common/confutils/envvar/defs as confEnvvarDefs, ../../waku/common/confutils/envvar/defs as confEnvvarDefs,
../../waku/common/confutils/envvar/std/net as confEnvvarNet, ../../waku/common/confutils/envvar/std/net as confEnvvarNet,
../../waku/common/logging, ../../waku/common/logging,
../../waku/v2/waku_enr ../../waku/waku_enr
export export
confTomlDefs, confTomlDefs,

4
apps/wakunode2/internal_config.nim
View File

@ -6,8 +6,8 @@ import
libp2p/multiaddress libp2p/multiaddress
import import
../../waku/common/utils/nat, ../../waku/common/utils/nat,
../../waku/v2/node/config, ../../waku/node/config,
../../waku/v2/waku_enr/capabilities, ../../waku/waku_enr/capabilities,
./external_config ./external_config
proc validateExtMultiAddrs*(vals: seq[string]): proc validateExtMultiAddrs*(vals: seq[string]):

4
apps/wakunode2/wakunode2_validator_signed.nim
View File

@ -19,8 +19,8 @@ import
const MessageWindowInSec = 5*60 # +- 5 minutes const MessageWindowInSec = 5*60 # +- 5 minutes
import import
../../waku/v2/waku_relay/protocol, ../../waku/waku_relay/protocol,
../../waku/v2/waku_core ../../waku/waku_core
declarePublicCounter waku_msg_validator_signed_outcome, "number of messages for each validation outcome", ["result"] declarePublicCounter waku_msg_validator_signed_outcome, "number of messages for each validation outcome", ["result"]

4
ci/Jenkinsfile.prs
View File

@ -66,7 +66,7 @@ pipeline {
stage('V2') { stage('V2') {
when { expression { v2changed } } when { expression { v2changed } }
steps { script { 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') { stage('V2') {
when { expression { v2changed } } when { expression { v2changed } }
steps { script { 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")
} } } }
} }
} }

0
docs/api/v2/node.md → docs/api/node.md
View File

0
docs/api/v2/rest-api.md → docs/api/rest-api.md
View File

6
docs/tutorial/chat2.md
View File

@ -2,7 +2,7 @@
## Background ## 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. 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. 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. The Waku team is currently using this application on the _production_ fleet for internal testing.
@ -56,7 +56,7 @@ quitting...
## Retrieving historical messages ## 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: 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 ## 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 ./build/chat2 --staticnode:/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ

4
docs/tutorial/db-migration.md
View File

@ -4,11 +4,11 @@ This tutorial explains the database migration process in nim-waku.
# Contributors Guide # Contributors Guide
## Database Migration Flow ## Database Migration Flow
Nim-waku utilizes the built-in `user_version` variable that Sqlite provides for tracking the database versions. 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. 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 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. 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 ## Migration Folder Structure

2
examples/v2/README.md → examples/README.md
View File

@ -13,7 +13,7 @@ TODO
## publisher/subscriber ## 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:** **Some notes:**
* These examples are meant to work even in if you are behind a firewall and you can't be discovered by discv5. * These examples are meant to work even in if you are behind a firewall and you can't be discovered by discv5.

6
examples/v2/filter_subscriber.nim → examples/filter_subscriber.nim
View File

@ -8,9 +8,9 @@ import
stew/results stew/results
import import
../../../waku/common/logging, ../../../waku/common/logging,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_filter_v2/client ../../../waku/waku_filter_v2/client
const const
FilterPeer = "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS" # node-01.gc-us-central1-a.wakuv2.test.statusim.net on wakuv2.test FilterPeer = "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS" # node-01.gc-us-central1-a.wakuv2.test.statusim.net on wakuv2.test

6
examples/v2/lightpush_publisher.nim → examples/lightpush_publisher.nim
View File

@ -8,9 +8,9 @@ import
stew/results stew/results
import import
../../../waku/common/logging, ../../../waku/common/logging,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_lightpush/client ../../../waku/waku_lightpush/client
const const
LightpushPeer = "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ" # node-01.do-ams3.wakuv2.test.statusim.net on wakuv2.test LightpushPeer = "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ" # node-01.do-ams3.wakuv2.test.statusim.net on wakuv2.test

0
examples/v2/nim.cfg → examples/nim.cfg
View File

10
examples/v2/publisher.nim → examples/publisher.nim
View File

@ -11,11 +11,11 @@ import
import import
../../../waku/common/logging, ../../../waku/common/logging,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/waku_enr, ../../../waku/waku_enr,
../../../waku/v2/waku_discv5 ../../../waku/waku_discv5
proc now*(): Timestamp = proc now*(): Timestamp =
getNanosecondTime(getTime().toUnixFloat()) getNanosecondTime(getTime().toUnixFloat())

10
examples/v2/subscriber.nim → examples/subscriber.nim
View File

@ -11,11 +11,11 @@ import
import import
../../../waku/common/logging, ../../../waku/common/logging,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/waku_enr, ../../../waku/waku_enr,
../../../waku/v2/waku_discv5 ../../../waku/waku_discv5
# An accesible bootstrap node. See wakuv2.prod fleets.status.im # An accesible bootstrap node. See wakuv2.prod fleets.status.im
const bootstrapNode = "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZl" & const bootstrapNode = "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZl" &

2
library/events/json_message_event.nim
View File

@ -2,7 +2,7 @@
import import
std/json std/json
import import
../../waku/v2/waku_core/message/message, ../../waku/waku_core/message/message,
./json_base_event ./json_base_event
type JsonMessage = ref object type JsonMessage = ref object

8
library/libwaku.nim
View File

@ -10,10 +10,10 @@ import
chronicles, chronicles,
chronos chronos
import import
../../waku/v2/waku_core/message/message, ../../waku/waku_core/message/message,
../../waku/v2/node/waku_node, ../../waku/node/waku_node,
../../waku/v2/waku_core/topics/pubsub_topic, ../../waku/waku_core/topics/pubsub_topic,
../../../waku/v2/waku_relay/protocol, ../../../waku/waku_relay/protocol,
./events/json_message_event, ./events/json_message_event,
./waku_thread/waku_thread, ./waku_thread/waku_thread,
./waku_thread/inter_thread_communication/node_lifecycle_request, ./waku_thread/inter_thread_communication/node_lifecycle_request,

6
library/waku_thread/config.nim
View File

@ -6,10 +6,10 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
libp2p/crypto/secp, libp2p/crypto/secp,
stew/shims/net, stew/shims/net,
../../waku/v2/waku_enr/capabilities, ../../waku/waku_enr/capabilities,
../../waku/common/utils/nat, ../../waku/common/utils/nat,
../../waku/v2/node/waku_node, ../../waku/node/waku_node,
../../waku/v2/node/config, ../../waku/node/config,
../events/[json_error_event,json_base_event] ../events/[json_error_event,json_base_event]
proc parsePrivateKey(jsonNode: JsonNode, proc parsePrivateKey(jsonNode: JsonNode,

2
library/waku_thread/inter_thread_communication/node_lifecycle_request.nim
View File

@ -6,7 +6,7 @@ import
stew/results, stew/results,
stew/shims/net stew/shims/net
import import
../../../waku/v2/node/waku_node, ../../../waku/node/waku_node,
./request ./request
type type

2
library/waku_thread/inter_thread_communication/peer_manager_request.nim
View File

@ -7,7 +7,7 @@ import
stew/results, stew/results,
stew/shims/net stew/shims/net
import import
../../../waku/v2/node/waku_node, ../../../waku/node/waku_node,
./request ./request
type type

8
library/waku_thread/inter_thread_communication/protocols/relay_request.nim
View File

@ -7,10 +7,10 @@ import
stew/results, stew/results,
stew/shims/net stew/shims/net
import import
../../../../waku/v2/waku_core/message/message, ../../../../waku/waku_core/message/message,
../../../../waku/v2/node/waku_node, ../../../../waku/node/waku_node,
../../../../waku/v2/waku_core/topics/pubsub_topic, ../../../../waku/waku_core/topics/pubsub_topic,
../../../../waku/v2/waku_relay/protocol, ../../../../waku/waku_relay/protocol,
../request ../request
type type

2
library/waku_thread/inter_thread_communication/request.nim
View File

@ -8,7 +8,7 @@ import
import import
chronos chronos
import import
../../../waku/v2/node/waku_node, ../../../waku/node/waku_node,
../waku_thread ../waku_thread
type type

22
library/waku_thread/waku_thread.nim
View File

@ -12,17 +12,17 @@ import
stew/shims/net stew/shims/net
import import
../../../waku/common/enr/builder, ../../../waku/common/enr/builder,
../../../waku/v2/waku_enr/capabilities, ../../../waku/waku_enr/capabilities,
../../../waku/v2/waku_enr/multiaddr, ../../../waku/waku_enr/multiaddr,
../../../waku/v2/waku_enr/sharding, ../../../waku/waku_enr/sharding,
../../../waku/v2/waku_core/message/message, ../../../waku/waku_core/message/message,
../../../waku/v2/waku_core/topics/pubsub_topic, ../../../waku/waku_core/topics/pubsub_topic,
../../../waku/v2/node/peer_manager/peer_manager, ../../../waku/node/peer_manager/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/waku_node, ../../../waku/node/waku_node,
../../../waku/v2/node/builder, ../../../waku/node/builder,
../../../waku/v2/node/config, ../../../waku/node/config,
../../../waku/v2/waku_relay/protocol, ../../../waku/waku_relay/protocol,
../events/[json_error_event,json_message_event,json_base_event], ../events/[json_error_event,json_message_event,json_base_event],
../alloc, ../alloc,
./config, ./config,

105
tests/all_tests_v2.nim
View File

@ -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

105
tests/all_tests_waku.nim Normal file
View File

@ -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

2
tests/common/test_enr_builder.nim
View File

@ -7,7 +7,7 @@ import
testutils/unittests testutils/unittests
import import
../../waku/common/enr, ../../waku/common/enr,
../v2/testlib/wakucore ../testlib/wakucore
suite "nim-eth ENR - builder and typed record": suite "nim-eth ENR - builder and typed record":

4
tests/v2/test_message_cache.nim → tests/test_message_cache.nim
View File

@ -5,8 +5,8 @@ import
testutils/unittests, testutils/unittests,
chronicles chronicles
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/node/message_cache, ../../waku/node/message_cache,
./testlib/common, ./testlib/common,
./testlib/wakucore ./testlib/wakucore

4
tests/v2/test_peer_exchange.nim → tests/test_peer_exchange.nim
View File

@ -10,8 +10,8 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
libp2p/protocols/pubsub/gossipsub libp2p/protocols/pubsub/gossipsub
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_node, ../../waku/waku_node,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

16
tests/v2/test_peer_manager.nim → tests/test_peer_manager.nim
View File

@ -18,14 +18,14 @@ import
libp2p/peerid libp2p/peerid
import import
../../waku/common/databases/db_sqlite, ../../waku/common/databases/db_sqlite,
../../waku/v2/node/peer_manager/peer_manager, ../../waku/node/peer_manager/peer_manager,
../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, ../../waku/node/peer_manager/peer_store/waku_peer_storage,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/waku_relay, ../../waku/waku_relay,
../../waku/v2/waku_store, ../../waku/waku_store,
../../waku/v2/waku_filter, ../../waku/waku_filter,
../../waku/v2/waku_lightpush, ../../waku/waku_lightpush,
../../waku/v2/waku_peer_exchange, ../../waku/waku_peer_exchange,
./testlib/common, ./testlib/common,
./testlib/testutils, ./testlib/testutils,
./testlib/wakucore, ./testlib/wakucore,

4
tests/v2/test_peer_storage.nim → tests/test_peer_storage.nim
View File

@ -5,8 +5,8 @@ import
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/common/databases/db_sqlite, ../../waku/common/databases/db_sqlite,
../../waku/v2/node/peer_manager/peer_manager, ../../waku/node/peer_manager/peer_manager,
../../waku/v2/node/peer_manager/peer_store/waku_peer_storage, ../../waku/node/peer_manager/peer_store/waku_peer_storage,
./testlib/wakucore ./testlib/wakucore

6
tests/v2/test_peer_store_extended.nim → tests/test_peer_store_extended.nim
View File

@ -9,9 +9,9 @@ import
libp2p/multiaddress, libp2p/multiaddress,
testutils/unittests testutils/unittests
import import
../../waku/v2/node/peer_manager/peer_manager, ../../waku/node/peer_manager/peer_manager,
../../waku/v2/node/peer_manager/waku_peer_store, ../../waku/node/peer_manager/waku_peer_store,
../../waku/v2/waku_node, ../../waku/waku_node,
./testlib/wakucore ./testlib/wakucore

4
tests/v2/test_utils_compat.nim → tests/test_utils_compat.nim
View File

@ -4,8 +4,8 @@ import
testutils/unittests testutils/unittests
import import
stew/results, stew/results,
../../waku/v2/waku_core/message, ../../waku/waku_core/message,
../../waku/v2/waku_core/time, ../../waku/waku_core/time,
./testlib/common ./testlib/common
suite "Waku Payload": suite "Waku Payload":

4
tests/v2/test_waku_discv5.nim → tests/test_waku_discv5.nim
View File

@ -9,8 +9,8 @@ import
libp2p/crypto/crypto as libp2p_keys, libp2p/crypto/crypto as libp2p_keys,
eth/keys as eth_keys eth/keys as eth_keys
import import
../../waku/v2/waku_enr, ../../waku/waku_enr,
../../waku/v2/waku_discv5, ../../waku/waku_discv5,
./testlib/common, ./testlib/common,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

6
tests/v2/test_waku_dnsdisc.nim → tests/test_waku_dnsdisc.nim
View File

@ -11,9 +11,9 @@ import
eth/keys, eth/keys,
discovery/dnsdisc/builder discovery/dnsdisc/builder
import import
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/waku_dnsdisc, ../../waku/waku_dnsdisc,
./testlib/common, ./testlib/common,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

4
tests/v2/test_waku_enr.nim → tests/test_waku_enr.nim
View File

@ -5,8 +5,8 @@ import
stew/results, stew/results,
testutils/unittests testutils/unittests
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_enr, ../../waku/waku_enr,
./testlib/wakucore ./testlib/wakucore

8
tests/v2/test_waku_filter.nim → tests/test_waku_filter.nim
View File

@ -7,10 +7,10 @@ import
chronos, chronos,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_filter, ../../waku/waku_filter,
../../waku/v2/waku_filter/client, ../../waku/waku_filter/client,
./testlib/common, ./testlib/common,
./testlib/wakucore ./testlib/wakucore

4
tests/v2/test_waku_keepalive.nim → tests/test_waku_keepalive.nim
View File

@ -12,8 +12,8 @@ import
libp2p/stream/connection, libp2p/stream/connection,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_node, ../../waku/waku_node,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

4
tests/v2/test_waku_keystore.nim → tests/test_waku_keystore.nim
View File

@ -4,10 +4,10 @@ import
std/[algorithm, json, options, os], std/[algorithm, json, options, os],
testutils/unittests, chronos, stint testutils/unittests, chronos, stint
import import
../../waku/v2/waku_keystore, ../../waku/waku_keystore,
./testlib/common ./testlib/common
from ../../waku/v2/waku_noise/noise_utils import randomSeqByte from ../../waku/waku_noise/noise_utils import randomSeqByte
procSuite "Credentials test suite": procSuite "Credentials test suite":

4
tests/v2/test_waku_keystore_keyfile.nim → tests/test_waku_keystore_keyfile.nim
View File

@ -6,10 +6,10 @@ import
testutils/unittests, chronos, testutils/unittests, chronos,
eth/keys eth/keys
import import
../../waku/v2/waku_keystore, ../../waku/waku_keystore,
./testlib/common ./testlib/common
from ../../waku/v2/waku_noise/noise_utils import randomSeqByte from ../../waku/waku_noise/noise_utils import randomSeqByte
suite "KeyFile test suite": suite "KeyFile test suite":

8
tests/v2/test_waku_lightpush.nim → tests/test_waku_lightpush.nim
View File

@ -6,10 +6,10 @@ import
chronos, chronos,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_lightpush, ../../waku/waku_lightpush,
../../waku/v2/waku_lightpush/client, ../../waku/waku_lightpush/client,
./testlib/common, ./testlib/common,
./testlib/wakucore ./testlib/wakucore

12
tests/v2/test_waku_noise.nim → tests/test_waku_noise.nim
View File

@ -9,12 +9,12 @@ import
libp2p/protobuf/minprotobuf, libp2p/protobuf/minprotobuf,
stew/endians2 stew/endians2
import import
../../waku/v2/utils/noise as waku_message_utils, ../../waku/utils/noise as waku_message_utils,
../../waku/v2/waku_noise/noise_types, ../../waku/waku_noise/noise_types,
../../waku/v2/waku_noise/noise_utils, ../../waku/waku_noise/noise_utils,
../../waku/v2/waku_noise/noise, ../../waku/waku_noise/noise,
../../waku/v2/waku_noise/noise_handshake_processing, ../../waku/waku_noise/noise_handshake_processing,
../../waku/v2/waku_core, ../../waku/waku_core,
./testlib/common ./testlib/common

10
tests/v2/test_waku_noise_sessions.nim → tests/test_waku_noise_sessions.nim
View File

@ -6,11 +6,11 @@ import
testutils/unittests testutils/unittests
import import
../../waku/common/protobuf, ../../waku/common/protobuf,
../../waku/v2/utils/noise as waku_message_utils, ../../waku/utils/noise as waku_message_utils,
../../waku/v2/waku_noise/noise_types, ../../waku/waku_noise/noise_types,
../../waku/v2/waku_noise/noise_utils, ../../waku/waku_noise/noise_utils,
../../waku/v2/waku_noise/noise_handshake_processing, ../../waku/waku_noise/noise_handshake_processing,
../../waku/v2/waku_core, ../../waku/waku_core,
./testlib/common ./testlib/common
procSuite "Waku Noise Sessions": procSuite "Waku Noise Sessions":

14
tests/v2/test_waku_peer_exchange.nim → tests/test_waku_peer_exchange.nim
View File

@ -14,13 +14,13 @@ import
eth/keys, eth/keys,
eth/p2p/discoveryv5/enr eth/p2p/discoveryv5/enr
import import
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_discv5, ../../waku/waku_discv5,
../../waku/v2/waku_peer_exchange, ../../waku/waku_peer_exchange,
../../waku/v2/waku_peer_exchange/rpc, ../../waku/waku_peer_exchange/rpc,
../../waku/v2/waku_peer_exchange/rpc_codec, ../../waku/waku_peer_exchange/rpc_codec,
../../waku/v2/waku_peer_exchange/protocol, ../../waku/waku_peer_exchange/protocol,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

2
tests/v2/test_waku_rendezvous.nim → tests/test_waku_rendezvous.nim
View File

@ -7,7 +7,7 @@ import
libp2p/protocols/rendezvous libp2p/protocols/rendezvous
import import
../../waku/v2/node/waku_switch, ../../waku/node/waku_switch,
./testlib/common, ./testlib/common,
./testlib/wakucore ./testlib/wakucore

2
tests/v2/test_waku_switch.nim → tests/test_waku_switch.nim
View File

@ -9,7 +9,7 @@ import
libp2p/protocols/connectivity/relay/client, libp2p/protocols/connectivity/relay/client,
stew/byteutils stew/byteutils
import import
../../waku/v2/node/waku_switch, ../../waku/node/waku_switch,
./testlib/common, ./testlib/common,
./testlib/wakucore ./testlib/wakucore

12
tests/v2/test_wakunode.nim → tests/test_wakunode.nim
View File

@ -17,11 +17,11 @@ import
libp2p/nameresolving/mockresolver, libp2p/nameresolving/mockresolver,
eth/p2p/discoveryv5/enr eth/p2p/discoveryv5/enr
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_relay, ../../waku/waku_relay,
../../waku/v2/waku_peer_exchange, ../../waku/waku_peer_exchange,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode
@ -155,7 +155,7 @@ suite "WakuNode":
bindPort = Port(61004), bindPort = Port(61004),
wsBindPort = Port(8000), wsBindPort = Port(8000),
wssEnabled = true, wssEnabled = true,
secureKey = "../../waku/v2/node/key_dummy.txt") secureKey = "../../waku/node/key_dummy.txt")
asyncTest "Peer info updates with correct announced addresses": asyncTest "Peer info updates with correct announced addresses":
let let

6
tests/v2/test_wakunode_filter.nim → tests/test_wakunode_filter.nim
View File

@ -7,9 +7,9 @@ import
chronos, chronos,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
./testlib/common, ./testlib/common,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

8
tests/v2/test_wakunode_lightpush.nim → tests/test_wakunode_lightpush.nim
View File

@ -8,10 +8,10 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
libp2p/switch libp2p/switch
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_lightpush, ../../waku/waku_lightpush,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
./testlib/common, ./testlib/common,
./testlib/wakucore, ./testlib/wakucore,
./testlib/wakunode ./testlib/wakunode

0
tests/v2/testlib/common.nim → tests/testlib/common.nim
View File

0
tests/v2/testlib/testutils.nim → tests/testlib/testutils.nim
View File

2
tests/v2/testlib/wakucore.nim → tests/testlib/wakucore.nim
View File

@ -8,7 +8,7 @@ import
libp2p/crypto/crypto as libp2p_keys, libp2p/crypto/crypto as libp2p_keys,
eth/keys as eth_keys eth/keys as eth_keys
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
./common ./common
export switch export switch

8
tests/v2/testlib/wakunode.nim → tests/testlib/wakunode.nim
View File

@ -9,10 +9,10 @@ import
libp2p/crypto/crypto as libp2p_keys, libp2p/crypto/crypto as libp2p_keys,
eth/keys as eth_keys eth/keys as eth_keys
import import
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_enr, ../../../waku/waku_enr,
../../../waku/v2/waku_discv5, ../../../waku/waku_discv5,
./common ./common

6
tests/v2/waku_archive/test_driver_postgres.nim → tests/waku_archive/test_driver_postgres.nim
View File

@ -5,9 +5,9 @@ import
testutils/unittests, testutils/unittests,
chronos chronos
import import
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/postgres_driver, ../../../waku/waku_archive/driver/postgres_driver,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/wakucore ../testlib/wakucore
proc now():int64 = getTime().toUnix() proc now():int64 = getTime().toUnix()

6
tests/v2/waku_archive/test_driver_postgres_query.nim → tests/waku_archive/test_driver_postgres_query.nim
View File

@ -6,9 +6,9 @@ import
chronos, chronos,
chronicles chronicles
import import
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/postgres_driver, ../../../waku/waku_archive/driver/postgres_driver,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

8
tests/v2/waku_archive/test_driver_queue.nim → tests/waku_archive/test_driver_queue.nim
View File

@ -5,10 +5,10 @@ import
stew/results, stew/results,
testutils/unittests testutils/unittests
import import
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, ../../../waku/waku_archive/driver/queue_driver/queue_driver {.all.},
../../../waku/v2/waku_archive/driver/queue_driver/index, ../../../waku/waku_archive/driver/queue_driver/index,
../../../waku/v2/waku_core ../../../waku/waku_core
# Helper functions # Helper functions

4
tests/v2/waku_archive/test_driver_queue_index.nim → tests/waku_archive/test_driver_queue_index.nim
View File

@ -6,8 +6,8 @@ import
testutils/unittests, testutils/unittests,
nimcrypto nimcrypto
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_archive/driver/queue_driver/index ../../../waku/waku_archive/driver/queue_driver/index
## Helpers ## Helpers

8
tests/v2/waku_archive/test_driver_queue_pagination.nim → tests/waku_archive/test_driver_queue_pagination.nim
View File

@ -5,10 +5,10 @@ import
testutils/unittests, testutils/unittests,
libp2p/protobuf/minprotobuf libp2p/protobuf/minprotobuf
import import
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/queue_driver/queue_driver {.all.}, ../../../waku/waku_archive/driver/queue_driver/queue_driver {.all.},
../../../waku/v2/waku_archive/driver/queue_driver/index, ../../../waku/waku_archive/driver/queue_driver/index,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

6
tests/v2/waku_archive/test_driver_queue_query.nim → tests/waku_archive/test_driver_queue_query.nim
View File

@ -6,9 +6,9 @@ import
chronos, chronos,
chronicles chronicles
import import
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/queue_driver, ../../../waku/waku_archive/driver/queue_driver,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

6
tests/v2/waku_archive/test_driver_sqlite.nim → tests/waku_archive/test_driver_sqlite.nim
View File

@ -6,9 +6,9 @@ import
chronos chronos
import import
../../../waku/common/databases/db_sqlite, ../../../waku/common/databases/db_sqlite,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/waku_archive/driver/sqlite_driver,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

6
tests/v2/waku_archive/test_driver_sqlite_query.nim → tests/waku_archive/test_driver_sqlite_query.nim
View File

@ -7,9 +7,9 @@ import
chronicles chronicles
import import
../../../waku/common/databases/db_sqlite, ../../../waku/common/databases/db_sqlite,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/waku_archive/driver/sqlite_driver,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

10
tests/v2/waku_archive/test_retention_policy.nim → tests/waku_archive/test_retention_policy.nim
View File

@ -7,11 +7,11 @@ import
chronos chronos
import import
../../../waku/common/databases/db_sqlite, ../../../waku/common/databases/db_sqlite,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/waku_archive/driver/sqlite_driver,
../../../waku/v2/waku_archive/retention_policy, ../../../waku/waku_archive/retention_policy,
../../../waku/v2/waku_archive/retention_policy/retention_policy_capacity, ../../../waku/waku_archive/retention_policy/retention_policy_capacity,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

6
tests/v2/waku_archive/test_waku_archive.nim → tests/waku_archive/test_waku_archive.nim
View File

@ -8,9 +8,9 @@ import
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../../waku/common/databases/db_sqlite, ../../../waku/common/databases/db_sqlite,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/waku_archive/driver/sqlite_driver,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

2
tests/v2/waku_core/test_message_digest.nim → tests/waku_core/test_message_digest.nim
View File

@ -5,7 +5,7 @@ import
stew/byteutils, stew/byteutils,
testutils/unittests testutils/unittests
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/wakucore ../testlib/wakucore
suite "Waku Message - Deterministic hashing": suite "Waku Message - Deterministic hashing":

2
tests/v2/waku_core/test_namespaced_topics.nim → tests/waku_core/test_namespaced_topics.nim
View File

@ -5,7 +5,7 @@ import
stew/results, stew/results,
testutils/unittests testutils/unittests
import import
../../../waku/v2/waku_core/topics ../../../waku/waku_core/topics
suite "Waku Message - Content topics namespacing": suite "Waku Message - Content topics namespacing":

2
tests/v2/waku_core/test_peers.nim → tests/waku_core/test_peers.nim
View File

@ -7,7 +7,7 @@ import
libp2p/peerid, libp2p/peerid,
libp2p/errors libp2p/errors
import import
../../waku/v2/waku_core ../../waku/waku_core
suite "Waku Core - Peers": suite "Waku Core - Peers":

2
tests/v2/waku_core/test_sharding.nim → tests/waku_core/test_sharding.nim
View File

@ -9,7 +9,7 @@ import
stew/results, stew/results,
testutils/unittests testutils/unittests
import import
../../../waku/v2/waku_core/topics ../../../waku/waku_core/topics
suite "Waku Sharding": suite "Waku Sharding":

2
tests/v2/waku_core/test_time.nim → tests/waku_core/test_time.nim
View File

@ -3,7 +3,7 @@
import import
testutils/unittests testutils/unittests
import import
../../waku/v2/waku_core/time ../../waku/waku_core/time
suite "Waku Core - Time": suite "Waku Core - Time":

10
tests/v2/waku_filter_v2/test_waku_filter.nim → tests/waku_filter_v2/test_waku_filter.nim
View File

@ -7,11 +7,11 @@ import
chronicles, chronicles,
libp2p/peerstore libp2p/peerstore
import import
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_filter_v2, ../../../waku/waku_filter_v2,
../../../waku/v2/waku_filter_v2/client, ../../../waku/waku_filter_v2/client,
../../../waku/v2/waku_filter_v2/rpc, ../../../waku/waku_filter_v2/rpc,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

10
tests/v2/waku_filter_v2/test_waku_filter_protocol.nim → tests/waku_filter_v2/test_waku_filter_protocol.nim
View File

@ -7,11 +7,11 @@ import
chronicles, chronicles,
libp2p/peerstore libp2p/peerstore
import import
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_filter_v2, ../../../waku/waku_filter_v2,
../../../waku/v2/waku_filter_v2/rpc, ../../../waku/waku_filter_v2/rpc,
../../../waku/v2/waku_filter_v2/subscriptions, ../../../waku/waku_filter_v2/subscriptions,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

0
tests/v2/waku_relay/resources/test_cert.pem → tests/waku_relay/resources/test_cert.pem
View File

0
tests/v2/waku_relay/resources/test_key.pem → tests/waku_relay/resources/test_key.pem
View File

6
tests/v2/waku_relay/test_waku_relay.nim → tests/waku_relay/test_waku_relay.nim
View File

@ -9,9 +9,9 @@ import
libp2p/protocols/pubsub/pubsub, libp2p/protocols/pubsub/pubsub,
libp2p/protocols/pubsub/rpc/messages libp2p/protocols/pubsub/rpc/messages
import import
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_relay, ../../../waku/waku_relay,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

8
tests/v2/waku_relay/test_wakunode_relay.nim → tests/waku_relay/test_wakunode_relay.nim
View File

@ -18,10 +18,10 @@ import
libp2p/multihash, libp2p/multihash,
secp256k1 secp256k1
import import
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/waku_relay, ../../waku/waku_relay,
../testlib/testutils, ../testlib/testutils,
../testlib/common, ../testlib/common,
../testlib/wakucore, ../testlib/wakucore,

12
tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim → tests/waku_rln_relay/test_rln_group_manager_onchain.nim
View File

@ -18,12 +18,12 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
eth/keys eth/keys
import import
../../../waku/v2/waku_rln_relay/protocol_types, ../../../waku/waku_rln_relay/protocol_types,
../../../waku/v2/waku_rln_relay/constants, ../../../waku/waku_rln_relay/constants,
../../../waku/v2/waku_rln_relay/contract, ../../../waku/waku_rln_relay/contract,
../../../waku/v2/waku_rln_relay/rln, ../../../waku/waku_rln_relay/rln,
../../../waku/v2/waku_rln_relay/conversion_utils, ../../../waku/waku_rln_relay/conversion_utils,
../../../waku/v2/waku_rln_relay/group_manager/on_chain/group_manager, ../../../waku/waku_rln_relay/group_manager/on_chain/group_manager,
../testlib/common, ../testlib/common,
./utils ./utils

8
tests/v2/waku_rln_relay/test_rln_group_manager_static.nim → tests/waku_rln_relay/test_rln_group_manager_static.nim
View File

@ -9,10 +9,10 @@ import
testutils/unittests, testutils/unittests,
stew/results, stew/results,
options, options,
../../../waku/v2/waku_rln_relay/protocol_types, ../../../waku/waku_rln_relay/protocol_types,
../../../waku/v2/waku_rln_relay/rln, ../../../waku/waku_rln_relay/rln,
../../../waku/v2/waku_rln_relay/conversion_utils, ../../../waku/waku_rln_relay/conversion_utils,
../../../waku/v2/waku_rln_relay/group_manager/static/group_manager ../../../waku/waku_rln_relay/group_manager/static/group_manager
import import
stew/shims/net, stew/shims/net,

10
tests/v2/waku_rln_relay/test_waku_rln_relay.nim → tests/waku_rln_relay/test_waku_rln_relay.nim
View File

@ -11,11 +11,11 @@ import
stint, stint,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_rln_relay, ../../../waku/waku_rln_relay,
../../../waku/v2/waku_rln_relay/rln, ../../../waku/waku_rln_relay/rln,
../../../waku/v2/waku_rln_relay/protocol_metrics, ../../../waku/waku_rln_relay/protocol_metrics,
../../../waku/v2/waku_keystore, ../../../waku/waku_keystore,
../testlib/common ../testlib/common
const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto" const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto"

8
tests/v2/waku_rln_relay/test_wakunode_rln_relay.nim → tests/waku_rln_relay/test_wakunode_rln_relay.nim
View File

@ -14,10 +14,10 @@ import
libp2p/protocols/pubsub/pubsub, libp2p/protocols/pubsub/pubsub,
eth/keys eth/keys
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/waku_rln_relay, ../../../waku/waku_rln_relay,
../../../waku/v2/waku_keystore, ../../../waku/waku_keystore,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

0
tests/v2/waku_rln_relay/utils.nim → tests/waku_rln_relay/utils.nim
View File

8
tests/v2/waku_store/test_resume.nim → tests/waku_store/test_resume.nim
View File

@ -8,10 +8,10 @@ import
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/common/databases/db_sqlite, ../../waku/common/databases/db_sqlite,
../../waku/v2/node/message_store/sqlite_store, ../../waku/node/message_store/sqlite_store,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/waku_store, ../../waku/waku_store,
./testlib/common, ./testlib/common,
./testlib/switch ./testlib/switch

6
tests/v2/waku_store/test_rpc_codec.nim → tests/waku_store/test_rpc_codec.nim
View File

@ -6,9 +6,9 @@ import
chronos chronos
import import
../../../waku/common/protobuf, ../../../waku/common/protobuf,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_store/rpc, ../../../waku/waku_store/rpc,
../../../waku/v2/waku_store/rpc_codec, ../../../waku/waku_store/rpc_codec,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

8
tests/v2/waku_store/test_waku_store.nim → tests/waku_store/test_waku_store.nim
View File

@ -7,10 +7,10 @@ import
chronicles, chronicles,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_store, ../../../waku/waku_store,
../../../waku/v2/waku_store/client, ../../../waku/waku_store/client,
../testlib/common, ../testlib/common,
../testlib/wakucore ../testlib/wakucore

14
tests/v2/waku_store/test_wakunode_store.nim → tests/waku_store/test_wakunode_store.nim
View File

@ -14,13 +14,13 @@ import
libp2p/protocols/pubsub/gossipsub libp2p/protocols/pubsub/gossipsub
import import
../../../waku/common/databases/db_sqlite, ../../../waku/common/databases/db_sqlite,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/sqlite_driver, ../../../waku/waku_archive/driver/sqlite_driver,
../../../waku/v2/waku_store, ../../../waku/waku_store,
../../../waku/v2/waku_filter, ../../../waku/waku_filter,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../testlib/common, ../testlib/common,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

4
tests/wakunode2/test_app.nim
View File

@ -12,8 +12,8 @@ import
import import
../../apps/wakunode2/external_config, ../../apps/wakunode2/external_config,
../../apps/wakunode2/app, ../../apps/wakunode2/app,
../v2/testlib/common, ../testlib/common,
../v2/testlib/wakucore ../testlib/wakucore
proc defaultTestWakuNodeConf(): WakuNodeConf = proc defaultTestWakuNodeConf(): WakuNodeConf =
WakuNodeConf( WakuNodeConf(

12
tests/wakunode2/test_validators.nim
View File

@ -14,12 +14,12 @@ import
secp256k1 secp256k1
import import
../../apps/wakunode2/wakunode2_validator_signed, ../../apps/wakunode2/wakunode2_validator_signed,
../../waku/v2/waku_core, ../../waku/waku_core,
../../waku/v2/node/peer_manager, ../../waku/node/peer_manager,
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/waku_relay, ../../waku/waku_relay,
../v2/testlib/wakucore, ../testlib/wakucore,
../v2/testlib/wakunode ../testlib/wakunode
suite "WakuNode2 - Validators": suite "WakuNode2 - Validators":

20
tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim → tests/wakunode_jsonrpc/test_jsonrpc_admin.nim
View File

@ -10,16 +10,16 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
json_rpc/[rpcserver, rpcclient] json_rpc/[rpcserver, rpcclient]
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/jsonrpc/admin/handlers as admin_api, ../../../waku/node/jsonrpc/admin/handlers as admin_api,
../../../waku/v2/node/jsonrpc/admin/client as admin_api_client, ../../../waku/node/jsonrpc/admin/client as admin_api_client,
../../../waku/v2/waku_relay, ../../../waku/waku_relay,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/queue_driver, ../../../waku/waku_archive/driver/queue_driver,
../../../waku/v2/waku_store, ../../../waku/waku_store,
../../../waku/v2/waku_filter, ../../../waku/waku_filter,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

8
tests/v2/wakunode_jsonrpc/test_jsonrpc_debug.nim → tests/wakunode_jsonrpc/test_jsonrpc_debug.nim
View File

@ -9,10 +9,10 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
json_rpc/[rpcserver, rpcclient] json_rpc/[rpcserver, rpcclient]
import import
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/jsonrpc/debug/handlers as debug_api, ../../../waku/node/jsonrpc/debug/handlers as debug_api,
../../../waku/v2/node/jsonrpc/debug/client as debug_api_client, ../../../waku/node/jsonrpc/debug/client as debug_api_client,
../testlib/common, ../testlib/common,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

18
tests/v2/wakunode_jsonrpc/test_jsonrpc_filter.nim → tests/wakunode_jsonrpc/test_jsonrpc_filter.nim
View File

@ -8,15 +8,15 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
json_rpc/[rpcserver, rpcclient] json_rpc/[rpcserver, rpcclient]
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/message_cache, ../../../waku/node/message_cache,
../../../waku/v2/node/jsonrpc/filter/handlers as filter_api, ../../../waku/node/jsonrpc/filter/handlers as filter_api,
../../../waku/v2/node/jsonrpc/filter/client as filter_api_client, ../../../waku/node/jsonrpc/filter/client as filter_api_client,
../../../waku/v2/waku_filter, ../../../waku/waku_filter,
../../../waku/v2/waku_filter/rpc, ../../../waku/waku_filter/rpc,
../../../waku/v2/waku_filter/client, ../../../waku/waku_filter/client,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

16
tests/v2/wakunode_jsonrpc/test_jsonrpc_relay.nim → tests/wakunode_jsonrpc/test_jsonrpc_relay.nim
View File

@ -9,14 +9,14 @@ import
json_rpc/[rpcserver, rpcclient] json_rpc/[rpcserver, rpcclient]
import import
../../../waku/common/base64, ../../../waku/common/base64,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/node/message_cache, ../../../waku/node/message_cache,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/jsonrpc/relay/handlers as relay_api, ../../../waku/node/jsonrpc/relay/handlers as relay_api,
../../../waku/v2/node/jsonrpc/relay/client as relay_api_client, ../../../waku/node/jsonrpc/relay/client as relay_api_client,
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/waku_relay, ../../../waku/waku_relay,
../testlib/common, ../testlib/common,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

24
tests/v2/wakunode_jsonrpc/test_jsonrpc_store.nim → tests/wakunode_jsonrpc/test_jsonrpc_store.nim
View File

@ -8,18 +8,18 @@ import
libp2p/crypto/crypto, libp2p/crypto/crypto,
json_rpc/[rpcserver, rpcclient] json_rpc/[rpcserver, rpcclient]
import import
../../../waku/v2/waku_core, ../../../waku/waku_core,
../../../waku/v2/node/peer_manager, ../../../waku/node/peer_manager,
../../../waku/v2/waku_node, ../../../waku/waku_node,
../../../waku/v2/node/jsonrpc/store/handlers as store_api, ../../../waku/node/jsonrpc/store/handlers as store_api,
../../../waku/v2/node/jsonrpc/store/client as store_api_client, ../../../waku/node/jsonrpc/store/client as store_api_client,
../../../waku/v2/waku_archive, ../../../waku/waku_archive,
../../../waku/v2/waku_archive/driver/queue_driver, ../../../waku/waku_archive/driver/queue_driver,
../../../waku/v2/waku_store, ../../../waku/waku_store,
../../../waku/v2/waku_store/rpc, ../../../waku/waku_store/rpc,
../../v2/testlib/common, ../testlib/common,
../../v2/testlib/wakucore, ../testlib/wakucore,
../../v2/testlib/wakunode ../testlib/wakunode
proc put(store: ArchiveDriver, pubsubTopic: PubsubTopic, message: WakuMessage): Future[Result[void, string]] = proc put(store: ArchiveDriver, pubsubTopic: PubsubTopic, message: WakuMessage): Future[Result[void, string]] =

14
tests/v2/wakunode_rest/test_rest_debug.nim → tests/wakunode_rest/test_rest_debug.nim
View File

@ -9,13 +9,13 @@ import
libp2p/multiaddress, libp2p/multiaddress,
libp2p/crypto/crypto libp2p/crypto/crypto
import import
../../waku/v2/waku_node, ../../waku/waku_node,
../../waku/v2/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. ../../waku/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code.
../../waku/v2/node/rest/server, ../../waku/node/rest/server,
../../waku/v2/node/rest/client, ../../waku/node/rest/client,
../../waku/v2/node/rest/responses, ../../waku/node/rest/responses,
../../waku/v2/node/rest/debug/handlers as debug_api, ../../waku/node/rest/debug/handlers as debug_api,
../../waku/v2/node/rest/debug/client as debug_api_client, ../../waku/node/rest/debug/client as debug_api_client,
../testlib/common, ../testlib/common,
../testlib/wakucore, ../testlib/wakucore,
../testlib/wakunode ../testlib/wakunode

Some files were not shown because too many files have changed in this diff Show More