From 874848404875c769b75172400d7b2cefd09b89ce Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Mon, 20 Feb 2023 14:58:27 +1100 Subject: [PATCH] test: bump go-waku to 0.5.0 and re-enable a CI run against it --- .github/workflows/ci.yml | 3 +-- packages/tests/src/nwaku.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5afeefdad..fca02720c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,10 +96,9 @@ jobs: path: packages/tests/log/ node_with_go_waku: - if: false # Can be removed when upgrading go-waku to 0.4.0 or later runs-on: ubuntu-latest env: - GO_WAKU_VERSION: "0.2.2" + GO_WAKU_VERSION: "0.5.0" WAKU_SERVICE_NODE_DIR: ../../go-waku WAKU_SERVICE_NODE_BIN: ./waku WAKU_SERVICE_NODE_PARAMS: "--min-relay-peers-to-publish=0" # Can be removed once https://github.com/status-im/nwaku/issues/1004 is done diff --git a/packages/tests/src/nwaku.ts b/packages/tests/src/nwaku.ts index 44492151e8..8fee5a02c6 100644 --- a/packages/tests/src/nwaku.ts +++ b/packages/tests/src/nwaku.ts @@ -126,7 +126,7 @@ export class Nwaku { this.logPath = `${LOG_DIR}/nwaku_${logName}.log`; } - async start(args?: Args): Promise { + async start(args: Args = {}): Promise { try { await existsAsync(LOG_DIR); } catch (e) { @@ -155,6 +155,12 @@ export class Nwaku { this.rpcPort = ports[0]; + const isGoWaku = WAKU_SERVICE_NODE_BIN.endsWith("/waku"); + + if (isGoWaku && !args.logLevel) { + args.logLevel = LogLevel.Debug; + } + // Object.assign overrides the properties with the source (if there are conflicts) Object.assign( mergedArgs, @@ -173,7 +179,7 @@ export class Nwaku { const argsArray = argsToArray(mergedArgs); - const natExtIp = "--nat:extip:127.0.0.1"; + const natExtIp = "--nat=extip:127.0.0.1"; argsArray.push(natExtIp); if (WAKU_SERVICE_NODE_PARAMS) {