server: move network_connected to Warnet class for scenario access

Author: pinheadmz

src/cli/network.py

@@ -129,7 +129,6 @@ def status(network: str):
 
 @network.command()
 @click.option("--network", default="warnet", show_default=True)
-@click.argument("threshold", type=int)
 def connected(network: str):
     """
     Indicate whether the all of the edges in the gaph file are connected in <network>

src/scenarios/miner_std.py

@@ -31,6 +31,9 @@ def add_options(self, parser):
         )
 
     def run_test(self):
+        while not self.warnet.network_connected():
+            sleep(1)
+
         current_miner = 0
 
         while True:

src/warnet/server.py

@@ -14,7 +14,6 @@
 import traceback
 from datetime import datetime
 from io import BytesIO
-from json import loads
 from logging import StreamHandler
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
@@ -570,24 +569,13 @@ def network_status(self, network: str = "warnet") -> list[dict]:
             self.logger.error(msg)
             raise ServerError(message=msg) from e
 
-
     def network_connected(self, network: str = "warnet") -> bool:
         """
-        Indicate whether the <threshold> of graph edges is connected in <network>
+        Indicate whether all of the graph edges are connected in <network>
         """
         try:
             wn = Warnet.from_network(network, self.backend)
-            for tank in wn.tanks:
-                peerinfo = loads(wn.container_interface.get_bitcoin_cli(tank, "getpeerinfo"))
-                manuals = 0
-                for peer in peerinfo:
-                    if peer["connection_type"] == "manual":
-                        manuals += 1
-                # Even if more edges are specifed, bitcoind only allows
-                # 8 manual outbound connections
-                if min(8, len(tank.init_peers)) > manuals:
-                    return False
-            return True
+            return wn.network_connected()
         except Exception as e:
             self.logger.error(f"{e}")
             return False

src/warnet/warnet.py

@@ -221,3 +221,16 @@ def export(self, subdir):
 
     def wait_for_health(self):
         self.container_interface.wait_for_healthy_tanks(self)
+
+    def network_connected(self):
+        for tank in self.tanks:
+            peerinfo = json.loads(self.container_interface.get_bitcoin_cli(tank, "getpeerinfo"))
+            manuals = 0
+            for peer in peerinfo:
+                if peer["connection_type"] == "manual":
+                    manuals += 1
+            # Even if more edges are specifed, bitcoind only allows
+            # 8 manual outbound connections
+            if min(8, len(tank.init_peers)) > manuals:
+                return False
+        return True

test/scenarios_test.py

@@ -11,16 +11,11 @@
 base.start_server()
 print(base.warcli(f"network start {graph_file_path}"))
 base.wait_for_all_tanks_status(target="running")
-base.wait_for_all_edges()
 
 # Use rpc instead of warcli so we get raw JSON object
 scenarios = base.rpc("scenarios_available")
 assert len(scenarios) == 4
 
-# Exponential backoff will repeat this command until it succeeds.
-# That's when we are ready for scenarios
-base.warcli("rpc 0 getblockcount")
-
 # Start scenario
 base.warcli("scenarios run miner_std --allnodes --interval=1")