lnprototest: refactroing abstract class and fixed the #14

kill all the process when the class was removed from the scope.

Signed-off-by: Vincenzo Palazzo <[email protected]>

lnprototest/clightning/clightning.py

@@ -77,8 +77,8 @@ def __init__(self, config: Any):
                 stdout=subprocess.PIPE,
                 check=True,
             )
-            .stdout.decode("utf-8")
-            .splitlines()
+                .stdout.decode("utf-8")
+                .splitlines()
         )
         self.options: Dict[str, str] = {}
         for o in opts:
@@ -232,12 +232,12 @@ def recv(self, event: Event, conn: Conn, outbuf: bytes) -> None:
                 raise EventError(event, "Connection closed")
 
     def fundchannel(
-        self,
-        event: Event,
-        conn: Conn,
-        amount: int,
-        feerate: int = 253,
-        expect_fail: bool = False,
+            self,
+            event: Event,
+            conn: Conn,
+            amount: int,
+            feerate: int = 253,
+            expect_fail: bool = False,
     ) -> None:
         """
         event       - the event which cause this, for error logging
@@ -257,11 +257,11 @@ def fundchannel(
             self.fundchannel_future = None
 
         def _fundchannel(
-            runner: Runner,
-            conn: Conn,
-            amount: int,
-            feerate: int,
-            expect_fail: bool = False,
+                runner: Runner,
+                conn: Conn,
+                amount: int,
+                feerate: int,
+                expect_fail: bool = False,
         ) -> str:
             peer_id = conn.pubkey.format().hex()
             # Need to supply feerate here, since regtest cannot estimate fees
@@ -285,14 +285,14 @@ def _done(fut: Any) -> None:
         self.cleanup_callbacks.append(self.kill_fundchannel)
 
     def init_rbf(
-        self,
-        event: Event,
-        conn: Conn,
-        channel_id: str,
-        amount: int,
-        utxo_txid: str,
-        utxo_outnum: int,
-        feerate: int,
+            self,
+            event: Event,
+            conn: Conn,
+            channel_id: str,
+            amount: int,
+            utxo_txid: str,
+            utxo_outnum: int,
+            feerate: int,
     ) -> None:
 
         if self.fundchannel_future:
@@ -365,7 +365,7 @@ def addhtlc(self, event: Event, conn: Conn, amount: int, preimage: str) -> None:
         self.rpc.sendpay([routestep], payhash)
 
     def get_output_message(
-        self, conn: Conn, event: Event, timeout: int = TIMEOUT
+            self, conn: Conn, event: Event, timeout: int = TIMEOUT
     ) -> Optional[bytes]:
         fut = self.executor.submit(cast(CLightningConn, conn).connection.read_message)
         try:
@@ -382,11 +382,11 @@ def check_error(self, event: Event, conn: Conn) -> Optional[str]:
         return msg.hex()
 
     def check_final_error(
-        self,
-        event: Event,
-        conn: Conn,
-        expected: bool,
-        must_not_events: List[MustNotMsg],
+            self,
+            event: Event,
+            conn: Conn,
+            expected: bool,
+            must_not_events: List[MustNotMsg],
     ) -> None:
         if not expected:
             # Inject raw packet to ensure it hangs up *after* processing all previous ones.

lnprototest/dummyrunner.py

@@ -16,6 +16,7 @@
 
 
 class DummyRunner(Runner):
+
     def __init__(self, config: Any):
         super().__init__(config)
 
@@ -86,12 +87,12 @@ def recv(self, event: Event, conn: Conn, outbuf: bytes) -> None:
             print("[RECV {} {}]".format(event, outbuf.hex()))
 
     def fundchannel(
-        self,
-        event: Event,
-        conn: Conn,
-        amount: int,
-        feerate: int = 253,
-        expect_fail: bool = False,
+            self,
+            event: Event,
+            conn: Conn,
+            amount: int,
+            feerate: int = 253,
+            expect_fail: bool = False,
     ) -> None:
         if self.config.getoption("verbose"):
             print(
@@ -101,14 +102,14 @@ def fundchannel(
             )
 
     def init_rbf(
-        self,
-        event: Event,
-        conn: Conn,
-        channel_id: str,
-        amount: int,
-        utxo_txid: str,
-        utxo_outnum: int,
-        feerate: int,
+            self,
+            event: Event,
+            conn: Conn,
+            channel_id: str,
+            amount: int,
+            utxo_txid: str,
+            utxo_outnum: int,
+            feerate: int,
     ) -> None:
         if self.config.getoption("verbose"):
             print(
@@ -143,21 +144,21 @@ def fake_field(ftype: FieldType) -> str:
             if ftype.elemtype.name == "byte":
                 return "00" * ftype.arraysize
             return (
-                "["
-                + ",".join([DummyRunner.fake_field(ftype.elemtype)] * ftype.arraysize)
-                + "]"
+                    "["
+                    + ",".join([DummyRunner.fake_field(ftype.elemtype)] * ftype.arraysize)
+                    + "]"
             )
         elif ftype.name in (
-            "byte",
-            "u8",
-            "u16",
-            "u32",
-            "u64",
-            "tu16",
-            "tu32",
-            "tu64",
-            "bigsize",
-            "varint",
+                "byte",
+                "u8",
+                "u16",
+                "u32",
+                "u64",
+                "tu16",
+                "tu32",
+                "tu64",
+                "bigsize",
+                "varint",
         ):
             return "0"
         elif ftype.name in ("chain_hash", "channel_id", "sha256"):
@@ -200,11 +201,11 @@ def check_error(self, event: Event, conn: Conn) -> Optional[str]:
         return "Dummy error"
 
     def check_final_error(
-        self,
-        event: Event,
-        conn: Conn,
-        expected: bool,
-        must_not_events: List[MustNotMsg],
+            self,
+            event: Event,
+            conn: Conn,
+            expected: bool,
+            must_not_events: List[MustNotMsg],
     ) -> None:
         pass
 

lnprototest/runner.py

@@ -58,6 +58,15 @@ def __init__(self, config: Any):
         else:
             self.logger.setLevel(logging.INFO)
 
+    def __enter__(self) -> "Runner":
+        """Call the method when enter inside the class the first time"""
+        self.start()
+        return self
+
+    def __del__(self):
+        """Call the method when the class is out of scope"""
+        self.stop()
+
     def _is_dummy(self) -> bool:
         """The DummyRunner returns True here, as it can't do some things"""
         return False