f allow assert_no_commitment_advancement to take a message

Author: dunxen

lightning/src/ln/channel.rs

@@ -3954,11 +3954,12 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	}
 
 	/// Asserts that the commitment tx numbers have not advanced from their initial number.
-	fn assert_no_commitment_advancement(&self) {
+	fn assert_no_commitment_advancement(&self, msg_name: &str) {
 		if self.commitment_secrets.get_min_seen_secret() != (1 << 48) ||
 				self.cur_counterparty_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
 				self.holder_commitment_point.transaction_number() != INITIAL_COMMITMENT_NUMBER {
-			debug_assert!(false, "Should not have advanced channel commitment tx numbers prior to funding_created");
+			debug_assert!(false, "Should not have advanced channel commitment tx numbers prior to {}",
+				msg_name);
 		}
 	}
 
@@ -4001,11 +4002,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			if flags == (NegotiatingFundingFlags::OUR_INIT_SENT | NegotiatingFundingFlags::THEIR_INIT_SENT)) {
 			panic!("Tried to get a funding_created messsage at a time other than immediately after initial handshake completion (or tried to get funding_created twice)");
 		}
-		if self.commitment_secrets.get_min_seen_secret() != (1 << 48) ||
-				self.cur_counterparty_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
-				self.holder_commitment_point.transaction_number() != INITIAL_COMMITMENT_NUMBER {
-			panic!("Should not have advanced channel commitment tx numbers prior to initial commitment_signed");
-		}
+		self.assert_no_commitment_advancement("initial commitment_signed");
 
 		let signature = match self.get_initial_counterparty_commitment_signature(logger) {
 			Ok(res) => res,
@@ -4938,7 +4935,7 @@ impl<SP: Deref> Channel<SP> where
 					ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
 				)));
 		}
-		self.context.assert_no_commitment_advancement();
+		self.context.assert_no_commitment_advancement("initial commitment_signed");
 
 		let (channel_monitor, _) = self.initial_commitment_signed(
 			self.context.channel_id(), msg.signature,
@@ -8262,7 +8259,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 		) {
 			panic!("Tried to get a funding_created messsage at a time other than immediately after initial handshake completion (or tried to get funding_created twice)");
 		}
-		self.context.assert_no_commitment_advancement();
+		self.context.assert_no_commitment_advancement("funding_created");
 
 		self.context.channel_transaction_parameters.funding_outpoint = Some(funding_txo);
 		self.context.holder_signer.as_mut().provide_channel_parameters(&self.context.channel_transaction_parameters);
@@ -8387,7 +8384,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 		if !matches!(self.context.channel_state, ChannelState::FundingNegotiated) {
 			return Err((self, ChannelError::close("Received funding_signed in strange state!".to_owned())));
 		}
-		self.context.assert_no_commitment_advancement();
+		self.context.assert_no_commitment_advancement("funding_created");
 
 		let (channel_monitor, _) = match self.initial_commitment_signed(
 			self.context.channel_id(),
@@ -8601,7 +8598,7 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 			// channel.
 			return Err((self, ChannelError::close("Received funding_created after we got the channel!".to_owned())));
 		}
-		self.context.assert_no_commitment_advancement();
+		self.context.assert_no_commitment_advancement("funding_created");
 
 		let funding_txo = OutPoint { txid: msg.funding_txid, index: msg.funding_output_index };
 		self.context.channel_transaction_parameters.funding_outpoint = Some(funding_txo);