Remove unused contributed_inputs_and_outputs methods

Now that splice_funding_failed_for! derives inputs and outputs from
FundingContribution directly, remove the into_contributed_inputs_and_outputs
and to_contributed_inputs_and_outputs methods that were only used by
the old macro. Also remove the unused NegotiationError struct and
into_negotiation_error methods from the interactive tx types.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jkczyz

lightning/src/ln/channel.rs

@@ -6563,24 +6563,13 @@ impl FundingNegotiationContext {
 		}
 	}
 
-	fn into_contributed_inputs_and_outputs(self) -> (Vec<bitcoin::OutPoint>, Vec<TxOut>) {
-		let contributed_inputs =
-			self.our_funding_inputs.into_iter().map(|input| input.utxo.outpoint).collect();
-		let contributed_outputs = self.our_funding_outputs;
-		(contributed_inputs, contributed_outputs)
-	}
-
 	fn contributed_inputs(&self) -> impl Iterator<Item = bitcoin::OutPoint> + '_ {
 		self.our_funding_inputs.iter().map(|input| input.utxo.outpoint)
 	}
 
 	fn contributed_outputs(&self) -> impl Iterator<Item = &TxOut> + '_ {
 		self.our_funding_outputs.iter()
 	}
-
-	fn to_contributed_inputs_and_outputs(&self) -> (Vec<bitcoin::OutPoint>, Vec<TxOut>) {
-		(self.contributed_inputs().collect(), self.contributed_outputs().cloned().collect())
-	}
 }
 
 // Holder designates channel data owned for the benefit of the user client.

lightning/src/ln/interactivetxs.rs

@@ -90,13 +90,6 @@ impl SerialIdExt for SerialId {
 	}
 }
 
-#[derive(Clone, Debug)]
-pub(crate) struct NegotiationError {
-	pub reason: AbortReason,
-	pub contributed_inputs: Vec<BitcoinOutPoint>,
-	pub contributed_outputs: Vec<TxOut>,
-}
-
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub(crate) enum AbortReason {
 	InvalidStateTransition,
@@ -370,11 +363,6 @@ impl ConstructedTransaction {
 		Ok(tx)
 	}
 
-	fn into_negotiation_error(self, reason: AbortReason) -> NegotiationError {
-		let (contributed_inputs, contributed_outputs) = self.into_contributed_inputs_and_outputs();
-		NegotiationError { reason, contributed_inputs, contributed_outputs }
-	}
-
 	fn contributed_inputs(&self) -> impl Iterator<Item = BitcoinOutPoint> + '_ {
 		self.tx
 			.input
@@ -401,40 +389,6 @@ impl ConstructedTransaction {
 			.map(|(_, (txout, _))| txout)
 	}
 
-	fn to_contributed_inputs_and_outputs(&self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		(self.contributed_inputs().collect(), self.contributed_outputs().cloned().collect())
-	}
-
-	fn into_contributed_inputs_and_outputs(self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		let contributed_inputs = self
-			.tx
-			.input
-			.into_iter()
-			.zip(self.input_metadata.iter())
-			.enumerate()
-			.filter(|(_, (_, input))| input.is_local(self.holder_is_initiator))
-			.filter(|(index, _)| {
-				self.shared_input_index
-					.map(|shared_index| *index != shared_index as usize)
-					.unwrap_or(true)
-			})
-			.map(|(_, (txin, _))| txin.previous_output)
-			.collect();
-
-		let contributed_outputs = self
-			.tx
-			.output
-			.into_iter()
-			.zip(self.output_metadata.iter())
-			.enumerate()
-			.filter(|(_, (_, output))| output.is_local(self.holder_is_initiator))
-			.filter(|(index, _)| *index != self.shared_output_index as usize)
-			.map(|(_, (txout, _))| txout)
-			.collect();
-
-		(contributed_inputs, contributed_outputs)
-	}
-
 	pub fn tx(&self) -> &Transaction {
 		&self.tx
 	}
@@ -909,25 +863,13 @@ impl InteractiveTxSigningSession {
 		Ok(())
 	}
 
-	pub(crate) fn into_negotiation_error(self, reason: AbortReason) -> NegotiationError {
-		self.unsigned_tx.into_negotiation_error(reason)
-	}
-
 	pub(super) fn contributed_inputs(&self) -> impl Iterator<Item = BitcoinOutPoint> + '_ {
 		self.unsigned_tx.contributed_inputs()
 	}
 
 	pub(super) fn contributed_outputs(&self) -> impl Iterator<Item = &TxOut> + '_ {
 		self.unsigned_tx.contributed_outputs()
 	}
-
-	pub(super) fn to_contributed_inputs_and_outputs(&self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		(self.contributed_inputs().collect(), self.contributed_outputs().cloned().collect())
-	}
-
-	pub(super) fn into_contributed_inputs_and_outputs(self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		self.unsigned_tx.into_contributed_inputs_and_outputs()
-	}
 }
 
 impl_writeable_tlv_based!(InteractiveTxSigningSession, {
@@ -2160,27 +2102,6 @@ impl InteractiveTxConstructor {
 		Self::new(args, false)
 	}
 
-	fn into_negotiation_error(self, reason: AbortReason) -> NegotiationError {
-		let (contributed_inputs, contributed_outputs) = self.into_contributed_inputs_and_outputs();
-		NegotiationError { reason, contributed_inputs, contributed_outputs }
-	}
-
-	pub(super) fn into_contributed_inputs_and_outputs(self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		let contributed_inputs = self
-			.inputs_to_contribute
-			.into_iter()
-			.filter(|(_, input)| !input.is_shared())
-			.map(|(_, input)| input.into_tx_in().previous_output)
-			.collect();
-		let contributed_outputs = self
-			.outputs_to_contribute
-			.into_iter()
-			.filter(|(_, output)| !output.is_shared())
-			.map(|(_, output)| output.into_tx_out())
-			.collect();
-		(contributed_inputs, contributed_outputs)
-	}
-
 	pub(super) fn contributed_inputs(&self) -> impl Iterator<Item = BitcoinOutPoint> + '_ {
 		self.inputs_to_contribute
 			.iter()
@@ -2195,10 +2116,6 @@ impl InteractiveTxConstructor {
 			.map(|(_, output)| output.tx_out())
 	}
 
-	pub(super) fn to_contributed_inputs_and_outputs(&self) -> (Vec<BitcoinOutPoint>, Vec<TxOut>) {
-		(self.contributed_inputs().collect(), self.contributed_outputs().cloned().collect())
-	}
-
 	pub fn is_initiator(&self) -> bool {
 		self.is_initiator
 	}