From 7566f100ab565c7586fa2701ae8668a2c39eca92 Mon Sep 17 00:00:00 2001
From: Anton Iakimov <yakimant@gmail.com>
Date: Tue, 12 Mar 2024 17:50:36 +0100
Subject: [PATCH] chore: switch wakuv2 fleet to waku

See https://github.com/status-im/infra-nim-waku/issues/91 for details

Mostly done automatically. Some parts manually.
---
 nativeWssProdFleet.js     | 12 ------------
 nativeWssSandboxFleet.js  | 12 ++++++++++++
 nativeWssTestFleet.js     |  6 +++---
 package.json              |  4 ++--
 predefinedProdFleet.js    | 10 ----------
 predefinedSandboxFleet.js | 10 ++++++++++
 predefinedTestFleet.js    |  2 +-
 7 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 nativeWssProdFleet.js
 create mode 100644 nativeWssSandboxFleet.js
 delete mode 100644 predefinedProdFleet.js
 create mode 100644 predefinedSandboxFleet.js

diff --git a/nativeWssProdFleet.js b/nativeWssProdFleet.js
deleted file mode 100644
index 3bf8a8a..0000000
--- a/nativeWssProdFleet.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { describe } from "mocha";
-import runAll from "./index.js";
-
-const nodes = [
-  "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-  "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-  "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
-];
-
-describe("Prod Fleet Native WSS", () => {
-  runAll(nodes);
-});
diff --git a/nativeWssSandboxFleet.js b/nativeWssSandboxFleet.js
new file mode 100644
index 0000000..d7ab25e
--- /dev/null
+++ b/nativeWssSandboxFleet.js
@@ -0,0 +1,12 @@
+import { describe } from "mocha";
+import runAll from "./index.js";
+
+const nodes = [
+  "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV",
+  "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
+  "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB",
+];
+
+describe("Sandbox Fleet Native WSS", () => {
+  runAll(nodes);
+});
diff --git a/nativeWssTestFleet.js b/nativeWssTestFleet.js
index 2a3a638..1120236 100644
--- a/nativeWssTestFleet.js
+++ b/nativeWssTestFleet.js
@@ -2,9 +2,9 @@ import { describe } from "mocha";
 import runAll from "./index.js";
 
 const nodes = [
-  "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-  "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-  "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
+  "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp",
+  "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+  "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
 ];
 
 describe("Test Fleet Native WSS", () => {
diff --git a/package.json b/package.json
index 9a27c56..b214bac 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,9 @@
     "test": "run-s test:*",
     "test:lint": "eslint . --ext .js",
     "test:prettier": "prettier . --list-different",
-    "predefined-prod": "mocha predefinedProdFleet.js --exit",
+    "predefined-sandbox": "mocha predefinedSandboxFleet.js --exit",
     "predefined-test": "mocha predefinedTestFleet.js --exit ",
-    "native-wss-prod": "mocha nativeWssProdFleet.js --exit",
+    "native-wss-sandbox": "mocha nativeWssSandboxFleet.js --exit",
     "native-wss-test": "mocha nativeWssTestFleet.js --exit",
     "waku-connect": "mocha wakuConnectFleet.js --exit",
     "postinstall": "husky install",
diff --git a/predefinedProdFleet.js b/predefinedProdFleet.js
deleted file mode 100644
index 689163d..0000000
--- a/predefinedProdFleet.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { describe } from "mocha";
-import runAll from "./index.js";
-import { fleets } from "js-waku/lib/predefined_bootstrap_nodes";
-
-const prodFleet = fleets.fleets["wakuv2.prod"]["waku-websocket"];
-const nodes = Object.values(prodFleet);
-
-describe("Predefined Prod Fleet", () => {
-  runAll(nodes);
-});
diff --git a/predefinedSandboxFleet.js b/predefinedSandboxFleet.js
new file mode 100644
index 0000000..d750fe2
--- /dev/null
+++ b/predefinedSandboxFleet.js
@@ -0,0 +1,10 @@
+import { describe } from "mocha";
+import runAll from "./index.js";
+import { fleets } from "js-waku/lib/predefined_bootstrap_nodes";
+
+const sandboxFleet = fleets.fleets["waku.sandbox"]["waku-websocket"];
+const nodes = Object.values(sandboxFleet);
+
+describe("Predefined Sandbox Fleet", () => {
+  runAll(nodes);
+});
diff --git a/predefinedTestFleet.js b/predefinedTestFleet.js
index 1b3efc9..62fd5bb 100644
--- a/predefinedTestFleet.js
+++ b/predefinedTestFleet.js
@@ -2,7 +2,7 @@ import { describe } from "mocha";
 import { fleets } from "js-waku/lib/predefined_bootstrap_nodes";
 import runAll from "./index.js";
 
-const testFleet = fleets.fleets["wakuv2.test"]["waku-websocket"];
+const testFleet = fleets.fleets["waku.test"]["waku-websocket"];
 const nodes = Object.values(testFleet);
 
 describe("Predefined Test Fleet", () => {