fix: runner_features added

lnprototest/clightning/clightning.py

@@ -29,6 +29,7 @@
     Conn,
     namespace,
     MustNotMsg,
+    bitfield,
 )
 from lnprototest import wait_for
 from typing import Dict, Any, Callable, List, Optional, cast
@@ -505,3 +506,13 @@ def has_option(self, optname: str) -> Optional[str]:
     def add_startup_flag(self, flag: str) -> None:
         logging.debug("[ADD STARTUP FLAG '{}']".format(flag))
         self.startup_flags.append("--{}".format(flag))
+
+    def runner_features(
+        self,
+        additional_features: Optional[List[int]] = None,
+        fieldname: Optional[str] = None,
+    ) -> str:
+        if additional_features is None:
+            return ""
+        else:
+            return bitfield(*additional_features)

lnprototest/dummyrunner.py

@@ -218,3 +218,10 @@ def is_running(self) -> bool:
 
     def teardown(self):
         pass
+
+    def runner_features(
+        self,
+        additional_features: Optional[List[int]] = None,
+        fieldname: Optional[str] = None,
+    ) -> str:
+        return ""

lnprototest/runner.py

@@ -248,6 +248,17 @@ def close_channel(self, channel_id: str) -> None:
         """
         pass
 
+    @abstractmethod
+    def runner_features(
+        self,
+        additional_features: Optional[List[int]] = None,
+        fieldname: Optional[str] = None,
+    ) -> str:
+        """
+        Provide the features required by the node.
+        """
+        pass
+
 
 def remote_revocation_basepoint() -> Callable[[Runner, Event, str], str]:
     """Get the remote revocation basepoint"""

tests/test_bolt2-01-close_channel.py

@@ -56,7 +56,11 @@ def test_close_channel_shutdown_msg_normal_case_receiver_side(runner: Runner) ->
     # the option that the helper method feels for us
     test_opts = {}
     pre_events_conn = connect_to_node_helper(
-        runner, tx_spendable=tx_spendable, conn_privkey="03"
+        runner=runner,
+        tx_spendable=tx_spendable,
+        conn_privkey="03",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
     pre_events = open_and_announce_channel_helper(
         runner, conn_privkey="03", opts=test_opts
@@ -105,7 +109,11 @@ def test_close_channel_shutdown_msg_normal_case_sender_side(runner: Runner) -> N
     # the option that the helper method feels for us
     test_opts = {}
     pre_events_conn = connect_to_node_helper(
-        runner, tx_spendable=tx_spendable, conn_privkey="03"
+        runner=runner,
+        tx_spendable=tx_spendable,
+        conn_privkey="03",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
     pre_events = open_and_announce_channel_helper(
         runner, conn_privkey="03", opts=test_opts
@@ -140,7 +148,11 @@ def test_close_channel_shutdown_msg_wrong_script_pubkey_receiver_side(
     # the option that the helper method feels for us
     test_opts = {}
     pre_events_conn = connect_to_node_helper(
-        runner, tx_spendable=tx_spendable, conn_privkey="03"
+        runner=runner,
+        tx_spendable=tx_spendable,
+        conn_privkey="03",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
     pre_events = open_and_announce_channel_helper(
         runner, conn_privkey="03", opts=test_opts

tests/test_bolt2-01-open_channel.py

@@ -74,7 +74,11 @@ def test_open_channel_from_accepter_side(runner: Runner) -> None:
     local_funding_privkey = "20"
     local_keyset = gen_random_keyset(int(local_funding_privkey))
     connections_events = connect_to_node_helper(
-        runner=runner, tx_spendable=tx_spendable, conn_privkey="02"
+        runner=runner,
+        tx_spendable=tx_spendable,
+        conn_privkey="02",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
 
     # Accepter side: we initiate a new channel.
@@ -179,7 +183,11 @@ def test_open_channel_opener_side(runner: Runner) -> None:
     local_funding_privkey = "20"
     local_keyset = gen_random_keyset(int(local_funding_privkey))
     connections_events = connect_to_node_helper(
-        runner=runner, tx_spendable=tx_spendable, conn_privkey="02"
+        runner=runner,
+        tx_spendable=tx_spendable,
+        conn_privkey="02",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
 
     # Now we test the 'opener' side of an open_channel (node initiates)

tests/test_bolt2-02-reestablish.py

@@ -69,6 +69,8 @@ def test_reestablish(runner: Runner) -> None:
         runner=runner,
         tx_spendable=tx_spendable,
         conn_privkey="02",
+        global_features=runner.runner_features(fieldname="global_features"),
+        features=runner.runner_features(fieldname="features"),
     )
 
     test_events = [