fix Simplify AbortReason string conversion

Author: optout21

lightning/src/ln/interactivetxs.rs

@@ -125,6 +125,44 @@ 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")
+			},
+			AbortReason::IncorrectInputSequenceValue => {
+				f.write_str("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::ExceededMaximumSatsAllowed => {
+				f.write_str("Output amount exceeded total bitcoin supply")
+			},
+			AbortReason::ExceededNumberOfInputsOrOutputs => {
+				f.write_str("Too many inputs or outputs")
+			},
+			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::OutputsValueExceedsInputsValue => {
+				f.write_str("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::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
@@ -133,40 +171,9 @@ impl Display for AbortReason {
 				"Vout provided in an input is not found in the previous transaction, input index {}",
 				idx
 			)),
-			_ => 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 => {
-					"Input has a sequence value greater than 0xFFFFFFFD".into()
-				},
-				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 => {
-					"Output amount exceeded total bitcoin supply".into()
-				},
-				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 => {
-					"Total value of outputs exceeds total value of inputs".into()
-				},
-				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::InternalErrorGettingDestinationScript => {
-					"Internal error getting destination script"
-				},
-				_ => unreachable!(),
-			}),
+			AbortReason::InternalErrorGettingDestinationScript => {
+				f.write_str("Internal error getting destination script")
+			},
 		}
 	}
 }