chore: remove references to v2 (#1898)

* chore: remove references to v2 * fix: lingering rln-relay import path
waku-org · Aug 9, 2023 · b9d5d28 · b9d5d28
1 parent 311f5ea
commit b9d5d28
Show file tree

Hide file tree

Showing 273 changed files with 613 additions and 675 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,