fixup: accept lsps5 requests if lsps2 has an active request in any OutboundJITChannelState

Author: martinsaposnic

lightning-liquidity/src/lsps2/service.rs

@@ -566,20 +566,12 @@ where
 		&self.config
 	}
 
-	/// Returns whether the peer has any opening or open JIT channels.
-	pub(crate) fn has_opening_or_open_jit_channel(&self, counterparty_node_id: &PublicKey) -> bool {
+	/// Returns whether the peer has any active LSPS2 requests.
+	pub(crate) fn has_active_requests(&self, counterparty_node_id: &PublicKey) -> bool {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
 		outer_state_lock.get(counterparty_node_id).map_or(false, |inner| {
 			let peer_state = inner.lock().unwrap();
-			peer_state.outbound_channels_by_intercept_scid.values().any(|chan| {
-				matches!(
-					chan.state,
-					OutboundJITChannelState::PendingChannelOpen { .. }
-						| OutboundJITChannelState::PendingPaymentForward { .. }
-						| OutboundJITChannelState::PendingPayment { .. }
-						| OutboundJITChannelState::PaymentForwarded { .. }
-				)
-			})
+			!peer_state.outbound_channels_by_intercept_scid.is_empty()
 		})
 	}
 

lightning-liquidity/src/lsps5/service.rs

@@ -154,12 +154,9 @@ where
 	/// Prior activity includes an existing open channel, an active LSPS1 flow,
 	/// or an LSPS2 flow that has an opening or open JIT channel.
 	pub(crate) fn can_accept_request(
-		&self, client_id: &PublicKey, lsps2_has_opening_or_open_jit_channel: bool,
-		lsps1_has_activity: bool,
+		&self, client_id: &PublicKey, lsps2_has_active_requests: bool, lsps1_has_activity: bool,
 	) -> bool {
-		self.client_has_open_channel(client_id)
-			|| lsps2_has_opening_or_open_jit_channel
-			|| lsps1_has_activity
+		self.client_has_open_channel(client_id) || lsps2_has_active_requests || lsps1_has_activity
 	}
 
 	fn check_prune_stale_webhooks<'a>(

lightning-liquidity/src/manager.rs

@@ -568,10 +568,10 @@ where
 			LSPSMessage::LSPS5(msg @ LSPS5Message::Request(..)) => {
 				match &self.lsps5_service_handler {
 					Some(lsps5_service_handler) => {
-						let lsps2_has_opening_or_open_jit_channel = self
+						let lsps2_has_active_requests = self
 							.lsps2_service_handler
 							.as_ref()
-							.map_or(false, |h| h.has_opening_or_open_jit_channel(sender_node_id));
+							.map_or(false, |h| h.has_active_requests(sender_node_id));
 						#[cfg(lsps1_service)]
 						let lsps1_has_active_requests = self
 							.lsps1_service_handler
@@ -582,7 +582,7 @@ where
 
 						if !lsps5_service_handler.can_accept_request(
 							sender_node_id,
-							lsps2_has_opening_or_open_jit_channel,
+							lsps2_has_active_requests,
 							lsps1_has_active_requests,
 						) {
 							return Err(LightningError {