diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index a328efa..d44cdef 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -29,6 +29,7 @@ class NomosNode: self._internal_ports = nomos_nodes[node_type]["ports"] self._volumes = nomos_nodes[node_type]["volumes"] self._entrypoint = nomos_nodes[node_type]["entrypoint"] + self._node_type = node_type self._log_path = os.path.join(DOCKER_LOG_DIR, f"{container_name}__{self._image_name.replace('/', '_')}.log") self._docker_manager = DockerManager(self._image_name) @@ -36,12 +37,8 @@ class NomosNode: self._container = None cwd = os.getcwd() - updated_volumes = [] - for i, volume in enumerate(self._volumes): - updated_volumes.append(cwd + "/" + volume) - self._volumes = updated_volumes + self._volumes = [cwd + "/" + volume for volume in self._volumes] - logger.debug(f"NomosNode instance initialized with volumes {self._volumes}") logger.debug(f"NomosNode instance initialized with log path {self._log_path}") @retry(stop=stop_after_delay(60), wait=wait_fixed(0.1), reraise=True) @@ -139,6 +136,9 @@ class NomosNode: def info(self): return self._api.info() + def node_type(self): + return self._node_type + def check_nomos_log_errors(self, whitelist=None): keywords = LOG_ERROR_KEYWORDS diff --git a/src/steps/da.py b/src/steps/da.py index d73aa20..d780686 100644 --- a/src/steps/da.py +++ b/src/steps/da.py @@ -2,6 +2,7 @@ import json import allure +from src.env_vars import NOMOS_EXECUTOR from src.steps.common import StepsCommon @@ -18,11 +19,19 @@ def prepare_get_range_request(app_id, start_index, end_index): class StepsDataAvailability(StepsCommon): + def find_executor_node(self): + executor = {} + for node in self.main_nodes: + if node.node_type() == NOMOS_EXECUTOR: + executor = node + return executor + @allure.step def disperse_data(self, data, app_id, index): request = prepare_dispersal_request(data, app_id, index) + executor = self.find_executor_node() try: - self.node3.send_dispersal_request(request) + executor.send_dispersal_request(request) except Exception as ex: assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex)