From 2bcb62a6509d6114e2a56eed0544574ccde27a8f Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 21 Jun 2024 12:50:07 +0200 Subject: [PATCH] fix: partial refactor for setup_first-second_relay_node --- src/steps/peer_store.py | 54 ------------------- src/steps/relay.py | 32 +++++++++++ src/steps/rln.py | 20 ------- .../test_peer_store.py | 3 +- 4 files changed, 33 insertions(+), 76 deletions(-) delete mode 100644 src/steps/peer_store.py diff --git a/src/steps/peer_store.py b/src/steps/peer_store.py deleted file mode 100644 index d48f1c9d..00000000 --- a/src/steps/peer_store.py +++ /dev/null @@ -1,54 +0,0 @@ -import os -import inspect -import pytest -import allure - -from src.node.waku_message import WakuMessage -from src.steps.common import StepsCommon -from src.test_data import PUBSUB_TOPICS_RLN, VALID_PUBSUB_TOPICS -from src.env_vars import DEFAULT_NWAKU, RLN_CREDENTIALS, NODEKEY, NODE_1, NODE_2, ADDITIONAL_NODES -from src.libs.common import gen_step_id, delay -from src.libs.custom_logger import get_custom_logger -from src.node.waku_node import WakuNode, rln_credential_store_ready - -logger = get_custom_logger(__name__) - - -class StepsPeerStore(StepsCommon): - test_pubsub_topic = VALID_PUBSUB_TOPICS[0] - test_content_topic = "/test/1/waku-relay/proto" - test_payload = "Relay works!!" - - main_nodes = [] - optional_nodes = [] - multiaddr_list = [] - - @allure.step - def setup_first_relay_node(self, **kwargs): - self.node1 = WakuNode(NODE_1, f"node1_{self.test_id}") - self.node1.start(relay="true", nodekey=NODEKEY, **kwargs) - self.enr_uri = self.node1.get_enr_uri() - self.multiaddr_with_id = self.node1.get_multiaddr_with_id() - self.main_nodes.extend([self.node1]) - - @allure.step - def setup_second_relay_node(self, **kwargs): - self.node2 = WakuNode(NODE_2, f"node2_{self.test_id}") - self.node2.start( - relay="true", - discv5_bootstrap_node=self.enr_uri, - **kwargs, - ) - self.add_node_peer(self.node2, [self.multiaddr_with_id]) - self.main_nodes.extend([self.node2]) - - @allure.step - def setup_third_relay_node(self, **kwargs): - self.node3 = WakuNode(NODE_1, f"node3_{self.test_id}") - self.node3.start( - relay="true", - discv5_bootstrap_node=self.enr_uri, - **kwargs, - ) - self.add_node_peer(self.node3, [self.multiaddr_with_id]) - self.main_nodes.extend([self.node3]) diff --git a/src/steps/relay.py b/src/steps/relay.py index f61fe6b7..6cbf1035 100644 --- a/src/steps/relay.py +++ b/src/steps/relay.py @@ -73,6 +73,38 @@ class StepsRelay(StepsCommon): except Exception as ex: raise TimeoutError(f"WARM UP FAILED WITH: {ex}") + # Refactor candidate + @allure.step + def setup_first_relay_node(self, **kwargs): + self.node1 = WakuNode(NODE_1, f"node1_{self.test_id}") + self.node1.start(relay="true", nodekey=NODEKEY, **kwargs) + self.enr_uri = self.node1.get_enr_uri() + self.multiaddr_with_id = self.node1.get_multiaddr_with_id() + self.main_nodes.extend([self.node1]) + + # Refactor candidate + @allure.step + def setup_second_relay_node(self, **kwargs): + self.node2 = WakuNode(NODE_2, f"node2_{self.test_id}") + self.node2.start( + relay="true", + discv5_bootstrap_node=self.enr_uri, + **kwargs, + ) + self.add_node_peer(self.node2, [self.multiaddr_with_id]) + self.main_nodes.extend([self.node2]) + + @allure.step + def setup_third_relay_node(self, **kwargs): + self.node3 = WakuNode(NODE_1, f"node3_{self.test_id}") + self.node3.start( + relay="true", + discv5_bootstrap_node=self.enr_uri, + **kwargs, + ) + self.add_node_peer(self.node3, [self.multiaddr_with_id]) + self.optional_nodes.extend([self.node3]) + # this method should be used only for the tests that use the relay_warm_up fixture # otherwise use wait_for_published_message_to_reach_relay_peer @allure.step diff --git a/src/steps/rln.py b/src/steps/rln.py index 17337eb0..e7c52892 100644 --- a/src/steps/rln.py +++ b/src/steps/rln.py @@ -3,7 +3,6 @@ import inspect import pytest import allure -from src.node.waku_message import WakuMessage from src.steps.common import StepsCommon from src.test_data import PUBSUB_TOPICS_RLN from src.env_vars import DEFAULT_NWAKU, RLN_CREDENTIALS, NODEKEY, NODE_1, NODE_2, ADDITIONAL_NODES @@ -104,25 +103,6 @@ class StepsRLN(StepsCommon): self.lightpush_nodes.extend([self.light_push_node2]) self.add_node_peer(self.light_push_node2, self.multiaddr_list) - @allure.step - def setup_first_relay_node(self, **kwargs): - self.node1 = WakuNode(NODE_1, f"node1_{self.test_id}") - self.node1.start(relay="true", nodekey=NODEKEY, **kwargs) - self.enr_uri = self.node1.get_enr_uri() - self.multiaddr_with_id = self.node1.get_multiaddr_with_id() - self.main_nodes.extend([self.node1]) - - @allure.step - def setup_second_relay_node(self, **kwargs): - self.node2 = WakuNode(NODE_2, f"node2_{self.test_id}") - self.node2.start( - relay="true", - discv5_bootstrap_node=self.enr_uri, - **kwargs, - ) - self.add_node_peer(self.node2, [self.multiaddr_with_id]) - self.main_nodes.extend([self.node2]) - @allure.step def register_rln_single_node(self, **kwargs): logger.debug("Registering RLN credentials for single node") diff --git a/tests/peer_connection_management/test_peer_store.py b/tests/peer_connection_management/test_peer_store.py index fe11020d..d0c784a1 100644 --- a/tests/peer_connection_management/test_peer_store.py +++ b/tests/peer_connection_management/test_peer_store.py @@ -4,14 +4,13 @@ from src.env_vars import NODE_1, NODE_2 from src.libs.common import delay from src.libs.custom_logger import get_custom_logger from src.node.waku_node import peer_info2id, peer_info2multiaddr, multiaddr2id -from src.steps.peer_store import StepsPeerStore from src.steps.relay import StepsRelay from src.steps.store import StepsStore logger = get_custom_logger(__name__) -class TestPeerStore(StepsPeerStore, StepsRelay, StepsStore): +class TestPeerStore(StepsRelay, StepsStore): @pytest.mark.usefixtures("setup_main_relay_nodes", "setup_optional_relay_nodes") def test_get_peers(self): nodes = [self.node1, self.node2]