From 288252ec44636ffbeda8c289504361ead2c0cf55 Mon Sep 17 00:00:00 2001 From: aya Date: Sun, 3 Nov 2024 14:00:55 +0200 Subject: [PATCH] Fixing review comments --- src/env_vars.py | 2 +- tests/e2e/test_e2e.py | 28 +++++++++------------------- tests/store/test_time_filter.py | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/env_vars.py b/src/env_vars.py index 51b0c4d4..75090df5 100644 --- a/src/env_vars.py +++ b/src/env_vars.py @@ -17,7 +17,7 @@ def get_env_var(var_name, default=None): DEFAULT_NWAKU = "wakuorg/nwaku:latest" DEFAULT_GOWAKU = "wakuorg/go-waku:latest" NODE_1 = get_env_var("NODE_1", DEFAULT_NWAKU) -NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU) +NODE_2 = get_env_var("NODE_2", DEFAULT_GOWAKU) ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}") # more nodes need to follow the NODE_X pattern DOCKER_LOG_DIR = get_env_var("DOCKER_LOG_DIR", "./log/docker") diff --git a/tests/e2e/test_e2e.py b/tests/e2e/test_e2e.py index 2c9a83ed..83cf65ea 100644 --- a/tests/e2e/test_e2e.py +++ b/tests/e2e/test_e2e.py @@ -179,7 +179,7 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush): # self.node1 relays and we check that self.node10 receives the message self.check_published_message_reaches_relay_peer(sender=self.node1, peer_list=[self.node10], message_propagation_delay=1) - @pytest.mark.skipif("go-waku" in NODE_2, reason="Test works only with nwaku") + # @pytest.mark.skipif("go-waku" in NODE_2, reason="Test works only with nwaku") def test_store_filter_interaction_with_six_nodes(self): logger.debug("Create 6 nodes") self.node4 = WakuNode(NODE_2, f"node3_{self.test_id}") @@ -225,33 +225,23 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush): @pytest.mark.skipif("go-waku" in NODE_2, reason="Test works only with nwaku") def test_repeated_filter_requestID(self): - logger.debug("Create 6 nodes") - self.node4 = WakuNode(NODE_2, f"node3_{self.test_id}") - self.node5 = WakuNode(NODE_2, f"node3_{self.test_id}") - self.node6 = WakuNode(NODE_2, f"node3_{self.test_id}") - - logger.debug("Start 5 nodes with their corresponding config") + logger.debug("Create 3 nodes") + logger.debug("Start 3 nodes with their corresponding config") self.node1.start(relay="true", store="true") - self.node2.start(relay="true", store="true", discv5_bootstrap_node=self.node1.get_enr_uri()) - self.node3.start(relay="true", store="true", discv5_bootstrap_node=self.node2.get_enr_uri()) - self.node4.start(relay="true", filter="true", store="true", discv5_bootstrap_node=self.node3.get_enr_uri()) - self.node5.start(relay="false", filternode=self.node4.get_multiaddr_with_id(), discv5_bootstrap_node=self.node4.get_enr_uri()) - self.node6.start(relay="true", filter="true", filternode=self.node4.get_multiaddr_with_id()) + 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()) logger.debug("Subscribe nodes to relay pubsub topics") self.node1.set_relay_subscriptions([self.test_pubsub_topic]) self.node2.set_relay_subscriptions([self.test_pubsub_topic]) - self.node3.set_relay_subscriptions([self.test_pubsub_topic]) - self.node4.set_relay_subscriptions([self.test_pubsub_topic]) - self.node6.set_relay_subscriptions([self.test_pubsub_topic]) logger.debug("Wait for all nodes auto connection") - node_list = [self.node1, self.node2, self.node3, self.node4] + node_list = [self.node1, self.node2] self.wait_for_autoconnection(node_list, hard_wait=30) - logger.debug(f"Node6 subscribe to filter for pubsubtopic {self.test_pubsub_topic} 2 times with same request id") - self.node6.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic}) - self.node6.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic}) + logger.debug(f"Node3 subscribe to filter for pubsubtopic {self.test_pubsub_topic} 2 times with same request id") + self.node3.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic}) + self.node3.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic}) logger.debug(f"Node1 publish message for topic {self.test_pubsub_topic}") self.publish_message(sender=self.node1, pubsub_topic=self.test_pubsub_topic, message=self.create_message()) diff --git a/tests/store/test_time_filter.py b/tests/store/test_time_filter.py index 07db9a5a..0aae2cf4 100644 --- a/tests/store/test_time_filter.py +++ b/tests/store/test_time_filter.py @@ -135,7 +135,7 @@ class TestTimeFilter(StepsStore): for node in self.store_nodes: store_response = self.get_messages_from_store(node, page_size=20, start_time=start_time, include_data=True) logger.debug(f"number of messages stored for " f"start time = {start_time} is {len(store_response.messages)}") - assert len(store_response.messages) == 6, "number of messages retrieved doesn't match time filter " + assert len(store_response.messages) == 6, "number of messages retrieved doesn't match time filter " def test_time_filter_zero_start_time(self): ts_pass = self.get_time_list_pass()