From 70ee63fe01f1325926dbf15848383abd5e73c1ca Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Fri, 20 Oct 2023 14:37:16 +0530 Subject: [PATCH 1/4] add a test for a failing case --- .../tests/tests/filter/multiple_pubsub.node.spec.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts index efd787dc99..bb9fa8a377 100644 --- a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts +++ b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts @@ -146,4 +146,16 @@ describe("Waku Filter V2: Multiple PubSubtopics", function () { expectedMessageText: "M2" }); }); + + it.only("Subscribe with a pubsub topic but pass a wrong decoder", async function () { + // this subscription object is set up with the `customPubsubTopic` but we're passing it a Decoder with the `DefaultPubsubTopic` + await subscription.subscribe([TestDecoder], messageCollector.callback); + await waku.lightPush.send(newEncoder, { payload: utf8ToBytes("M1") }); + expect(await messageCollector.waitForMessages(1)).to.eq(true); + messageCollector.verifyReceivedMessage(0, { + expectedContentTopic: customContentTopic, + expectedPubSubTopic: customPubSubTopic, + expectedMessageText: "M1" + }); + }); }); From 8b7be932141d8b9fc09eca74c416581b325e1ccd Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Fri, 20 Oct 2023 16:01:47 +0530 Subject: [PATCH 2/4] add error handling & update test --- packages/core/src/lib/filter/index.ts | 10 ++++++++++ .../tests/filter/multiple_pubsub.node.spec.ts | 15 +++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/core/src/lib/filter/index.ts b/packages/core/src/lib/filter/index.ts index 1f66cb0d33..63202bd3eb 100644 --- a/packages/core/src/lib/filter/index.ts +++ b/packages/core/src/lib/filter/index.ts @@ -74,6 +74,16 @@ class Subscription { callback: Callback ): Promise { const decodersArray = Array.isArray(decoders) ? decoders : [decoders]; + + // check that all decoders are configured for the same pubsub topic as this subscription + decodersArray.forEach((decoder) => { + if (decoder.pubsubTopic !== this.pubsubTopic) { + throw new Error( + `Pubsub topic not configured: decoder is configured for pubsub topic ${decoder.pubsubTopic} but this subscription is for pubsub topic ${this.pubsubTopic}. Please create a new Subscription for the different pubsub topic.` + ); + } + }); + const decodersGroupedByCT = groupByContentTopic(decodersArray); const contentTopics = Array.from(decodersGroupedByCT.keys()); diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts index bb9fa8a377..0052769011 100644 --- a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts +++ b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts @@ -149,13 +149,12 @@ describe("Waku Filter V2: Multiple PubSubtopics", function () { it.only("Subscribe with a pubsub topic but pass a wrong decoder", async function () { // this subscription object is set up with the `customPubsubTopic` but we're passing it a Decoder with the `DefaultPubsubTopic` - await subscription.subscribe([TestDecoder], messageCollector.callback); - await waku.lightPush.send(newEncoder, { payload: utf8ToBytes("M1") }); - expect(await messageCollector.waitForMessages(1)).to.eq(true); - messageCollector.verifyReceivedMessage(0, { - expectedContentTopic: customContentTopic, - expectedPubSubTopic: customPubSubTopic, - expectedMessageText: "M1" - }); + try { + await subscription.subscribe([TestDecoder], messageCollector.callback); + } catch (error) { + expect((error as Error).message).to.include( + "Pubsub topic not configured" + ); + } }); }); From aca2fb97a7c125ed455371366ac06ebf7f3fa578 Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Fri, 20 Oct 2023 16:03:50 +0530 Subject: [PATCH 3/4] remove only --- packages/tests/tests/filter/multiple_pubsub.node.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts index 0052769011..eb7a8adbfc 100644 --- a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts +++ b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts @@ -147,7 +147,7 @@ describe("Waku Filter V2: Multiple PubSubtopics", function () { }); }); - it.only("Subscribe with a pubsub topic but pass a wrong decoder", async function () { + it("Subscribe with a pubsub topic but pass a wrong decoder", async function () { // this subscription object is set up with the `customPubsubTopic` but we're passing it a Decoder with the `DefaultPubsubTopic` try { await subscription.subscribe([TestDecoder], messageCollector.callback); From e8879e910d21bd9108b8f70e40fb8c6d961ccb52 Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Mon, 23 Oct 2023 14:04:47 +0530 Subject: [PATCH 4/4] rename test --- packages/tests/tests/filter/multiple_pubsub.node.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts index eb7a8adbfc..020eb3a590 100644 --- a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts +++ b/packages/tests/tests/filter/multiple_pubsub.node.spec.ts @@ -147,7 +147,7 @@ describe("Waku Filter V2: Multiple PubSubtopics", function () { }); }); - it("Subscribe with a pubsub topic but pass a wrong decoder", async function () { + it("Should fail to subscribe with decoder with wrong pubsubTopic", async function () { // this subscription object is set up with the `customPubsubTopic` but we're passing it a Decoder with the `DefaultPubsubTopic` try { await subscription.subscribe([TestDecoder], messageCollector.callback);