diff --git a/src/env_vars.py b/src/env_vars.py index 47c334f..2fe4932 100644 --- a/src/env_vars.py +++ b/src/env_vars.py @@ -17,9 +17,9 @@ def get_env_var(var_name, default=None): # Configuration constants. Need to be upercase to appear in reports DEFAULT_NOMOS_IMAGE = "nomos:testnet" NOMOS_IMAGE = get_env_var("NOMOS_IMAGE", DEFAULT_NOMOS_IMAGE) -NOMOS_MOD_DA_IMAGE = "nomos-mod-da:testnet" +NOMOS_MOD_DA_IMAGE_d8bbc46 = "nomos-mod-da-d8bbc46:testnet" NOMOS_EXECUTOR_MOD_DA_IMAGE = "nomos-executor-mod-da:testnet" -NOMOS_EXECUTOR_MOD_DA_IMAGE_25d781e = "nomos-executor-mod-da-25d781e:testnet" +NOMOS_EXECUTOR_MOD_DA_IMAGE_7f54114 = "nomos-executor-mod-da-7f54114:testnet" NOMOS_EXECUTOR_MOD_DA_IMAGE_0a01ddb = "nomos-executor-mod-da-0a01ddb:testnet" DEFAULT_PROXY_IMAGE = "bitnami/configurable-http-proxy:latest" @@ -31,7 +31,7 @@ NOMOS_EXECUTOR = "nomos_executor" CFGSYNC = "cfgsync" NOMOS_MOD_DA = "nomos_mod_da" NOMOS_EXECUTOR_MOD_DA = "nomos_executor_mod_da" -NOMOS_EXECUTOR_MOD_DA_25d781e = "nomos_executor_mod_da_25d781e" +NOMOS_EXECUTOR_MOD_DA_7f54114 = "nomos_executor_mod_da_7f54114" NOMOS_EXECUTOR_MOD_DA_0a01ddb = "nomos_executor_mod_da_0a01ddb" NODE_1 = get_env_var("NODE_1", NOMOS) diff --git a/src/node/node_vars.py b/src/node/node_vars.py index 4da8077..ce0d941 100644 --- a/src/node/node_vars.py +++ b/src/node/node_vars.py @@ -1,14 +1,14 @@ from src.env_vars import ( NOMOS_IMAGE, - NOMOS_MOD_DA_IMAGE, NOMOS_EXECUTOR_MOD_DA_IMAGE, - NOMOS_EXECUTOR_MOD_DA_IMAGE_25d781e, NOMOS_EXECUTOR_MOD_DA_IMAGE_0a01ddb, + NOMOS_MOD_DA_IMAGE_d8bbc46, + NOMOS_EXECUTOR_MOD_DA_IMAGE_7f54114, ) nomos_nodes = { - "nomos_mod_da": { - "image": NOMOS_MOD_DA_IMAGE, + "nomos_mod_da_d8bbc46": { + "image": NOMOS_MOD_DA_IMAGE_d8bbc46, "volumes": ["cluster_config:/etc/nomos", "./kzgrs/kzgrs_test_params:/kzgrs_test_params:z"], "ports": ["3000/udp", "18080/tcp"], "entrypoint": "/etc/nomos/scripts/run_nomos_node_debug.sh", @@ -19,8 +19,8 @@ nomos_nodes = { "ports": ["3000/udp", "18080/tcp"], "entrypoint": "/etc/nomos/scripts/run_nomos_executor_debug.sh", }, - "nomos_executor_mod_da_25d781e": { - "image": NOMOS_EXECUTOR_MOD_DA_IMAGE_25d781e, + "nomos_executor_mod_da_7f54114": { + "image": NOMOS_EXECUTOR_MOD_DA_IMAGE_7f54114, "volumes": ["cluster_config:/etc/nomos", "./kzgrs/kzgrs_test_params:/kzgrs_test_params:z"], "ports": ["3000/udp", "18080/tcp"], "entrypoint": "/etc/nomos/scripts/run_nomos_executor_debug.sh", diff --git a/src/steps/common.py b/src/steps/common.py index 8428834..86ff1d9 100644 --- a/src/steps/common.py +++ b/src/steps/common.py @@ -122,11 +122,14 @@ class StepsCommon: min_dispersal_peers = get_param_or_default(request, "min_dispersal_peers", 1) prepare_cluster_config(2, subnet_size, dispersal_factor, min_dispersal_peers) + validator_version = get_param_or_default(request, "validator_version", "") + validator_version = f"_{validator_version}" if validator_version else "" + executor_version = get_param_or_default(request, "executor_version", "") executor_version = f"_{executor_version}" if executor_version else "" self.node1 = NomosNode(CFGSYNC, "cfgsync") - self.node2 = NomosNode(NOMOS_MOD_DA, "nomos_node_0") + self.node2 = NomosNode(NOMOS_MOD_DA + f"{validator_version}", "nomos_node_0") self.node3 = NomosNode(NOMOS_EXECUTOR_MOD_DA + f"{executor_version}", "nomos_node_1") self.main_nodes.extend([self.node1, self.node2, self.node3]) start_nodes(self.main_nodes) diff --git a/tests/dispersal_resilience/test_dispersal_resilience.py b/tests/dispersal_resilience/test_dispersal_resilience.py index 54e17e2..a0b53f6 100644 --- a/tests/dispersal_resilience/test_dispersal_resilience.py +++ b/tests/dispersal_resilience/test_dispersal_resilience.py @@ -26,7 +26,7 @@ class TestDispersalResilience(StepsDataAvailability): raise AssertionError("Get data range response should be empty") @pytest.mark.usefixtures("setup_2_node_mod_da_cluster") - @pytest.mark.parametrize("setup_2_node_mod_da_cluster", [{"executor_version": "25d781e"}], indirect=True) + @pytest.mark.parametrize("setup_2_node_mod_da_cluster", [{"validator_version": "d8bbc46", "executor_version": "7f54114"}], indirect=True) def test_chunkification_robustness_different_chunk_size(self): # Confirm validator node has rejected dispersal request from executor with different data alignment try: