From 1932ef5fdc5235d058c0406f6651627d8f79d702 Mon Sep 17 00:00:00 2001 From: Danish Arora Date: Wed, 22 Jan 2025 18:29:04 +0530 Subject: [PATCH] fix: non duplicacy should happen in application-specific scenario --- packages/tests/src/lib/index.ts | 20 +++++++++---------- .../tests/tests/filter/subscribe.node.spec.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/tests/src/lib/index.ts b/packages/tests/src/lib/index.ts index 8f514cc61f..f9339ae085 100644 --- a/packages/tests/src/lib/index.ts +++ b/packages/tests/src/lib/index.ts @@ -118,7 +118,14 @@ export class ServiceNodesFleet { } ): Promise { if (encryptedPayload) { - expect(this.messageCollector.count).to.equal(numMessages); + const filteredMessageList = Array.from( + new Set( + this.messageCollector.messageList + .filter((msg) => msg.payload?.toString) + .map((msg) => msg.payload.toString()) + ) + ); + expect(filteredMessageList.length).to.equal(numMessages); return; } @@ -146,7 +153,7 @@ export class ServiceNodesFleet { class MultipleNodesMessageCollector { public callback: (msg: DecodedMessage) => void = () => {}; - protected messageList: Array = []; + public readonly messageList: Array = []; public constructor( private messageCollectors: MessageCollector[], private relayNodes?: ServiceNode[], @@ -154,14 +161,7 @@ class MultipleNodesMessageCollector { ) { this.callback = (msg: DecodedMessage): void => { log.info("Got a message"); - // Only add message if we haven't seen it before - if ( - !this.messageList.find( - (m) => m.payload.toString() === msg.payload.toString() - ) - ) { - this.messageList.push(msg); - } + this.messageList.push(msg); }; } diff --git a/packages/tests/tests/filter/subscribe.node.spec.ts b/packages/tests/tests/filter/subscribe.node.spec.ts index 88bf921c74..8098fd6745 100644 --- a/packages/tests/tests/filter/subscribe.node.spec.ts +++ b/packages/tests/tests/filter/subscribe.node.spec.ts @@ -135,7 +135,7 @@ const runTests = (strictCheckNodes: boolean): void => { expectedPubsubTopic: TestPubsubTopic }); - await serviceNodes.confirmMessageLength(1); + await serviceNodes.confirmMessageLength(1, { encryptedPayload: true }); }); it("Subscribe and receive messages via waku relay post", async function () {