logos-messaging/logos-messaging-interop-tests
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-interop-tests.git synced 2026-01-09 09:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reuse setup first and second rln relay node for setup_main_rln_relay_nodes

Browse Source
This commit is contained in:
Roman 2024-04-23 17:19:23 +08:00
parent b67faa91d4
commit dd17131838
No known key found for this signature in database
GPG Key ID: B8FE070B54E11B75
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/steps/rln.py
View File

@ -28,20 +28,10 @@ class StepsRLN:
self.node2 = WakuNode(DEFAULT_NWAKU, f"node2_{request.cls.test_id}")
self.node2.register_rln(rln_creds_source=RLN_CREDENTIALS, rln_creds_id="2")
@pytest.fixture(scope="function")
def setup_main_rln_relay_nodes(self, request):
logger.debug(f"Running fixture setup: {inspect.currentframe().f_code.co_name}")
self.node1 = WakuNode(DEFAULT_NWAKU, f"node1_{request.cls.test_id}")
self.node1.start(relay="true", nodekey=NODEKEY, rln_creds_source=RLN_CREDENTIALS, rln_creds_id="1", rln_relay_membership_index="1")
self.enr_uri = self.node1.get_enr_uri()
self.multiaddr_with_id = self.node1.get_multiaddr_with_id()
self.node2 = WakuNode(DEFAULT_NWAKU, f"node2_{request.cls.test_id}")
self.node2.start(
relay="true", discv5_bootstrap_node=self.enr_uri, rln_creds_source=RLN_CREDENTIALS, rln_creds_id="2", rln_relay_membership_index="1"
)
if self.node2.is_nwaku():
self.node2.add_peers([self.multiaddr_with_id])
self.main_nodes.extend([self.node1, self.node2])
@allure.step
def setup_main_rln_relay_nodes(self, **kwargs):
self.setup_first_rln_relay_node(**kwargs)
self.setup_second_rln_relay_node(**kwargs)
@allure.step
def setup_first_rln_relay_node(self, **kwargs):

21
tests/relay/test_rln.py
View File

@ -16,8 +16,7 @@ logger = get_custom_logger(__name__)
@pytest.mark.usefixtures("register_main_rln_relay_nodes")
class TestRelayRLN(StepsRLN, StepsRelay):
def test_publish_with_valid_payloads_at_slow_rate(self):
self.setup_first_rln_relay_node()
self.setup_second_rln_relay_node()
self.setup_main_rln_relay_nodes()
self.subscribe_main_relay_nodes()
failed_payloads = []
for payload in SAMPLE_INPUTS[:5]:
@ -32,8 +31,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
assert not failed_payloads, f"Payloads failed: {failed_payloads}"
def test_publish_with_valid_payloads_at_spam_rate(self):
self.setup_first_rln_relay_node()
self.setup_second_rln_relay_node()
self.setup_main_rln_relay_nodes()
self.subscribe_main_relay_nodes()
previous = math.trunc(time())
for i, payload in enumerate(SAMPLE_INPUTS[:4]):
@ -51,8 +49,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
@pytest.mark.skip(reason="flaky because of problems with time measurement")
def test_publish_with_valid_payloads_at_variable_rate(self):
self.setup_first_rln_relay_node()
self.setup_second_rln_relay_node()
self.setup_main_rln_relay_nodes()
self.subscribe_main_relay_nodes()
previous = math.trunc(time())
for i, payload in enumerate(SAMPLE_INPUTS):
@ -73,8 +70,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
def test_publish_with_valid_payloads_random_epoch_at_slow_rate(self):
epoch_sec = random.randint(2, 5)
self.setup_first_rln_relay_node(rln_relay_epoch_sec=epoch_sec)
self.setup_second_rln_relay_node(rln_relay_epoch_sec=epoch_sec)
self.setup_main_rln_relay_nodes(rln_relay_epoch_sec=epoch_sec)
self.subscribe_main_relay_nodes()
failed_payloads = []
for payload in SAMPLE_INPUTS[:5]:
@ -91,8 +87,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
@pytest.mark.skip(reason="waiting for RLN v2 implementation")
def test_publish_with_valid_payloads_random_user_message_limit(self):
user_message_limit = random.randint(2, 4)
self.setup_first_rln_relay_node(rln_relay_user_message_limit=user_message_limit)
self.setup_second_rln_relay_node(rln_relay_user_message_limit=user_message_limit)
self.setup_main_rln_relay_nodes(rln_relay_user_message_limit=user_message_limit)
self.subscribe_main_relay_nodes()
failed_payloads = []
for payload in SAMPLE_INPUTS[:user_message_limit]:
@ -107,8 +102,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
@pytest.mark.timeout(600)
def test_publish_with_valid_payloads_dynamic_at_slow_rate(self):
self.setup_first_rln_relay_node(rln_relay_dynamic="true")
self.setup_second_rln_relay_node(rln_relay_dynamic="true")
self.setup_main_rln_relay_nodes(rln_relay_dynamic="true")
self.subscribe_main_relay_nodes()
failed_payloads = []
for payload in SAMPLE_INPUTS[:5]:
@ -124,8 +118,7 @@ class TestRelayRLN(StepsRLN, StepsRelay):
@pytest.mark.timeout(600)
def test_publish_with_valid_payloads_dynamic_at_spam_rate(self):
self.setup_first_rln_relay_node(rln_relay_dynamic="true")
self.setup_second_rln_relay_node(rln_relay_dynamic="true")
self.setup_main_rln_relay_nodes(rln_relay_dynamic="true")
self.subscribe_main_relay_nodes()
previous = math.trunc(time())
for i, payload in enumerate(SAMPLE_INPUTS[:4]):