f - move SpliceContribution

Author: jkczyz

lightning/src/ln/channel.rs

@@ -52,15 +52,15 @@ use crate::ln::channel_state::{
 	ChannelShutdownState, CounterpartyForwardingInfo, InboundHTLCDetails, InboundHTLCStateDetails,
 	OutboundHTLCDetails, OutboundHTLCStateDetails,
 };
-#[cfg(splicing)]
-use crate::ln::channelmanager::SpliceContribution;
 use crate::ln::channelmanager::{
 	self, FundingConfirmedMessage, HTLCFailureMsg, HTLCSource, OpenChannelMessage,
 	PaymentClaimDetails, PendingHTLCInfo, PendingHTLCStatus, RAACommitmentOrder, SentHTLCId,
 	BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA,
 };
 use crate::ln::funding::FundingTxInput;
 #[cfg(splicing)]
+use crate::ln::funding::SpliceContribution;
+#[cfg(splicing)]
 use crate::ln::interactivetxs::{
 	calculate_change_output_value, AbortReason, InteractiveTxMessageSend,
 };

lightning/src/ln/channelmanager.rs

@@ -31,8 +31,6 @@ use bitcoin::hashes::{Hash, HashEngine, HmacEngine};
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1::{PublicKey, SecretKey};
 use bitcoin::{secp256k1, Sequence, SignedAmount};
-#[cfg(splicing)]
-use bitcoin::{Amount, ScriptBuf};
 
 use crate::blinded_path::message::MessageForwardNode;
 use crate::blinded_path::message::{AsyncPaymentsContext, OffersContext};
@@ -66,7 +64,7 @@ use crate::ln::channel::{
 };
 use crate::ln::channel_state::ChannelDetails;
 #[cfg(splicing)]
-use crate::ln::funding::FundingTxInput;
+use crate::ln::funding::SpliceContribution;
 use crate::ln::inbound_payment;
 use crate::ln::interactivetxs::{HandleTxCompleteResult, InteractiveTxMessageSendResult};
 use crate::ln::msgs;
@@ -202,47 +200,6 @@ pub use crate::ln::outbound_payment::{
 };
 use crate::ln::script::ShutdownScript;
 
-/// The components of a splice's funding transaction that are contributed by one party.
-#[cfg(splicing)]
-pub enum SpliceContribution {
-	/// When funds are added to a channel.
-	SpliceIn {
-		/// The amount to contribute to the splice.
-		value: Amount,
-
-		/// The inputs included in the splice's funding transaction to meet the contributed amount.
-		/// Any excess amount will be sent to a change output.
-		inputs: Vec<FundingTxInput>,
-
-		/// An optional change output script. This will be used if needed or, when not set,
-		/// generated using [`SignerProvider::get_destination_script`].
-		change_script: Option<ScriptBuf>,
-	},
-}
-
-#[cfg(splicing)]
-impl SpliceContribution {
-	pub(super) fn value(&self) -> SignedAmount {
-		match self {
-			SpliceContribution::SpliceIn { value, .. } => {
-				value.to_signed().unwrap_or(SignedAmount::MAX)
-			},
-		}
-	}
-
-	pub(super) fn inputs(&self) -> &[FundingTxInput] {
-		match self {
-			SpliceContribution::SpliceIn { inputs, .. } => &inputs[..],
-		}
-	}
-
-	pub(super) fn into_tx_parts(self) -> (Vec<FundingTxInput>, Option<ScriptBuf>) {
-		match self {
-			SpliceContribution::SpliceIn { inputs, change_script, .. } => (inputs, change_script),
-		}
-	}
-}
-
 // We hold various information about HTLC relay in the HTLC objects in Channel itself:
 //
 // Upon receipt of an HTLC from a peer, we'll give it a PendingHTLCStatus indicating if it should

lightning/src/ln/funding.rs

@@ -9,11 +9,54 @@
 
 //! Types pertaining to funding channels.
 
+#[cfg(splicing)]
+use bitcoin::{Amount, ScriptBuf, SignedAmount};
 use bitcoin::{Script, Sequence, Transaction, Weight};
 
 use crate::events::bump_transaction::{Utxo, EMPTY_SCRIPT_SIG_WEIGHT};
 use crate::sign::{P2TR_KEY_PATH_WITNESS_WEIGHT, P2WPKH_WITNESS_WEIGHT};
 
+/// The components of a splice's funding transaction that are contributed by one party.
+#[cfg(splicing)]
+pub enum SpliceContribution {
+	/// When funds are added to a channel.
+	SpliceIn {
+		/// The amount to contribute to the splice.
+		value: Amount,
+
+		/// The inputs included in the splice's funding transaction to meet the contributed amount.
+		/// Any excess amount will be sent to a change output.
+		inputs: Vec<FundingTxInput>,
+
+		/// An optional change output script. This will be used if needed or, when not set,
+		/// generated using [`SignerProvider::get_destination_script`].
+		change_script: Option<ScriptBuf>,
+	},
+}
+
+#[cfg(splicing)]
+impl SpliceContribution {
+	pub(super) fn value(&self) -> SignedAmount {
+		match self {
+			SpliceContribution::SpliceIn { value, .. } => {
+				value.to_signed().unwrap_or(SignedAmount::MAX)
+			},
+		}
+	}
+
+	pub(super) fn inputs(&self) -> &[FundingTxInput] {
+		match self {
+			SpliceContribution::SpliceIn { inputs, .. } => &inputs[..],
+		}
+	}
+
+	pub(super) fn into_tx_parts(self) -> (Vec<FundingTxInput>, Option<ScriptBuf>) {
+		match self {
+			SpliceContribution::SpliceIn { inputs, change_script, .. } => (inputs, change_script),
+		}
+	}
+}
+
 /// An input to contribute to a channel's funding transaction either when using the v2 channel
 /// establishment protocol or when splicing.
 #[derive(Clone)]

lightning/src/ln/splicing_tests.rs

@@ -7,8 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use crate::ln::channelmanager::SpliceContribution;
 use crate::ln::functional_test_utils::*;
+use crate::ln::funding::SpliceContribution;
 use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, MessageSendEvent};
 use crate::util::errors::APIError;