diff --git a/src/node/waku_node.py b/src/node/waku_node.py index ea3f173f..c86d581a 100644 --- a/src/node/waku_node.py +++ b/src/node/waku_node.py @@ -50,7 +50,6 @@ class WakuNode: "peer-exchange": "true", "discv5-discovery": "true", "cluster-id": "0", - "rln_enabled": False, "rln_creds": {}, "rln_register_only": False, } @@ -78,7 +77,7 @@ class WakuNode: key = key.replace("_", "-") default_args[key] = value - if default_args["rln_enabled"] and len(default_args["rln_creds"]) == 4: + if len(default_args["rln_creds"]) == 4: self._volumes.append(["./rln_tree:/etc/rln_tree/:Z", "./keystore/keystore.json:/keystore/keystore.json/:Z"]) rln_opts = {} if self.is_gowaku(): diff --git a/src/steps/relay.py b/src/steps/relay.py index 15f8ae03..36dd02a4 100644 --- a/src/steps/relay.py +++ b/src/steps/relay.py @@ -54,12 +54,10 @@ class StepsRelay: "keystore_password": KEYSTORE_PASSWORD, "eth_contract_address": ETH_CONTRACT_ADDRESS, } - self.node1.start(relay="true", nodekey=NODEKEY, rln=True, rln_creds=rln_creds, rln_register_only=True) - self.node1.start(relay="true", nodekey=NODEKEY, rln=True, rln_creds=rln_creds) + self.node1.start(relay="true", nodekey=NODEKEY, rln_creds=rln_creds, rln_register_only=True) self.enr_uri = self.node1.get_enr_uri() self.node2 = WakuNode(NODE_2, f"node2_{request.cls.test_id}") - self.node2.start(relay="true", discv5_bootstrap_node=self.enr_uri, rln=True, rln_creds=rln_creds, rln_register_only=True) - self.node2.start(relay="true", discv5_bootstrap_node=self.enr_uri, rln=True, rln_creds=rln_creds) + self.node2.start(relay="true", discv5_bootstrap_node=self.enr_uri, rln_creds=rln_creds, rln_register_only=True) self.main_nodes.extend([self.node1, self.node2]) @pytest.fixture(scope="function") diff --git a/tests/relay/test_rln.py b/tests/relay/test_rln.py index 759f97e2..f5c48002 100644 --- a/tests/relay/test_rln.py +++ b/tests/relay/test_rln.py @@ -12,7 +12,7 @@ logger = get_custom_logger(__name__) @pytest.mark.usefixtures("setup_main_rln_relay_nodes", "subscribe_main_relay_nodes") class TestRelayRLN(StepsRelay): - def test_publish_with_valid_payloads(self): + def test_publish_with_rln_valid_payloads(self): failed_payloads = [] for payload in SAMPLE_INPUTS: logger.debug(f'Running test with payload {payload["description"]}')