fixup! channeld: Code to implement splicing

Text fixes:
* Only test splicing if its enabled
* Handle cases where splicing isn’t enabled correctly

Author: ddustin

tests/test_misc.py

@@ -2174,9 +2174,11 @@ def test_list_features_only(node_factory):
                 'option_shutdown_anysegwit/odd',
                 'option_channel_type/odd',
                 'option_scid_alias/odd',
-                'option_zeroconf/odd',
-                'option_splice/odd',
-                'supports_open_accept_channel_type']
+                'option_zeroconf/odd']
+    if env('EXPERIMENTAL_SPLICING') == '1':
+        expected += ['option_splice/odd']
+    expected += ['supports_open_accept_channel_type']
+
     assert features == expected
 
 

tests/test_splicing.py

@@ -1,7 +1,10 @@
 from fixtures import *  # noqa: F401,F403
+from pyln.testing.utils import env
 import pytest
+import unittest
 
 
+@unittest.skipIf(env('EXPERIMENTAL_SPLICING') != '1', "Need experimental splicing turned on")
 @pytest.mark.openchannel('v2')
 def test_splice(node_factory, bitcoind):
     l1, l2 = node_factory.line_graph(2, fundamount=1000000, wait_for_announce=True)