From 53f6441f37c9b13374a0f68ef1b8132e18a31ac4 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 14 Apr 2025 17:57:49 +0800 Subject: [PATCH] fix: change 4 node cl default parameters --- cluster_config/cfgsync-template.yaml | 2 +- src/steps/common.py | 14 +++++++++----- .../test_api_compatibility.py | 5 ++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cluster_config/cfgsync-template.yaml b/cluster_config/cfgsync-template.yaml index 5f5ec63..df3bf29 100644 --- a/cluster_config/cfgsync-template.yaml +++ b/cluster_config/cfgsync-template.yaml @@ -14,7 +14,7 @@ num_subnets: {{ subnet_size }} old_blobs_check_interval: "5.0" blobs_validity_duration: "60.0" global_params_path: "/kzgrs_test_params" -min_dispersal_peers: 1 +min_dispersal_peers: {{ min_dispersal_peers }} min_replication_peers: 1 monitor_failure_time_window: "5.0" balancer_interval: "5.0" diff --git a/src/steps/common.py b/src/steps/common.py index 71e4a35..d110e12 100644 --- a/src/steps/common.py +++ b/src/steps/common.py @@ -14,7 +14,7 @@ from jinja2 import Template logger = get_custom_logger(__name__) -def prepare_cluster_config(node_count, subnetwork_size=2, dispersal_factor=2): +def prepare_cluster_config(node_count, subnetwork_size=2, dispersal_factor=2, min_dispersal_peers=1): cwd = os.getcwd() config_dir = "cluster_config" @@ -22,7 +22,9 @@ def prepare_cluster_config(node_count, subnetwork_size=2, dispersal_factor=2): template_content = file.read() template = Template(template_content) - rendered = template.render(num_hosts=node_count, subnet_size=subnetwork_size, dispersal_factor=dispersal_factor) + rendered = template.render( + num_hosts=node_count, subnet_size=subnetwork_size, dispersal_factor=dispersal_factor, min_dispersal_peers=min_dispersal_peers + ) with open(f"{cwd}/{config_dir}/cfgsync.yaml", "w") as outfile: outfile.write(rendered) @@ -55,7 +57,8 @@ class StepsCommon: subnet_size = get_param_or_default(request, "subnet_size", 2) dispersal_factor = get_param_or_default(request, "dispersal_factor", 2) - prepare_cluster_config(2, subnet_size, dispersal_factor) + min_dispersal_peers = get_param_or_default(request, "min_dispersal_peers", 1) + prepare_cluster_config(2, subnet_size, dispersal_factor, min_dispersal_peers) self.node1 = NomosNode(CFGSYNC, "cfgsync") self.node2 = NomosNode(NOMOS, "nomos_node_0") @@ -76,8 +79,9 @@ class StepsCommon: logger.debug(f"Running fixture setup: {inspect.currentframe().f_code.co_name}") subnet_size = get_param_or_default(request, "subnet_size", 4) - dispersal_factor = get_param_or_default(request, "dispersal_factor", 1) - prepare_cluster_config(4, subnet_size, dispersal_factor) + dispersal_factor = get_param_or_default(request, "dispersal_factor", 2) + min_dispersal_peers = get_param_or_default(request, "min_dispersal_peers", 4) + prepare_cluster_config(4, subnet_size, dispersal_factor, min_dispersal_peers) self.node1 = NomosNode(CFGSYNC, "cfgsync") self.node2 = NomosNode(NOMOS, "nomos_node_0") diff --git a/tests/protocol_compatibility/test_api_compatibility.py b/tests/protocol_compatibility/test_api_compatibility.py index f8ef7f3..aa20093 100644 --- a/tests/protocol_compatibility/test_api_compatibility.py +++ b/tests/protocol_compatibility/test_api_compatibility.py @@ -73,10 +73,9 @@ class TestApiCompatibility(StepsDataAvailability, StepsConsensus, StepsStorage): assert all(r in rcv_rows_commitments for r in rows_commitments), "Not all rows commitments are present" @pytest.mark.usefixtures("setup_4_node_cluster") - @pytest.mark.parametrize("setup_4_node_cluster", [{"subnet_size": 2}], indirect=True) - def test_da_across_nodes_consensus_compatibility(self): + def test_da_cross_nodes_consensus_compatibility(self): self.disperse_data(DATA_TO_DISPERSE[2], to_app_id(1), to_index(0)) - delay(5) + delay(10) index_shares = self.get_data_range(self.node2, to_app_id(1), to_index(0), to_index(5)) column_commitments, rows_commitments = extract_commitments(index_shares)