logos-blockchain/logos-blockchain-e2e-tests
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-e2e-tests.git synced 2026-01-02 13:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: optimize variables

Browse Source
This commit is contained in:
Roman 2025-06-25 16:54:49 +08:00
parent 2b51738ffc
commit d7fe54e06e
No known key found for this signature in database
GPG Key ID: 583BDF43C238B83E
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/env_vars.py
View File

@ -14,13 +14,24 @@ def get_env_var(var_name, default=None):
return env_var
def make_mod_da_var(node_type, version, is_image=False):
base = "nomos_executor_mod_da" if node_type == "executor" else "nomos_mod_da"
value = f"{base}_{version}"
if is_image:
return value.replace("_", "-") + ":testnet"
else:
return value
# 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_d8bbc46 = "nomos-mod-da-d8bbc46:testnet"
NOMOS_EXECUTOR_MOD_DA_IMAGE_d19a1f3 = "nomos-executor-mod-da-d19a1f3:testnet"
NOMOS_EXECUTOR_MOD_DA_IMAGE_7f54114 = "nomos-executor-mod-da-7f54114:testnet"
NOMOS_EXECUTOR_MOD_DA_IMAGE_4a58376 = "nomos-executor-mod-da-4a58376:testnet"
NOMOS_MOD_DA_IMAGE_d8bbc46 = make_mod_da_var("validator", "d8bbc46", True)
NOMOS_EXECUTOR_MOD_DA_IMAGE_d19a1f3 = make_mod_da_var("executor", "d19a1f3", True)
NOMOS_EXECUTOR_MOD_DA_IMAGE_7f54114 = make_mod_da_var("executor", "7f54114", True)
NOMOS_EXECUTOR_MOD_DA_IMAGE_4a58376 = make_mod_da_var("executor", "4a58376", True)
DEFAULT_PROXY_IMAGE = "bitnami/configurable-http-proxy:latest"
HTTP_PROXY_IMAGE = get_env_var("HTTP_PROXY_IMAGE", DEFAULT_PROXY_IMAGE)
@ -29,11 +40,10 @@ NOMOS_CUSTOM = "nomos_custom"
NOMOS = "nomos"
NOMOS_EXECUTOR = "nomos_executor"
CFGSYNC = "cfgsync"
NOMOS_MOD_DA = "nomos_mod_da"
NOMOS_EXECUTOR_MOD_DA = "nomos_executor_mod_da"
NOMOS_EXECUTOR_MOD_DA_d19a1f3 = "nomos_executor_mod_da_d19a1f3"
NOMOS_EXECUTOR_MOD_DA_7f54114 = "nomos_executor_mod_da_7f54114"
NOMOS_EXECUTOR_MOD_DA_4a58376 = "nomos_executor_mod_da_4a58376"
NOMOS_EXECUTOR_MOD_DA_d19a1f3 = make_mod_da_var("executor", "d19a1f3")
NOMOS_EXECUTOR_MOD_DA_7f54114 = make_mod_da_var("executor", "7f54114")
NOMOS_EXECUTOR_MOD_DA_4a58376 = make_mod_da_var("executor", "4a58376")
NODE_1 = get_env_var("NODE_1", NOMOS)
NODE_2 = get_env_var("NODE_2", NOMOS_EXECUTOR)

10
src/steps/common.py
View File

@ -4,7 +4,7 @@ import os
import pytest
from src.client.proxy_client import ProxyClient
from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR, CONSENSUS_SLOT_TIME, NOMOS_MOD_DA, NOMOS_EXECUTOR_MOD_DA
from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR, CONSENSUS_SLOT_TIME, make_mod_da_var
from src.libs.common import delay
from src.libs.custom_logger import get_custom_logger
from src.node.nomos_node import NomosNode
@ -123,14 +123,14 @@ class StepsCommon:
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 ""
validator = make_mod_da_var("validator", validator_version)
executor_version = get_param_or_default(request, "executor_version", "")
executor_version = f"_{executor_version}" if executor_version else ""
executor = make_mod_da_var("executor", executor_version)
self.node1 = NomosNode(CFGSYNC, "cfgsync")
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.node2 = NomosNode(validator, "nomos_node_0")
self.node3 = NomosNode(executor, "nomos_node_1")
self.main_nodes.extend([self.node1, self.node2, self.node3])
start_nodes(self.main_nodes)
ensure_nodes_ready(self.main_nodes[1:])