Merge remote-tracking branch 'origin/master' into smoke_tests

src/node/waku_node.py

@@ -14,7 +14,7 @@ from src.node.api_clients.rest import REST
 from src.node.docker_mananger import DockerManager
 from src.env_vars import DOCKER_LOG_DIR
 from src.data_storage import DS
-from src.test_data import DEFAULT_CLUSTER_ID, LOG_ERROR_KEYWORDS
+from src.test_data import DEFAULT_CLUSTER_ID, LOG_ERROR_KEYWORDS, VALID_PUBSUB_TOPICS
 
 logger = get_custom_logger(__name__)
 
@@ -152,6 +152,9 @@ class WakuNode:
 
         default_args.update(sanitize_docker_flags(kwargs))
 
+        if self.is_gowaku() and default_args.get("relay") == "false":
+            default_args["pubsub-topic"] = VALID_PUBSUB_TOPICS[1]
+
         rln_args, rln_creds_set, keystore_path = self.parse_rln_credentials(default_args, False)
 
         default_args.pop("rln-creds-id", None)

src/steps/light_push.py

@@ -65,7 +65,7 @@ class StepsLightPush(StepsCommon):
         else:
             pytest.skip("ADDITIONAL_NODES/node_list is empty, cannot run test")
         for index, node in enumerate(nodes):
-            self.start_receiving_node(node, node_index=index + 2, lightpush="true", relay="true", **kwargs)
+            self.start_receiving_node(node, node_index=index + 2, lightpush="true", relay="true", pubsub_topic=self.test_pubsub_topic, **kwargs)
 
     @allure.step
     def setup_first_lightpush_node(self, lightpush="true", relay="false", **kwargs):
@@ -143,4 +143,6 @@ class StepsLightPush(StepsCommon):
     @retry(stop=stop_after_delay(120), wait=wait_fixed(1), reraise=True)
     def subscribe_and_light_push_with_retry(self):
         self.subscribe_to_pubsub_topics_via_relay()
-        self.check_light_pushed_message_reaches_receiving_peer()
+        self.light_push_node1.send_light_push_message(self.create_payload())
+        get_messages_response = self.main_receiving_nodes[0].get_relay_messages(self.test_pubsub_topic)
+        assert len(get_messages_response) >= 1, f"Expected al least 1 message but got {len(get_messages_response)}"

src/test_data.py

@@ -218,6 +218,8 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     "waku_rln_instance_creation_duration_seconds",
     "waku_rln_membership_insertion_duration_seconds",
     "waku_rln_membership_credentials_import_duration_seconds",
+    "waku_rln_proof_remining",
+    "waku_rln_proofs_generated_total",
     "libp2p_pubsub_sig_verify_success_total",
     "libp2p_pubsub_sig_verify_failure_total",
     "libp2p_pubsub_disconnects_over_non_priority_queue_limit_total",

tests/e2e/test_e2e.py

@@ -349,7 +349,13 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush):
         logger.debug("Start 3 nodes with their corresponding config")
         self.node1.start(relay="true", store="true")
         self.node2.start(relay="true", store="true", filter="true", discv5_bootstrap_node=self.node1.get_enr_uri())
-        self.node3.start(relay="true", filternode=self.node2.get_multiaddr_with_id(), store="false", discv5_bootstrap_node=self.node2.get_enr_uri())
+        self.node3.start(
+            relay="true",
+            filternode=self.node2.get_multiaddr_with_id(),
+            store="false",
+            pubsub_topic=self.test_pubsub_topic,
+            discv5_bootstrap_node=self.node2.get_enr_uri(),
+        )
 
         logger.debug("Subscribe nodes to relay  pubsub topics")
         self.node1.set_relay_subscriptions([self.test_pubsub_topic])

tests/store/test_reliability.py

@@ -85,7 +85,7 @@ class TestReliability(StepsStore):
 
     def test_message_relayed_while_store_node_is_stopped_without_removing(self):
         self.setup_first_publishing_node(store="true", relay="true")
-        self.setup_first_store_node(store="false", relay="true", remove_container=False)
+        self.setup_first_store_node(store="false", relay="false", remove_container=False)
         self.subscribe_to_pubsub_topics_via_relay()
         self.publish_message()
         self.check_published_message_is_stored(page_size=5)