clean up rebase on main, lint

Author: pinheadmz

resources/scenarios/ln_init.py

@@ -184,5 +184,6 @@ def funded_lnnodes():
 def main():
     LNInit().main()
 
+
 if __name__ == "__main__":
     main()

resources/scenarios/miner_std.py

@@ -71,5 +71,6 @@ def run_test(self):
 def main():
     MinerStd().main()
 
+
 if __name__ == "__main__":
     main()

resources/scenarios/reconnaissance.py

@@ -83,5 +83,6 @@ def run_test(self):
 def main():
     Reconnaissance().main()
 
+
 if __name__ == "__main__":
     main()

resources/scenarios/test_scenarios/buggy_failure.py

@@ -23,5 +23,6 @@ def run_test(self):
 def main():
     Failure().main()
 
+
 if __name__ == "__main__":
     main()

resources/scenarios/test_scenarios/connect_dag.py

@@ -120,5 +120,6 @@ def assert_connection(self, connector, connectee_index, connection_type: Connect
 def main():
     ConnectDag().main()
 
+
 if __name__ == "__main__":
     main()

resources/scenarios/test_scenarios/p2p_interface.py

@@ -55,5 +55,6 @@ def run_test(self):
 def main():
     GetdataTest().main()
 
+
 if __name__ == "__main__":
     main()

src/warnet/control.py

@@ -24,8 +24,8 @@
     get_pods,
     pod_log,
     snapshot_bitcoin_datadir,
-    wait_for_pod,
     wait_for_init,
+    wait_for_pod,
     write_file_to_container,
 )
 from .process import run_command, stream_command
@@ -172,9 +172,11 @@ def get_active_network(namespace):
     default=False,
     help="Stream scenario output and delete container when stopped",
 )
-@click.option("--source_dir", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=False)
+@click.option(
+    "--source_dir", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=False
+)
 @click.argument("additional_args", nargs=-1, type=click.UNPROCESSED)
-def run(scenario_file: str, source_dir, additional_args: tuple[str]):
+def run(scenario_file: str, debug: bool, source_dir, additional_args: tuple[str]):
     """
     Run a scenario from a file.
     Pass `-- --help` to get individual scenario help
@@ -213,7 +215,10 @@ def run(scenario_file: str, source_dir, additional_args: tuple[str]):
     def filter(path):
         if any(needle in str(path) for needle in [".pyc", ".csv", ".DS_Store"]):
             return False
-        if any(needle in str(path) for needle in ["__init__.py", "commander.py", "test_framework", scenario_path.name]):
+        if any(
+            needle in str(path)
+            for needle in ["__init__.py", "commander.py", "test_framework", scenario_path.name]
+        ):
             print(f"Including: {path}")
             return True
         return False
@@ -280,6 +285,8 @@ def filter(path):
         print(f"Successfully uploaded scenario data to commander: {scenario_name}")
 
     if debug:
+        print("Waiting for commander pod to start...")
+        wait_for_pod(name)
         _logs(pod_name=name, follow=True)
         print("Deleting pod...")
         delete_pod(name)

src/warnet/k8s.py

@@ -118,7 +118,7 @@ def delete_namespace(namespace: str) -> bool:
 
 
 def delete_pod(pod_name: str) -> bool:
-    command = f"kubectl delete pod {pod_name}"
+    command = f"kubectl -n {get_default_namespace()} delete pod {pod_name}"
     return stream_command(command)