From 7905aa478bf9c7998c3e3bc7eb7c14ffb71a7895 Mon Sep 17 00:00:00 2001
From: Simon-Pierre Vivier <simvivier@status.im>
Date: Tue, 19 Sep 2023 16:45:27 -0400
Subject: [PATCH] fix: explicit nwaku subscriptions in tests (#1572)

* Nwaku subscriptions explicit in tests

* Subscription before each & renaming

* Fix
---
 packages/tests/src/node/node.ts                      | 11 +++++++++++
 packages/tests/tests/filter/subscribe.node.spec.ts   |  3 +++
 packages/tests/tests/filter/unsubscribe.node.spec.ts |  3 +++
 packages/tests/tests/relay.node.spec.ts              |  3 +++
 4 files changed, 20 insertions(+)

diff --git a/packages/tests/src/node/node.ts b/packages/tests/src/node/node.ts
index 27cc44b6ea..d8a63fbb7c 100644
--- a/packages/tests/src/node/node.ts
+++ b/packages/tests/src/node/node.ts
@@ -209,6 +209,17 @@ export class NimGoNode {
     return this.rpcCall<RpcInfoResponse>("get_waku_v2_debug_v1_info", []);
   }
 
+  async ensureSubscriptions(
+    pubsubTopics: [string] = [DefaultPubSubTopic]
+  ): Promise<boolean> {
+    this.checkProcess();
+
+    return this.rpcCall<boolean>(
+      "post_waku_v2_relay_v1_subscriptions",
+      pubsubTopics
+    );
+  }
+
   async sendMessage(
     message: MessageRpcQuery,
     pubSubTopic: string = DefaultPubSubTopic
diff --git a/packages/tests/tests/filter/subscribe.node.spec.ts b/packages/tests/tests/filter/subscribe.node.spec.ts
index 8dfdda677e..0ded20d724 100644
--- a/packages/tests/tests/filter/subscribe.node.spec.ts
+++ b/packages/tests/tests/filter/subscribe.node.spec.ts
@@ -42,6 +42,9 @@ describe("Waku Filter V2: Subscribe", function () {
     [nwaku, waku] = await runNodes(this);
     subscription = await waku.filter.createSubscription();
     messageCollector = new MessageCollector(TestContentTopic);
+
+    // Nwaku subscribe to the default pubsub topic
+    await nwaku.ensureSubscriptions();
   });
 
   this.afterEach(async function () {
diff --git a/packages/tests/tests/filter/unsubscribe.node.spec.ts b/packages/tests/tests/filter/unsubscribe.node.spec.ts
index df73ec59c7..b1591c2911 100644
--- a/packages/tests/tests/filter/unsubscribe.node.spec.ts
+++ b/packages/tests/tests/filter/unsubscribe.node.spec.ts
@@ -28,6 +28,9 @@ describe("Waku Filter V2: Unsubscribe", function () {
     [nwaku, waku] = await runNodes(this);
     subscription = await waku.filter.createSubscription();
     messageCollector = new MessageCollector(TestContentTopic);
+
+    // Nwaku subscribe to the default pubsub topic
+    await nwaku.ensureSubscriptions();
   });
 
   this.afterEach(async function () {
diff --git a/packages/tests/tests/relay.node.spec.ts b/packages/tests/tests/relay.node.spec.ts
index 9c046f9de6..4d48f477f6 100644
--- a/packages/tests/tests/relay.node.spec.ts
+++ b/packages/tests/tests/relay.node.spec.ts
@@ -411,6 +411,9 @@ describe("Waku Relay [node only]", () => {
 
       await waku.dial(await nwaku.getMultiaddrWithId());
       await waitForRemotePeer(waku, [Protocols.Relay]);
+
+      // Nwaku subscribe to the default pubsub topic
+      await nwaku.ensureSubscriptions();
     });
 
     afterEach(async function () {