diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index 26fa2a2..a65f0e4 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -116,7 +116,11 @@ class NomosNode: logger.info("REST service is ready !!") if self.is_nomos(): - check_ready() + try: + check_ready() + except Exception as ex: + logger.error(f"REST service did not become ready in time: {ex}") + raise def is_nomos(self): return "nomos" in self._container_name diff --git a/src/steps/common.py b/src/steps/common.py index 2af620e..89671eb 100644 --- a/src/steps/common.py +++ b/src/steps/common.py @@ -65,12 +65,7 @@ class StepsCommon: self.node3 = NomosNode(NOMOS_EXECUTOR, "nomos_node_1") self.main_nodes.extend([self.node1, self.node2, self.node3]) start_nodes(self.main_nodes) - - try: - ensure_nodes_ready(self.main_nodes[1:]) - except Exception as ex: - logger.error(f"REST service did not become ready in time: {ex}") - raise + ensure_nodes_ready(self.main_nodes[1:]) delay(CONSENSUS_SLOT_TIME) @@ -90,12 +85,7 @@ class StepsCommon: self.node5 = NomosNode(NOMOS_EXECUTOR, "nomos_node_3") self.main_nodes.extend([self.node1, self.node2, self.node3, self.node4, self.node5]) start_nodes(self.main_nodes) - - try: - ensure_nodes_ready(self.main_nodes[1:]) - except Exception as ex: - logger.error(f"REST service did not become ready in time: {ex}") - raise + ensure_nodes_ready(self.main_nodes[1:]) delay(CONSENSUS_SLOT_TIME) diff --git a/tests/data_confidentiality/test_data_confidentiality.py b/tests/data_confidentiality/test_data_confidentiality.py index e7149e1..9a2cc29 100644 --- a/tests/data_confidentiality/test_data_confidentiality.py +++ b/tests/data_confidentiality/test_data_confidentiality.py @@ -67,12 +67,7 @@ class TestDataConfidentiality(StepsDataAvailability): # Start new node with the same hostname and configuration as first node self.nodeX = NomosNode(NOMOS_CUSTOM, "nomos_node_0") self.nodeX.start() - - try: - self.nodeX.ensure_ready() - except Exception as ex: - logger.error(f"REST service did not become ready in time: {ex}") - raise + self.nodeX.ensure_ready() # Confirm new node haven't received any dispersed data as it is not on membership list. self.disperse_data(DATA_TO_DISPERSE[2], to_app_id(2), to_index(0))