f use bool for monitor_pending_tx_signatures

Author: dunxen

lightning/src/ln/channel.rs

@@ -2314,7 +2314,7 @@ where
 	monitor_pending_failures: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
 	monitor_pending_finalized_fulfills: Vec<HTLCSource>,
 	monitor_pending_update_adds: Vec<msgs::UpdateAddHTLC>,
-	monitor_pending_tx_signatures: Option<msgs::TxSignatures>,
+	monitor_pending_tx_signatures: bool,
 
 	/// If we went to send a revoke_and_ack but our signer was unable to give us a signature,
 	/// we should retry at some point in the future when the signer indicates it may have a
@@ -3280,7 +3280,7 @@ where
 			monitor_pending_failures: Vec::new(),
 			monitor_pending_finalized_fulfills: Vec::new(),
 			monitor_pending_update_adds: Vec::new(),
-			monitor_pending_tx_signatures: None,
+			monitor_pending_tx_signatures: false,
 
 			signer_pending_revoke_and_ack: false,
 			signer_pending_commitment_update: false,
@@ -3521,7 +3521,7 @@ where
 			monitor_pending_failures: Vec::new(),
 			monitor_pending_finalized_fulfills: Vec::new(),
 			monitor_pending_update_adds: Vec::new(),
-			monitor_pending_tx_signatures: None,
+			monitor_pending_tx_signatures: false,
 
 			signer_pending_revoke_and_ack: false,
 			signer_pending_commitment_update: false,
@@ -6715,12 +6715,12 @@ where
 
 		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
 
-		if let Some(tx_signatures) = self.interactive_tx_signing_session.as_mut().and_then(
+		if self.interactive_tx_signing_session.as_mut().map(
 			|session| session.received_commitment_signed()
-		) {
+		).unwrap_or(false) {
 			// We're up first for submitting our tx_signatures, but our monitor has not persisted yet
 			// so they'll be sent as soon as that's done.
-			self.context.monitor_pending_tx_signatures = Some(tx_signatures);
+			self.context.monitor_pending_tx_signatures = true;
 		}
 
 		Ok(channel_monitor)
@@ -6804,13 +6804,13 @@ where
 			channel_id: Some(self.context.channel_id()),
 		};
 
-		let tx_signatures = self
+		let tx_signatures_available = self
 			.interactive_tx_signing_session
 			.as_mut()
 			.expect("Signing session must exist for negotiated pending splice")
 			.received_commitment_signed();
 		self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new());
-		self.context.monitor_pending_tx_signatures = tx_signatures;
+		self.context.monitor_pending_tx_signatures = tx_signatures_available;
 
 		Ok(self.push_ret_blockable_mon_update(monitor_update))
 	}
@@ -7646,7 +7646,7 @@ where
 			{
 				if self.is_awaiting_initial_mon_persist() {
 					log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
-					self.context.monitor_pending_tx_signatures = Some(holder_tx_signatures);
+					self.context.monitor_pending_tx_signatures = true;
 					return Ok(None);
 				}
 				return Ok(Some(holder_tx_signatures));
@@ -7730,7 +7730,7 @@ where
 			// and sets it as pending.
 			if holder_tx_signatures_opt.is_some() && self.is_awaiting_initial_mon_persist() {
 				log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
-				self.context.monitor_pending_tx_signatures = holder_tx_signatures_opt;
+				self.context.monitor_pending_tx_signatures = true;
 				return Ok((None, None));
 			}
 
@@ -7989,14 +7989,16 @@ where
 		// For channels established with V2 establishment we won't send a `tx_signatures` when we're in
 		// MonitorUpdateInProgress (and we assume the user will never directly broadcast the funding
 		// transaction and waits for us to do it).
-		let tx_signatures = self.context.monitor_pending_tx_signatures.take();
-		if tx_signatures.is_some() {
+		let tx_signatures_ready = self.context.monitor_pending_tx_signatures;
+		self.context.monitor_pending_tx_signatures = false;
+		let tx_signatures = if tx_signatures_ready {
 			if self.context.channel_state.is_their_tx_signatures_sent() {
 				self.context.channel_state = ChannelState::AwaitingChannelReady(AwaitingChannelReadyFlags::new());
 			} else {
 				self.context.channel_state.set_our_tx_signatures_ready();
 			}
-		}
+			self.interactive_tx_signing_session.as_ref().and_then(|session| session.holder_tx_signatures().clone())
+		} else { None };
 
 		if self.context.channel_state.is_peer_disconnected() {
 			self.context.monitor_pending_revoke_and_ack = false;
@@ -8498,10 +8500,10 @@ where
 							if self.context.channel_state.is_monitor_update_in_progress() {
 								// The `monitor_pending_tx_signatures` field should have already been set in `commitment_signed_initial_v2`
 								// if we were up first for signing and had a monitor update in progress, but check again just in case.
-								debug_assert!(self.context.monitor_pending_tx_signatures.is_some(), "monitor_pending_tx_signatures should already be set");
+								debug_assert!(self.context.monitor_pending_tx_signatures, "monitor_pending_tx_signatures should already be set");
 								log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
-								if self.context.monitor_pending_tx_signatures.is_none() {
-									self.context.monitor_pending_tx_signatures = session.holder_tx_signatures().clone();
+								if !self.context.monitor_pending_tx_signatures {
+									self.context.monitor_pending_tx_signatures = session.holder_tx_signatures().is_some();
 								}
 								None
 							} else {
@@ -13226,7 +13228,7 @@ where
 				monitor_pending_failures,
 				monitor_pending_finalized_fulfills: monitor_pending_finalized_fulfills.unwrap(),
 				monitor_pending_update_adds: monitor_pending_update_adds.unwrap_or_default(),
-				monitor_pending_tx_signatures: None,
+				monitor_pending_tx_signatures: false,
 
 				signer_pending_revoke_and_ack: false,
 				signer_pending_commitment_update: false,

lightning/src/ln/interactivetxs.rs

@@ -344,13 +344,9 @@ impl InteractiveTxSigningSession {
 		&self.holder_tx_signatures
 	}
 
-	pub fn received_commitment_signed(&mut self) -> Option<TxSignatures> {
+	pub fn received_commitment_signed(&mut self) -> bool {
 		self.has_received_commitment_signed = true;
-		if self.holder_sends_tx_signatures_first {
-			self.holder_tx_signatures.clone()
-		} else {
-			None
-		}
+		self.holder_sends_tx_signatures_first && self.holder_tx_signatures.is_some()
 	}
 
 	/// Handles a `tx_signatures` message received from the counterparty.