fixup! channeld: Code to implement splicing

CI fixes
ElementsProject · Jul 19, 2023 · e46cd6a · e46cd6a
1 parent b520e49
commit e46cd6a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/doc/lightning-listconfigs.7.md b/doc/lightning-listconfigs.7.md
@@ -120,6 +120,9 @@ On success, an object is returned, containing:
   - **experimental-dual-fund** (object, optional):
     - **set** (boolean): `true` if set in config or cmdline
     - **source** (string): source of configuration setting
+  - **experimental-splicing** (object, optional) *(added v23.08)*:
+    - **set** (boolean): `true` if set in config or cmdline
+    - **source** (string): source of configuration setting
   - **experimental-onion-messages** (object, optional):
     - **set** (boolean): `true` if set in config or cmdline
     - **source** (string): source of configuration setting
@@ -467,4 +470,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:a40882cad0d889aa736a2932250102be43ae7e62b3d2429b26e0961e4c315f7b)
+[comment]: # ( SHA256STAMP:ea88648dcac46e38b2f7eba7965b86c88fb9dcf01ffa740fe64ee142e88c2dcd)
diff --git a/doc/schemas/listconfigs.schema.json b/doc/schemas/listconfigs.schema.json
@@ -402,6 +402,25 @@
             }
           }
         },
+        "experimental-splicing": {
+          "added": "v23.08",
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "set",
+            "source"
+          ],
+          "properties": {
+            "set": {
+              "type": "boolean",
+              "description": "`true` if set in config or cmdline"
+            },
+            "source": {
+              "type": "string",
+              "description": "source of configuration setting"
+            }
+          }
+        },
         "experimental-onion-messages": {
           "type": "object",
           "additionalProperties": false,
@@ -1449,6 +1468,11 @@
       "type": "boolean",
       "description": "`experimental-dual-fund` field from config or cmdline, or default"
     },
+    "experimental-splicing": {
+      "deprecated": "v23.08",
+      "type": "boolean",
+      "description": "`experimental-splicing` field from config or cmdline, or default"
+    },
     "experimental-onion-messages": {
       "deprecated": "v23.08",
       "type": "boolean",

diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -3942,6 +3942,8 @@ def test_sql(node_factory, bitcoind):
                          'type': 'string'},
                         {'name': 'total_funding_msat',
                          'type': 'msat'},
+                        {'name': 'splice_amount',
+                         'type': 'msat'},
                         {'name': 'our_funding_msat',
                          'type': 'msat'},
                         {'name': 'scratch_txid',