doc: Fix wrong_funding description in manpage and type in schema

ElementsProject · Jul 23, 2022 · ed15204 · ed15204
1 parent e70729b
commit ed15204
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
@@ -396,7 +396,7 @@ message CloseRequest {
 	optional uint32 unilateraltimeout = 2;
 	optional string destination = 3;
 	optional string fee_negotiation_step = 4;
-	optional bytes wrong_funding = 5;
+	optional Outpoint wrong_funding = 5;
 	optional bool force_lease_closed = 6;
 	repeated Feerate feerange = 7;
 }

diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
@@ -1055,7 +1055,7 @@ impl From<&pb::CloseRequest> for requests::CloseRequest {
             unilateraltimeout: c.unilateraltimeout.clone(), // Rule #1 for type u32?
             destination: c.destination.clone(), // Rule #1 for type string?
             fee_negotiation_step: c.fee_negotiation_step.clone(), // Rule #1 for type string?
-            wrong_funding: c.wrong_funding.clone().map(|v| hex::encode(v)), // Rule #1 for type txid?
+            wrong_funding: c.wrong_funding.clone(), // Rule #1 for type outpoint?
             force_lease_closed: c.force_lease_closed.clone(), // Rule #1 for type boolean?
             feerange: Some(c.feerange.iter().map(|s| s.into()).collect()), // Rule #4
         }

diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
@@ -215,7 +215,7 @@ pub mod requests {
 	    #[serde(alias = "fee_negotiation_step", skip_serializing_if = "Option::is_none")]
 	    pub fee_negotiation_step: Option<String>,
 	    #[serde(alias = "wrong_funding", skip_serializing_if = "Option::is_none")]
-	    pub wrong_funding: Option<String>,
+	    pub wrong_funding: Option<Outpoint>,
 	    #[serde(alias = "force_lease_closed", skip_serializing_if = "Option::is_none")]
 	    pub force_lease_closed: Option<bool>,
 	    #[serde(alias = "feerange", skip_serializing_if = "Option::is_none")]

diff --git a/doc/lightning-close.7.md b/doc/lightning-close.7.md
@@ -50,7 +50,7 @@ we quickly accept the peer's proposal.
 
 The default is "50%".
 
-*wrong_funding_txid* can only be specified if both sides have offered
+*wrong_funding* can only be specified if both sides have offered
 the "shutdown_wrong_funding" feature (enabled by the
 **experimental-shutdown-wrong-funding** option): it must be a
 transaction id followed by a colon then the output number.  Instead of

diff --git a/doc/schemas/close.request.json b/doc/schemas/close.request.json
@@ -23,7 +23,7 @@
       "description": ""
     },
     "wrong_funding": {
-      "type": "txid",
+      "type": "outpoint",
       "description": ""
     },
     "force_lease_closed": {