From fecc026dd71121f78d23aabb98657ea49baf25f5 Mon Sep 17 00:00:00 2001
From: Danish Arora <35004822+danisharora099@users.noreply.github.com>
Date: Fri, 20 Jun 2025 19:04:51 +0530
Subject: [PATCH] fix: `DIRVER` -> `DRIVER` typo in nwaku (#2406)

* fix: DIRVER -> DRIVER nwaku

* chore: empty commit

* chore: access CI/test env vars and conditionally check test

* fix: undefined nwaku version

* chore: improve splitting

* simplify, test error string only for new versions

---------

Co-authored-by: Sasha <oleksandr@status.im>
---
 packages/tests/src/lib/service_node.ts        | 21 +++++++++++++++++++
 packages/tests/src/run-tests.js               |  3 ++-
 .../tests/tests/store/cursor.node.spec.ts     | 16 ++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/packages/tests/src/lib/service_node.ts b/packages/tests/src/lib/service_node.ts
index 60e5f72dc4..6f7262a006 100644
--- a/packages/tests/src/lib/service_node.ts
+++ b/packages/tests/src/lib/service_node.ts
@@ -39,6 +39,12 @@ BigInt.prototype.toJSON = function toJSON() {
   return Number(this);
 };
 
+type NwakuVersion = {
+  major: number;
+  minor: number;
+  patch: number;
+};
+
 export class ServiceNode {
   private docker?: Dockerode;
   private peerId?: PeerId;
@@ -48,6 +54,8 @@ export class ServiceNode {
   private restPort?: number;
   private args?: Args;
 
+  public readonly version: NwakuVersion | undefined;
+
   /**
    * Convert a [[WakuMessage]] to a [[WakuRelayMessage]]. The latter is used
    * by the nwaku JSON-RPC API.
@@ -75,6 +83,19 @@ export class ServiceNode {
 
   public constructor(logName: string) {
     this.logPath = `${LOG_DIR}/wakunode_${logName}.log`;
+    const nwakuImage = process.env.WAKUNODE_IMAGE;
+    const nwakuVersion = nwakuImage?.split(":")[1];
+
+    if (nwakuVersion && nwakuVersion.startsWith("v")) {
+      const versionParts = nwakuVersion.substring(1).split(".");
+      if (versionParts.length === 3) {
+        this.version = {
+          major: Number(versionParts[0]),
+          minor: Number(versionParts[1]),
+          patch: Number(versionParts[2])
+        };
+      }
+    }
   }
 
   public get containerName(): string | undefined {
diff --git a/packages/tests/src/run-tests.js b/packages/tests/src/run-tests.js
index 7de7da2253..91ec65dc7b 100644
--- a/packages/tests/src/run-tests.js
+++ b/packages/tests/src/run-tests.js
@@ -29,7 +29,8 @@ async function main() {
     stdio: "inherit",
     env: {
       ...process.env,
-      NODE_ENV: "test"
+      NODE_ENV: "test",
+      WAKUNODE_IMAGE: WAKUNODE_IMAGE
     }
   });
 
diff --git a/packages/tests/tests/store/cursor.node.spec.ts b/packages/tests/tests/store/cursor.node.spec.ts
index cfcad90b2a..cd3316a65d 100644
--- a/packages/tests/tests/store/cursor.node.spec.ts
+++ b/packages/tests/tests/store/cursor.node.spec.ts
@@ -132,7 +132,11 @@ describe("Waku Store, cursor", function () {
     ).to.be.eq(bytesToUtf8(messages[messages.length - 1].payload));
   });
 
-  it("Passing invalid cursor", async function () {
+  it("Passing invalid cursor for nwaku > 0.35.1", async function () {
+    if (nwaku.version && nwaku.version.minor < 36) {
+      this.skip();
+    }
+
     await sendMessages(
       nwaku,
       totalMsgs,
@@ -166,7 +170,7 @@ describe("Waku Store, cursor", function () {
       if (
         !(err instanceof Error) ||
         !err.message.includes(
-          `Store query failed with status code: 300, description: BAD_RESPONSE: archive error: DIRVER_ERROR: cursor not found`
+          "Store query failed with status code: 300, description: BAD_RESPONSE: archive error: DRIVER_ERROR: cursor not found"
         )
       ) {
         throw err;
@@ -174,7 +178,11 @@ describe("Waku Store, cursor", function () {
     }
   });
 
-  it("Passing cursor with wrong pubsubTopic", async function () {
+  it("Passing cursor with wrong pubsubTopic for nwaku > 0.35.1", async function () {
+    if (nwaku.version && nwaku.version.minor < 36) {
+      this.skip();
+    }
+
     await sendMessages(
       nwaku,
       totalMsgs,
@@ -202,7 +210,7 @@ describe("Waku Store, cursor", function () {
       if (
         !(err instanceof Error) ||
         !err.message.includes(
-          `Store query failed with status code: 300, description: BAD_RESPONSE: archive error: DIRVER_ERROR: cursor not found`
+          "Store query failed with status code: 300, description: BAD_RESPONSE: archive error: DRIVER_ERROR: cursor not found"
         )
       ) {
         throw err;