From d19be038624f4a5ade45140f93497a864a4ba57c Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Thu, 6 May 2021 10:36:36 +1000 Subject: [PATCH 1/3] Ensure that rpc call to send messages is successful --- src/lib/waku_store/index.spec.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/waku_store/index.spec.ts b/src/lib/waku_store/index.spec.ts index 1cec38b0b9..930cba1ebc 100644 --- a/src/lib/waku_store/index.spec.ts +++ b/src/lib/waku_store/index.spec.ts @@ -21,7 +21,9 @@ describe('Waku Store', () => { await nimWaku.start({ store: true }); for (let i = 0; i < 2; i++) { - await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`)); + expect( + await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`)) + ).to.be.true; } waku = await Waku.create({ @@ -53,7 +55,9 @@ describe('Waku Store', () => { await nimWaku.start({ store: true }); for (let i = 0; i < 15; i++) { - await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`)); + expect( + await nimWaku.sendMessage(WakuMessage.fromUtf8String(`Message ${i}`)) + ).to.be.true; } waku = await Waku.create({ From 88eb1eb227ec25b89e24ddeab8ba22db5b3d0ff7 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Thu, 6 May 2021 10:37:01 +1000 Subject: [PATCH 2/3] Add command to easily upgrade nim-waku to master HEAD --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e240beab40..eb8b176b6c 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "pretest:1-init-git-submodules": "[ -f './nim-waku/build/wakunode2' ] || git submodule update --init --recursive", "pretest:2-build-nim-waku": "[ -f './nim-waku/build/wakunode2' ] || run-s nim-waku:build", "nim-waku:build": "(cd nim-waku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)", + "nim-waku:upgrade":"(cd nim-waku && git pull origin master && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nim-waku:build", "test": "run-s build test:*", "test:lint": "eslint src --ext .ts", "test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" --list-different", From 21414ad55e0b0b1709313efb6d8a2bec784a0f3b Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Thu, 6 May 2021 10:37:12 +1000 Subject: [PATCH 3/3] Upgrade nim-waku to latest version --- nim-waku | 2 +- src/lib/waku_store/index.spec.ts | 4 ++-- src/test_utils/nim_waku.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nim-waku b/nim-waku index 967db6d610..7c5df3379b 160000 --- a/nim-waku +++ b/nim-waku @@ -1 +1 @@ -Subproject commit 967db6d6102646549bc2184b6fd26968ca764de7 +Subproject commit 7c5df3379b42f1e5ddad66e84e152aec6ebdf10d diff --git a/src/lib/waku_store/index.spec.ts b/src/lib/waku_store/index.spec.ts index 930cba1ebc..a4a20a2528 100644 --- a/src/lib/waku_store/index.spec.ts +++ b/src/lib/waku_store/index.spec.ts @@ -18,7 +18,7 @@ describe('Waku Store', () => { this.timeout(5_000); nimWaku = new NimWaku(makeLogFileName(this)); - await nimWaku.start({ store: true }); + await nimWaku.start({ persistMessages: true }); for (let i = 0; i < 2; i++) { expect( @@ -52,7 +52,7 @@ describe('Waku Store', () => { this.timeout(5_000); nimWaku = new NimWaku(makeLogFileName(this)); - await nimWaku.start({ store: true }); + await nimWaku.start({ persistMessages: true }); for (let i = 0; i < 15; i++) { expect( diff --git a/src/test_utils/nim_waku.ts b/src/test_utils/nim_waku.ts index 6136517112..34ac85ab61 100644 --- a/src/test_utils/nim_waku.ts +++ b/src/test_utils/nim_waku.ts @@ -32,7 +32,7 @@ export interface Args { nodekey?: string; portsShift?: number; logLevel?: LogLevel; - store?: boolean; + persistMessages?: boolean; } export enum LogLevel {