fix Minor changes, removed check, etc

Author: optout21

lightning/src/ln/channel.rs

@@ -2199,6 +2199,7 @@ impl FundingScope {
 		let post_value_to_self_msat = post_value_to_self_msat_signed as u64;
 
 		let prev_funding_txid = prev_funding.get_funding_txid();
+		// Update the splicing 'tweak', this will rotate the keys in the signer
 		let holder_pubkeys = match &context.holder_signer {
 			ChannelSignerType::Ecdsa(ecdsa) => ecdsa.pubkeys(prev_funding_txid, &context.secp_ctx),
 			// TODO (taproot|arik)
@@ -2217,7 +2218,6 @@ impl FundingScope {
 			channel_type_features: channel_parameters.channel_type_features.clone(),
 			channel_value_satoshis: post_channel_value,
 		};
-		// Update the splicing 'tweak', this will rotate the keys in the signer
 		if let Some(ref mut counterparty_parameters) =
 			post_channel_transaction_parameters.counterparty_parameters
 		{
@@ -2880,6 +2880,8 @@ where
 	SP::Target: SignerProvider,
 {
 	context: &'a mut ChannelContext<SP>,
+	/// The funding scope being (re)negotiated.
+	/// In case of splicing it is the new spliced scope.
 	funding: &'a mut FundingScope,
 	funding_negotiation_context: &'a mut FundingNegotiationContext,
 	interactive_tx_constructor: &'a mut Option<InteractiveTxConstructor>,
@@ -3129,8 +3131,6 @@ where
 		let commitment_signed = self.context.get_initial_commitment_signed(&self.funding, logger);
 		let commitment_signed = match commitment_signed {
 			Ok(commitment_signed) => {
-				self.funding
-					.funding_transaction = Some(signing_session.unsigned_tx().build_unsigned_tx());
 				commitment_signed
 			},
 			Err(err) => {
@@ -6226,29 +6226,18 @@ where
 	#[cfg(splicing)]
 	fn as_renegotiating_channel(&mut self) -> Result<NegotiatingChannelView<SP>, &'static str> {
 		if let Some(ref mut pending_splice) = &mut self.pending_splice {
-			if let Some(ref mut funding) = &mut pending_splice.funding {
-				if pending_splice.funding_negotiation_context.our_funding_satoshis != 0
-					|| pending_splice
-						.funding_negotiation_context
-						.their_funding_satoshis
-						.unwrap_or_default() != 0
-				{
-					Ok(NegotiatingChannelView {
-						context: &mut self.context,
-						funding,
-						funding_negotiation_context: &mut pending_splice
-							.funding_negotiation_context,
-						interactive_tx_constructor: &mut pending_splice.interactive_tx_constructor,
-						interactive_tx_signing_session: &mut pending_splice
-							.interactive_tx_signing_session,
-						holder_commitment_transaction_number: self
-							.holder_commitment_point
-							.transaction_number(),
-					})
-				} else {
-					Err("Received unexpected interactive transaction negotiation message: \
-						the channel is splicing, but splice_init/splice_ack has not been exchanged yet")
-				}
+			if let Some(ref mut funding) = &mut pending_splice.funding_scope {
+				Ok(NegotiatingChannelView {
+					context: &mut self.context,
+					funding,
+					funding_negotiation_context: &mut pending_splice.funding_negotiation_context,
+					interactive_tx_constructor: &mut pending_splice.interactive_tx_constructor,
+					interactive_tx_signing_session: &mut pending_splice
+						.interactive_tx_signing_session,
+					holder_commitment_transaction_number: self
+						.holder_commitment_point
+						.transaction_number(),
+				})
 			} else {
 				Err("Received unexpected interactive transaction negotiation message: \
 					the channel is splicing, but splice_init/splice_ack has not been exchanged yet")
@@ -10478,9 +10467,9 @@ where
 		// Convert inputs
 		let mut funding_inputs = Vec::new();
 		for (tx_in, tx, _w) in our_funding_inputs.into_iter() {
-			let tx16 = TransactionU16LenLimited::new(tx.clone())
+			let tx16 = TransactionU16LenLimited::new(tx)
 				.map_err(|_e| APIError::APIMisuseError { err: format!("Too large transaction") })?;
-			funding_inputs.push((tx_in.clone(), tx16));
+			funding_inputs.push((tx_in, tx16));
 		}
 
 		let funding_negotiation_context = FundingNegotiationContext {

lightning/src/ln/channelmanager.rs

@@ -4525,7 +4525,7 @@ where
 		let mut res = Ok(());
 		PersistenceNotifierGuard::optionally_notify(self, || {
 			let result = self.internal_splice_channel(
-				channel_id, counterparty_node_id, our_funding_contribution_satoshis, our_funding_inputs.clone(), funding_feerate_per_kw, locktime
+				channel_id, counterparty_node_id, our_funding_contribution_satoshis, our_funding_inputs, funding_feerate_per_kw, locktime
 			);
 			res = result;
 			match res {
@@ -10163,11 +10163,11 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				), msg.channel_id)),
 			hash_map::Entry::Occupied(mut chan_entry) => {
 				if let Some(ref mut funded_channel) = chan_entry.get_mut().as_funded_mut() {
-					let tx_msg_opt = try_channel_entry!(self, peer_state,
-						funded_channel.splice_ack(
-							msg, &self.signer_provider, &self.entropy_source,
-							&self.get_our_node_id(), &self.logger
-						), chan_entry);
+					let splice_ack_res = funded_channel.splice_ack(
+						msg, &self.signer_provider, &self.entropy_source,
+						&self.get_our_node_id(), &self.logger
+					);
+					let tx_msg_opt = try_channel_entry!(self, peer_state, splice_ack_res, chan_entry);
 					if let Some(tx_msg) = tx_msg_opt {
 						peer_state.pending_msg_events.push(tx_msg.into_msg_send_event(counterparty_node_id.clone()));
 					}