fix Simplify error handling, no parameters, reuse PrevTxOutInvalid

Author: optout21

lightning/src/ln/channel.rs

@@ -9930,6 +9930,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 		};
 		let dual_funding_context = DualFundingChannelContext {
 			our_funding_satoshis: funding_satoshis,
+			// TODO(dual_funding) TODO(splicing) Include counterparty contribution, once that's enabled
 			their_funding_satoshis: None,
 			funding_tx_locktime,
 			funding_feerate_sat_per_1000_weight,

lightning/src/ln/interactivetxs.rs

@@ -91,6 +91,12 @@ pub(crate) enum AbortReason {
 	IncorrectSerialIdParity,
 	SerialIdUnknown,
 	DuplicateSerialId,
+	/// Invalid provided inputs and previous transactions, several possible reasons:
+	/// - nonexisting `vout`, or
+	/// - mismatching `TxId`'s
+	/// - duplicate input,
+	/// - not a witness program,
+	/// etc.
 	PrevTxOutInvalid,
 	ExceededMaximumSatsAllowed,
 	ExceededNumberOfInputsOrOutputs,
@@ -108,10 +114,6 @@ pub(crate) enum AbortReason {
 	/// if funding output is provided by the peer this is an interop error,
 	/// if provided by the same node than internal input consistency error.
 	InvalidLowFundingOutputValue,
-	/// TxId mismatch in the provided inputs and previous transactions, input index in data
-	ProvidedInputsAndPrevtxsTxIdMismatch(u32),
-	/// A vout provided in an input is not found in the matching previous transaction, input index in data
-	ProvidedInputsAndPrevtxsVoutNotFound(u32),
 	/// Internal error, error while getting destination script
 	InternalErrorGettingDestinationScript,
 }
@@ -124,57 +126,39 @@ impl AbortReason {
 
 impl Display for AbortReason {
 	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		match self {
-			AbortReason::InvalidStateTransition => f.write_str("State transition was invalid"),
-			AbortReason::UnexpectedCounterpartyMessage => f.write_str("Unexpected message"),
-			AbortReason::ReceivedTooManyTxAddInputs => {
-				f.write_str("Too many `tx_add_input`s received")
-			},
-			AbortReason::ReceivedTooManyTxAddOutputs => {
-				f.write_str("Too many `tx_add_output`s received")
-			},
+		f.write_str(match self {
+			AbortReason::InvalidStateTransition => "State transition was invalid",
+			AbortReason::UnexpectedCounterpartyMessage => "Unexpected message",
+			AbortReason::ReceivedTooManyTxAddInputs => "Too many `tx_add_input`s received",
+			AbortReason::ReceivedTooManyTxAddOutputs => "Too many `tx_add_output`s received",
 			AbortReason::IncorrectInputSequenceValue => {
-				f.write_str("Input has a sequence value greater than 0xFFFFFFFD")
+				"Input has a sequence value greater than 0xFFFFFFFD"
 			},
-			AbortReason::IncorrectSerialIdParity => {
-				f.write_str("Parity for `serial_id` was incorrect")
-			},
-			AbortReason::SerialIdUnknown => f.write_str("The `serial_id` is unknown"),
-			AbortReason::DuplicateSerialId => f.write_str("The `serial_id` already exists"),
-			AbortReason::PrevTxOutInvalid => f.write_str("Invalid previous transaction output"),
+			AbortReason::IncorrectSerialIdParity => "Parity for `serial_id` was incorrect",
+			AbortReason::SerialIdUnknown => "The `serial_id` is unknown",
+			AbortReason::DuplicateSerialId => "The `serial_id` already exists",
+			AbortReason::PrevTxOutInvalid => "Invalid previous transaction output",
 			AbortReason::ExceededMaximumSatsAllowed => {
-				f.write_str("Output amount exceeded total bitcoin supply")
-			},
-			AbortReason::ExceededNumberOfInputsOrOutputs => {
-				f.write_str("Too many inputs or outputs")
+				"Output amount exceeded total bitcoin supply"
 			},
-			AbortReason::TransactionTooLarge => f.write_str("Transaction weight is too large"),
-			AbortReason::BelowDustLimit => f.write_str("Output amount is below the dust limit"),
-			AbortReason::InvalidOutputScript => f.write_str("The output script is non-standard"),
-			AbortReason::InsufficientFees => f.write_str("Insufficient fees paid"),
+			AbortReason::ExceededNumberOfInputsOrOutputs => "Too many inputs or outputs",
+			AbortReason::TransactionTooLarge => "Transaction weight is too large",
+			AbortReason::BelowDustLimit => "Output amount is below the dust limit",
+			AbortReason::InvalidOutputScript => "The output script is non-standard",
+			AbortReason::InsufficientFees => "Insufficient fees paid",
 			AbortReason::OutputsValueExceedsInputsValue => {
-				f.write_str("Total value of outputs exceeds total value of inputs")
+				"Total value of outputs exceeds total value of inputs"
 			},
-			AbortReason::InvalidTx => f.write_str("The transaction is invalid"),
-			AbortReason::MissingFundingOutput => f.write_str("No shared funding output found"),
-			AbortReason::DuplicateFundingOutput => {
-				f.write_str("More than one funding output found")
+			AbortReason::InvalidTx => "The transaction is invalid",
+			AbortReason::MissingFundingOutput => "No shared funding output found",
+			AbortReason::DuplicateFundingOutput => "More than one funding output found",
+			AbortReason::InvalidLowFundingOutputValue => {
+				"Local part of funding output value is greater than the funding output value"
 			},
-			AbortReason::InvalidLowFundingOutputValue => f.write_str(
-				"Local part of funding output value is greater than the funding output value",
-			),
-			AbortReason::ProvidedInputsAndPrevtxsTxIdMismatch(idx) => f.write_fmt(format_args!(
-				"TxId mismatch in the provided inputs and previous transactions, input index {}",
-				idx
-			)),
-			AbortReason::ProvidedInputsAndPrevtxsVoutNotFound(idx) => f.write_fmt(format_args!(
-				"Vout provided in an input is not found in the previous transaction, input index {}",
-				idx
-			)),
 			AbortReason::InternalErrorGettingDestinationScript => {
-				f.write_str("Internal error getting destination script")
+				"Internal error getting destination script"
 			},
-		}
+		})
 	}
 }
 
@@ -1765,15 +1749,15 @@ fn txouts_from_input_prev_txs(
 ) -> Result<Vec<&TxOut>, AbortReason> {
 	let mut prev_outputs: Vec<&TxOut> = Vec::with_capacity(inputs.len());
 	// Check that vouts exist for each TxIn in provided transactions.
-	for (idx, (txin, tx)) in inputs.iter().enumerate() {
+	for (txin, tx) in inputs.iter() {
 		let txid = tx.as_transaction().compute_txid();
 		if txin.previous_output.txid != txid {
-			return Err(AbortReason::ProvidedInputsAndPrevtxsTxIdMismatch(idx as u32));
+			return Err(AbortReason::PrevTxOutInvalid);
 		}
 		if let Some(output) = tx.as_transaction().output.get(txin.previous_output.vout as usize) {
 			prev_outputs.push(output);
 		} else {
-			return Err(AbortReason::ProvidedInputsAndPrevtxsVoutNotFound(idx as u32));
+			return Err(AbortReason::PrevTxOutInvalid);
 		}
 	}
 	Ok(prev_outputs)