From 5f68514156f4442ebd10e6ff7b8cf77477caa843 Mon Sep 17 00:00:00 2001
From: Roman <zajic@zajic.net>
Date: Wed, 22 Jan 2025 15:40:38 +0800
Subject: [PATCH] fix: optimize setup fixtures

---
 src/steps/common.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/steps/common.py b/src/steps/common.py
index fd59c10..90e734f 100644
--- a/src/steps/common.py
+++ b/src/steps/common.py
@@ -19,6 +19,16 @@ def prepare_cluster_config(node_count):
     shutil.copyfile(src, dst)
 
 
+def start_nodes(nodes):
+    for node in nodes:
+        node.start()
+
+
+def ensure_nodes_ready(nodes):
+    for node in nodes:
+        node.ensure_ready()
+
+
 class StepsCommon:
     @pytest.fixture(scope="function", autouse=True)
     def cluster_setup(self):
@@ -32,14 +42,11 @@ class StepsCommon:
         self.node1 = NomosNode(CFGSYNC, "cfgsync")
         self.node2 = NomosNode(NOMOS, "nomos_node_0")
         self.node3 = NomosNode(NOMOS_EXECUTOR, "nomos_node_1")
-        self.node1.start()
-        self.node2.start()
-        self.node3.start()
         self.main_nodes.extend([self.node1, self.node2, self.node3])
+        start_nodes(self.main_nodes)
 
         try:
-            self.node2.ensure_ready()
-            self.node3.ensure_ready()
+            ensure_nodes_ready(self.main_nodes[2:])
         except Exception as ex:
             logger.error(f"REST service did not become ready in time: {ex}")
             raise
@@ -54,20 +61,11 @@ class StepsCommon:
         self.node4 = NomosNode(NOMOS, "nomos_node_2")
         self.node5 = NomosNode(NOMOS, "nomos_node_3")
         self.node6 = NomosNode(NOMOS_EXECUTOR, "nomos_node_4")
-        self.node1.start()
-        self.node2.start()
-        self.node3.start()
-        self.node4.start()
-        self.node5.start()
-        self.node6.start()
         self.main_nodes.extend([self.node1, self.node2, self.node3, self.node4, self.node5, self.node6])
+        start_nodes(self.main_nodes)
 
         try:
-            self.node2.ensure_ready()
-            self.node3.ensure_ready()
-            self.node4.ensure_ready()
-            self.node5.ensure_ready()
-            self.node6.ensure_ready()
+            ensure_nodes_ready(self.main_nodes[2:])
         except Exception as ex:
             logger.error(f"REST service did not become ready in time: {ex}")
             raise