From e9f727ce81c15eac1005cfe832c1be7903c79436 Mon Sep 17 00:00:00 2001
From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>
Date: Mon, 30 Mar 2026 09:42:05 +0200
Subject: [PATCH] Adjust cluster_id to pubsub_topics

---
 src/steps/sharding.py         |  2 +-
 src/test_data.py              | 16 ++++++++--------
 tests/sharding/test_filter.py |  8 ++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/steps/sharding.py b/src/steps/sharding.py
index 96be02f49..7c8aabc25 100644
--- a/src/steps/sharding.py
+++ b/src/steps/sharding.py
@@ -20,7 +20,7 @@ logger = get_custom_logger(__name__)
 
 class StepsSharding(StepsRelay):
     test_content_topic = "/myapp/1/latest/proto"
-    test_pubsub_topic = "/waku/2/rs/2/0"
+    test_pubsub_topic = "/waku/2/rs/199/0"
     test_payload = "Sharding works!!"
     auto_cluster = 199
     num_shards_in_network = 8
diff --git a/src/test_data.py b/src/test_data.py
index 866dda8df..b5e425201 100644
--- a/src/test_data.py
+++ b/src/test_data.py
@@ -130,14 +130,14 @@ PUBSUB_TOPICS_DIFFERENT_CLUSTERS = [
 ]
 
 PUBSUB_TOPICS_SAME_CLUSTER = [
-    "/waku/2/rs/2/0",
-    "/waku/2/rs/2/1",
-    "/waku/2/rs/2/2",
-    "/waku/2/rs/2/3",
-    "/waku/2/rs/2/4",
-    "/waku/2/rs/2/5",
-    "/waku/2/rs/2/6",
-    "/waku/2/rs/2/7",
+    "/waku/2/rs/199/0",
+    "/waku/2/rs/199/1",
+    "/waku/2/rs/199/2",
+    "/waku/2/rs/199/3",
+    "/waku/2/rs/199/4",
+    "/waku/2/rs/199/5",
+    "/waku/2/rs/199/6",
+    "/waku/2/rs/199/7",
 ]
 
 PUBSUB_TOPICS_WRONG_FORMAT = [
diff --git a/tests/sharding/test_filter.py b/tests/sharding/test_filter.py
index aba678bad..4b526b516 100644
--- a/tests/sharding/test_filter.py
+++ b/tests/sharding/test_filter.py
@@ -32,8 +32,10 @@ class TestFilterAutoSharding(StepsSharding):
         self.setup_first_relay_node_with_filter(
             cluster_id=self.auto_cluster, content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic, num_shards_in_network=1
         )
+        self.setup_third_relay_node(cluster_id=self.auto_cluster, content_topic=self.test_content_topic, num_shards_in_network=1)
         self.setup_second_node_as_filter(cluster_id=self.auto_cluster, content_topic=self.test_content_topic, pubsub_topic=self.test_pubsub_topic)
         self.subscribe_first_relay_node(content_topics=[self.test_content_topic])
+        self.subscribe_optional_relay_nodes(content_topics=[self.test_content_topic])
         self.subscribe_filter_node(self.node2, content_topics=[self.test_content_topic], pubsub_topic=self.test_pubsub_topic)
         self.check_published_message_reaches_filter_peer(content_topic=self.test_content_topic)
 
@@ -44,10 +46,16 @@ class TestFilterAutoSharding(StepsSharding):
             pubsub_topic=PUBSUB_TOPICS_SAME_CLUSTER,
             num_shards_in_network=8,
         )
+        self.setup_third_relay_node(
+            cluster_id=self.auto_cluster,
+            content_topic=CONTENT_TOPICS_DIFFERENT_SHARDS,
+            num_shards_in_network=8,
+        )
         self.setup_second_node_as_filter(
             cluster_id=self.auto_cluster, content_topic=CONTENT_TOPICS_DIFFERENT_SHARDS, pubsub_topic=self.test_pubsub_topic
         )
         self.subscribe_first_relay_node(content_topics=CONTENT_TOPICS_DIFFERENT_SHARDS)
+        self.subscribe_optional_relay_nodes(content_topics=CONTENT_TOPICS_DIFFERENT_SHARDS)
         for content_topic, pubsub_topic in zip(CONTENT_TOPICS_DIFFERENT_SHARDS, PUBSUB_TOPICS_SAME_CLUSTER):
             self.subscribe_filter_node(self.node2, content_topics=[content_topic], pubsub_topic=pubsub_topic)
         for content_topic in CONTENT_TOPICS_DIFFERENT_SHARDS: