fix Review: state check fix, internal error text

Author: optout21

lightning/src/ln/channel.rs

@@ -2231,7 +2231,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 	) -> Result<Option<InteractiveTxMessageSend>, AbortReason>
 	where ES::Target: EntropySource
 	{
-		debug_assert!(!matches!(self.context.channel_state, ChannelState::NegotiatingFunding(_)));
+		debug_assert!(matches!(self.context.channel_state, ChannelState::NegotiatingFunding(_)));
 		debug_assert!(self.interactive_tx_constructor.is_none());
 
 		let mut funding_inputs = Vec::new();
@@ -2266,7 +2266,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 			script
 		} else {
 			signer_provider.get_destination_script(self.context.channel_keys_id)
-				.map_err(|_err| AbortReason::InternalErrorGettingDestinationScript)?
+				.map_err(|_err| AbortReason::InternalError("Error getting destination script".to_owned()))?
 		};
 		let change_value_opt = calculate_change_output_value(
 			self.funding.is_outbound(), self.dual_funding_context.our_funding_satoshis,

lightning/src/ln/interactivetxs.rs

@@ -114,8 +114,8 @@ 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,
-	/// Internal error, error while getting destination script
-	InternalErrorGettingDestinationScript,
+	/// Internal error
+	InternalError(String),
 }
 
 impl AbortReason {
@@ -126,39 +126,49 @@ 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",
-			AbortReason::UnexpectedCounterpartyMessage => "Unexpected message",
-			AbortReason::ReceivedTooManyTxAddInputs => "Too many `tx_add_input`s received",
-			AbortReason::ReceivedTooManyTxAddOutputs => "Too many `tx_add_output`s received",
+		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 => {
-				"Input has a sequence value greater than 0xFFFFFFFD"
+				f.write_str("Input has a sequence value greater than 0xFFFFFFFD")
+			},
+			AbortReason::IncorrectSerialIdParity => {
+				f.write_str("Parity for `serial_id` was incorrect")
 			},
-			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::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 => {
-				"Output amount exceeded total bitcoin supply"
+				f.write_str("Output amount exceeded total bitcoin supply")
 			},
-			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::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 => {
-				"Total value of outputs exceeds total value of inputs"
+				f.write_str("Total value of outputs exceeds total value of inputs")
 			},
-			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::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::InternalErrorGettingDestinationScript => {
-				"Internal error getting destination script"
+			AbortReason::InvalidLowFundingOutputValue => f.write_str(
+				"Local part of funding output value is greater than the funding output value",
+			),
+			AbortReason::InternalError(text) => {
+				f.write_fmt(format_args!("Internal error: {}", text))
 			},
-		})
+		}
 	}
 }