f make our_funding_inputs an Option

Author: dunxen

lightning/src/ln/channel.rs

@@ -1498,7 +1498,8 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
 			self.dual_funding_context_mut().funding_feerate_sat_per_1000_weight,
 			holder_node_id, self.context().counterparty_node_id, self.is_initiator(),
 			self.dual_funding_context_mut().funding_tx_locktime,
-			self.dual_funding_context_mut().our_funding_inputs.clone(), funding_outputs,
+			self.dual_funding_context_mut().our_funding_inputs.take().unwrap_or_else(|| vec![]),
+			funding_outputs,
 			expected_remote_shared_funding_output,
 		).map_err(|_| APIError::APIMisuseError { err: "Incorrect shared output provided".into() })?;
 
@@ -3898,7 +3899,7 @@ pub(super) struct DualFundingChannelContext {
 	/// Note that the `our_funding_satoshis` field is equal to the total value of `our_funding_inputs`
 	/// minus any fees paid for our contributed weight. This means that change will never be generated
 	/// and the maximum value possible will go towards funding the channel.
-	pub our_funding_inputs: Vec<(TxIn, TransactionU16LenLimited)>,
+	pub our_funding_inputs: Option<Vec<(TxIn, TransactionU16LenLimited)>>,
 }
 
 // Holder designates channel data owned for the benefit of the user client.
@@ -8549,7 +8550,7 @@ impl<SP: Deref> OutboundV2Channel<SP> where SP::Target: SignerProvider {
 				their_funding_satoshis: None,
 				funding_tx_locktime,
 				funding_feerate_sat_per_1000_weight,
-				our_funding_inputs: funding_inputs,
+				our_funding_inputs: Some(funding_inputs),
 			},
 			#[cfg(any(dual_funding, splicing))]
 			interactive_tx_constructor: None,
@@ -8757,7 +8758,7 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 				their_funding_satoshis: Some(msg.common_fields.funding_satoshis),
 				funding_tx_locktime: LockTime::from_consensus(msg.locktime),
 				funding_feerate_sat_per_1000_weight: msg.funding_feerate_sat_per_1000_weight,
-				our_funding_inputs: funding_inputs,
+				our_funding_inputs: Some(funding_inputs),
 			},
 			interactive_tx_constructor: None,
 		};