tests: abstract away node creation and teardown utils

waku-org · Jul 26, 2024 · f761d7f · f761d7f
1 parent c7fd88e
commit f761d7f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 28 deletions.
diff --git a/packages/tests/src/utils/nodes.ts b/packages/tests/src/utils/nodes.ts
@@ -23,7 +23,8 @@ export async function runMultipleNodes(
  shardInfo?: ShardingParams,
  customArgs?: Args,
  strictChecking: boolean = false,
- numServiceNodes = 3
+ numServiceNodes = 3,
+ withoutFilter = false
 ): Promise<[ServiceNodesFleet, LightNode]> {
  const pubsubTopics = shardInfo
  ? shardInfoToPubsubTopics(shardInfo)
@@ -35,7 +36,8 @@ export async function runMultipleNodes(
  numServiceNodes,
  strictChecking,
  shardInfo,
- customArgs
+ customArgs,
+ withoutFilter
  );
 
  const wakuOptions: ProtocolCreateOptions = {

diff --git a/packages/tests/tests/filter/peer_management.spec.ts b/packages/tests/tests/filter/peer_management.spec.ts
@@ -18,13 +18,11 @@ import {
  beforeEachCustom,
  DefaultTestPubsubTopic,
  DefaultTestShardInfo,
- ServiceNode,
- ServiceNodesFleet
-} from "../../src/index.js";
-import {
  runMultipleNodes,
+ ServiceNode,
+ ServiceNodesFleet,
  teardownNodesWithRedundancy
-} from "../filter/utils.js";
+} from "../../src/index.js";
 
 describe("Waku Filter: Peer Management: E2E", function () {
  this.timeout(15000);
@@ -46,6 +44,7 @@ describe("Waku Filter: Peer Management: E2E", function () {
  this.ctx,
  DefaultTestShardInfo,
  undefined,
+ undefined,
  5
  );
  const { error, subscription: sub } = await waku.filter.createSubscription(
@@ -186,6 +185,7 @@ describe("Waku Filter: Peer Management: E2E", function () {
  this.ctx,
  DefaultTestShardInfo,
  undefined,
+ undefined,
  2
  );
  const serviceNodesPeerIdStr = await Promise.all(

diff --git a/packages/tests/tests/filter/ping.node.spec.ts b/packages/tests/tests/filter/ping.node.spec.ts
@@ -5,12 +5,12 @@ import { expect } from "chai";
 import {
  afterEachCustom,
  beforeEachCustom,
- ServiceNodesFleet
+ runMultipleNodes,
+ ServiceNodesFleet,
+ teardownNodesWithRedundancy
 } from "../../src/index.js";
 
 import {
- runMultipleNodes,
- teardownNodesWithRedundancy,
  TestContentTopic,
  TestDecoder,
  TestEncoder,

diff --git a/packages/tests/tests/filter/push.node.spec.ts b/packages/tests/tests/filter/push.node.spec.ts
@@ -7,15 +7,15 @@ import {
  afterEachCustom,
  beforeEachCustom,
  delay,
+ runMultipleNodes,
  ServiceNodesFleet,
+ teardownNodesWithRedundancy,
  TEST_STRING,
  TEST_TIMESTAMPS
 } from "../../src/index.js";
 
 import {
  messageText,
- runMultipleNodes,
- teardownNodesWithRedundancy,
  TestContentTopic,
  TestDecoder,
  TestEncoder,

diff --git a/packages/tests/tests/filter/subscribe.node.spec.ts b/packages/tests/tests/filter/subscribe.node.spec.ts
@@ -15,15 +15,15 @@ import {
  beforeEachCustom,
  delay,
  generateTestData,
+ runMultipleNodes,
  ServiceNodesFleet,
+ teardownNodesWithRedundancy,
  TEST_STRING
 } from "../../src/index.js";
 
 import {
  messagePayload,
  messageText,
- runMultipleNodes,
- teardownNodesWithRedundancy,
  TestContentTopic,
  TestDecoder,
  TestEncoder,
@@ -42,6 +42,7 @@ const runTests = (strictCheckNodes: boolean): void => {
  [serviceNodes, waku] = await runMultipleNodes(
  this.ctx,
  TestShardInfo,
+ undefined,
  strictCheckNodes
  );
  const { error, subscription: _subscription } =

diff --git a/packages/tests/tests/filter/unsubscribe.node.spec.ts b/packages/tests/tests/filter/unsubscribe.node.spec.ts
@@ -7,15 +7,15 @@ import {
  afterEachCustom,
  beforeEachCustom,
  generateTestData,
- ServiceNodesFleet
+ runMultipleNodes,
+ ServiceNodesFleet,
+ teardownNodesWithRedundancy
 } from "../../src/index.js";
 
 import {
  ClusterId,
  messagePayload,
  messageText,
- runMultipleNodes,
- teardownNodesWithRedundancy,
  TestContentTopic,
  TestDecoder,
  TestEncoder,

diff --git a/packages/tests/tests/filter/utils.ts b/packages/tests/tests/filter/utils.ts
@@ -22,7 +22,7 @@ import {
  NOISE_KEY_1,
  ServiceNodesFleet,
  waitForConnections
-} from "../../src/index.js";
+} from "../../src";
 
 // Constants for test configuration.
 export const log = new Logger("test:filter");

diff --git a/packages/tests/tests/light-push/index.node.spec.ts b/packages/tests/tests/light-push/index.node.spec.ts
@@ -7,13 +7,11 @@ import {
  afterEachCustom,
  beforeEachCustom,
  generateRandomUint8Array,
+ runMultipleNodes,
  ServiceNodesFleet,
+ teardownNodesWithRedundancy,
  TEST_STRING
 } from "../../src";
-import {
- runMultipleNodes,
- teardownNodesWithRedundancy
-} from "../filter/utils.js";
 
 import {
  messagePayload,
@@ -36,6 +34,7 @@ const runTests = (strictNodeCheck: boolean): void => {
  [serviceNodes, waku] = await runMultipleNodes(
  this.ctx,
  TestShardInfo,
+ undefined,
  strictNodeCheck,
  numServiceNodes,
  true

diff --git a/packages/tests/tests/light-push/peer_management.spec.ts b/packages/tests/tests/light-push/peer_management.spec.ts
@@ -8,13 +8,11 @@ import {
  beforeEachCustom,
  DefaultTestShardInfo,
  DefaultTestSingleShardInfo,
- ServiceNodesFleet
-} from "../../src/index.js";
-import {
  runMultipleNodes,
- teardownNodesWithRedundancy,
- TestContentTopic
-} from "../filter/utils.js";
+ ServiceNodesFleet,
+ teardownNodesWithRedundancy
+} from "../../src/index.js";
+import { TestContentTopic } from "../filter/utils.js";
 
 describe("Waku Light Push: Peer Management: E2E", function () {
  this.timeout(15000);
@@ -26,6 +24,7 @@ describe("Waku Light Push: Peer Management: E2E", function () {
  this.ctx,
  DefaultTestShardInfo,
  undefined,
+ undefined,
  5
  );
  });