From 79a95203484a81506b2c1fc7a79c8ad33358aa2b Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@royer.one>
Date: Tue, 6 Apr 2021 11:06:10 +1000
Subject: [PATCH] Test cleanup

---
 src/lib/waku.spec.ts             |  7 +------
 src/lib/waku.ts                  | 16 ++++++++++++++++
 src/lib/waku_relay/index.spec.ts |  9 ++-------
 src/test_utils/nim_waku.ts       |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/lib/waku.spec.ts b/src/lib/waku.spec.ts
index 836faef89b..62806f78d9 100644
--- a/src/lib/waku.spec.ts
+++ b/src/lib/waku.spec.ts
@@ -11,12 +11,7 @@ describe('Waku', function () {
       this.timeout(10_000);
       const waku = await Waku.create({ staticNoiseKey: NOISE_KEY_1 });
 
-      const peerId = waku.libp2p.peerId.toB58String();
-
-      const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
-        addr.toString().match(/127\.0\.0\.1/)
-      );
-      const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
+      const multiAddrWithId = waku.getLocalMultiaddrWithID();
 
       const nimWaku = new NimWaku(makeLogFileName(this));
       await nimWaku.start({ staticnode: multiAddrWithId });
diff --git a/src/lib/waku.ts b/src/lib/waku.ts
index 1a7c0e1bbc..22584aafcd 100644
--- a/src/lib/waku.ts
+++ b/src/lib/waku.ts
@@ -67,4 +67,20 @@ export default class Waku {
   async stop() {
     await this.libp2p.stop();
   }
+
+  /**
+   * Return the local multiaddr with peer id on which libp2p is listening.
+   * @throws if libp2p is not listening on localhost
+   */
+  getLocalMultiaddrWithID(): string {
+    const localMultiaddr = this.libp2p.multiaddrs.find((addr) =>
+      addr.toString().match(/127\.0\.0\.1/)
+    );
+    if (!localMultiaddr || localMultiaddr.toString() === '') {
+      throw 'Not listening on localhost';
+    }
+    const multiAddrWithId =
+      localMultiaddr + '/p2p/' + this.libp2p.peerId.toB58String();
+    return multiAddrWithId;
+  }
 }
diff --git a/src/lib/waku_relay/index.spec.ts b/src/lib/waku_relay/index.spec.ts
index 777fe5a302..c7adbdcb3a 100644
--- a/src/lib/waku_relay/index.spec.ts
+++ b/src/lib/waku_relay/index.spec.ts
@@ -99,15 +99,10 @@ describe('Waku Relay', () => {
       let nimWaku: NimWaku;
 
       beforeEach(async function () {
-        this.timeout(10_000);
+        this.timeout(12_000);
         waku = await Waku.create({ staticNoiseKey: NOISE_KEY_1 });
 
-        const peerId = waku.libp2p.peerId.toB58String();
-        const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
-          addr.toString().match(/127\.0\.0\.1/)
-        );
-        const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
-
+        const multiAddrWithId = waku.getLocalMultiaddrWithID();
         nimWaku = new NimWaku(makeLogFileName(this));
         await nimWaku.start({ staticnode: multiAddrWithId });
 
diff --git a/src/test_utils/nim_waku.ts b/src/test_utils/nim_waku.ts
index d300fb7ab0..ba556cf547 100644
--- a/src/test_utils/nim_waku.ts
+++ b/src/test_utils/nim_waku.ts
@@ -117,7 +117,7 @@ export class NimWaku {
   }
 
   public stop() {
-    debug(
+    dbg(
       `nim-waku ${
         this.process ? this.process.pid : this.pid
       } getting SIGINT at ${new Date().toLocaleTimeString()}`