fix Optimize AbortReason string conversion

Author: optout21

lightning/src/ln/interactivetxs.rs

@@ -124,46 +124,50 @@ impl AbortReason {
 
 impl Display for AbortReason {
 	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		f.write_str(&match self {
-			AbortReason::InvalidStateTransition => "State transition was invalid".into(),
-			AbortReason::UnexpectedCounterpartyMessage => "Unexpected message".into(),
-			AbortReason::ReceivedTooManyTxAddInputs => "Too many `tx_add_input`s received".into(),
-			AbortReason::ReceivedTooManyTxAddOutputs => "Too many `tx_add_output`s received".into(),
-			AbortReason::IncorrectInputSequenceValue => {
-				"Input has a sequence value greater than 0xFFFFFFFD".into()
-			},
-			AbortReason::IncorrectSerialIdParity => "Parity for `serial_id` was incorrect".into(),
-			AbortReason::SerialIdUnknown => "The `serial_id` is unknown".into(),
-			AbortReason::DuplicateSerialId => "The `serial_id` already exists".into(),
-			AbortReason::PrevTxOutInvalid => "Invalid previous transaction output".into(),
-			AbortReason::ExceededMaximumSatsAllowed => {
-				"Output amount exceeded total bitcoin supply".into()
-			},
-			AbortReason::ExceededNumberOfInputsOrOutputs => "Too many inputs or outputs".into(),
-			AbortReason::TransactionTooLarge => "Transaction weight is too large".into(),
-			AbortReason::BelowDustLimit => "Output amount is below the dust limit".into(),
-			AbortReason::InvalidOutputScript => "The output script is non-standard".into(),
-			AbortReason::InsufficientFees => "Insufficient fees paid".into(),
-			AbortReason::OutputsValueExceedsInputsValue => {
-				"Total value of outputs exceeds total value of inputs".into()
-			},
-			AbortReason::InvalidTx => "The transaction is invalid".into(),
-			AbortReason::MissingFundingOutput => "No shared funding output found".into(),
-			AbortReason::DuplicateFundingOutput => "More than one funding output found".into(),
-			AbortReason::InvalidLowFundingOutputValue => {
-				"Local part of funding output value is greater than the funding output value".into()
-			},
-			AbortReason::ProvidedInputsAndPrevtxsTxIdMismatch(idx) => format!(
+		match self {
+			AbortReason::ProvidedInputsAndPrevtxsTxIdMismatch(idx) => f.write_fmt(format_args!(
 				"TxId mismatch in the provided inputs and previous transactions, input index {}",
 				idx
-			),
-			AbortReason::ProvidedInputsAndPrevtxsVoutNotFound(idx) => format!(
+			)),
+			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 => {
-				"Internal error getting destination script".into()
-			},
-		})
+				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!(),
+			}),
+		}
 	}
 }