waku-org
/
js-waku
mirror of https://github.com/waku-org/js-waku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1188 from waku-org/chore/update-go-waku 

test: bump go-waku to 0.5.0 and re-enable a CI run against it
This commit is contained in:
fryorcraken.eth 2023-02-21 20:15:55 +11:00 committed by GitHub
parent 24c24cc27d 8748484048
commit a949b6ba61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,10 +96,9 @@ jobs:
path: packages/tests/log/ path: packages/tests/log/
node_with_go_waku: node_with_go_waku:
if: false # Can be removed when upgrading go-waku to 0.4.0 or later
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
GO_WAKU_VERSION: "0.2.2" GO_WAKU_VERSION: "0.5.0"
WAKU_SERVICE_NODE_DIR: ../../go-waku WAKU_SERVICE_NODE_DIR: ../../go-waku
WAKU_SERVICE_NODE_BIN: ./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 WAKU_SERVICE_NODE_PARAMS: "--min-relay-peers-to-publish=0" # Can be removed once https://github.com/status-im/nwaku/issues/1004 is done

10
packages/tests/src/nwaku.ts
View File

@ -126,7 +126,7 @@ export class Nwaku {
this.logPath = `${LOG_DIR}/nwaku_${logName}.log`; this.logPath = `${LOG_DIR}/nwaku_${logName}.log`;
} }
async start(args?: Args): Promise<void> { async start(args: Args = {}): Promise<void> {
try { try {
await existsAsync(LOG_DIR); await existsAsync(LOG_DIR);
} catch (e) { } catch (e) {
@ -155,6 +155,12 @@ export class Nwaku {
this.rpcPort = ports[0]; 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 overrides the properties with the source (if there are conflicts)
Object.assign( Object.assign(
mergedArgs, mergedArgs,
@ -173,7 +179,7 @@ export class Nwaku {
const argsArray = argsToArray(mergedArgs); const argsArray = argsToArray(mergedArgs);
const natExtIp = "--nat:extip:127.0.0.1"; const natExtIp = "--nat=extip:127.0.0.1";
argsArray.push(natExtIp); argsArray.push(natExtIp);
if (WAKU_SERVICE_NODE_PARAMS) { if (WAKU_SERVICE_NODE_PARAMS) {