fixup: address comments. changes:

- refactor highest_state_for_peer and has_active_requests for better readabiliy
- refactor ordering logic OutboundJITChannelState

Author: martinsaposnic

lightning-liquidity/src/lsps1/service.rs

@@ -176,13 +176,11 @@ where
 
 	pub(crate) fn has_active_requests(&self, counterparty_node_id: &PublicKey) -> bool {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
-		if let Some(inner_state_lock) = outer_state_lock.get(counterparty_node_id) {
-			let peer_state = inner_state_lock.lock().unwrap();
+		outer_state_lock.get(counterparty_node_id).map_or(false, |inner| {
+			let inner_state_lock = inner.lock().unwrap();
 			!(peer_state.pending_requests.is_empty()
 				&& peer_state.outbound_channels_by_order_id.is_empty())
-		} else {
-			false
-		}
+		})
 	}
 
 	fn handle_get_info_request(

lightning-liquidity/src/lsps2/service.rs

@@ -107,8 +107,17 @@ struct ForwardPaymentAction(ChannelId, FeePayment);
 #[derive(Debug, PartialEq)]
 struct ForwardHTLCsAction(ChannelId, Vec<InterceptedHTLC>);
 
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub(crate) enum OutboundJITStage {
+	PendingInitialPayment,
+	PendingChannelOpen,
+	PendingPaymentForward,
+	PendingPayment,
+	PaymentForwarded,
+}
+
 /// The different states a requested JIT channel can be in.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub(crate) enum OutboundJITChannelState {
 	/// The JIT channel SCID was created after a buy request, and we are awaiting an initial payment
 	/// of sufficient size to open the channel.
@@ -135,13 +144,19 @@ pub(crate) enum OutboundJITChannelState {
 }
 
 impl OutboundJITChannelState {
-	fn ord_index(&self) -> u8 {
+	pub(crate) fn stage(&self) -> OutboundJITStage {
 		match self {
-			OutboundJITChannelState::PendingInitialPayment { .. } => 0,
-			OutboundJITChannelState::PendingChannelOpen { .. } => 1,
-			OutboundJITChannelState::PendingPaymentForward { .. } => 2,
-			OutboundJITChannelState::PendingPayment { .. } => 3,
-			OutboundJITChannelState::PaymentForwarded { .. } => 4,
+			OutboundJITChannelState::PendingInitialPayment { .. } => {
+				OutboundJITStage::PendingInitialPayment
+			},
+			OutboundJITChannelState::PendingChannelOpen { .. } => {
+				OutboundJITStage::PendingChannelOpen
+			},
+			OutboundJITChannelState::PendingPaymentForward { .. } => {
+				OutboundJITStage::PendingPaymentForward
+			},
+			OutboundJITChannelState::PendingPayment { .. } => OutboundJITStage::PendingPayment,
+			OutboundJITChannelState::PaymentForwarded { .. } => OutboundJITStage::PaymentForwarded,
 		}
 	}
 }
@@ -154,7 +169,7 @@ impl PartialOrd for OutboundJITChannelState {
 
 impl Ord for OutboundJITChannelState {
 	fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-		self.ord_index().cmp(&other.ord_index())
+		self.stage().cmp(&other.stage())
 	}
 }
 
@@ -600,12 +615,10 @@ where
 		&self, counterparty_node_id: &PublicKey,
 	) -> Option<OutboundJITChannelState> {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
-		if let Some(inner_state_lock) = outer_state_lock.get(counterparty_node_id) {
-			let peer_state = inner_state_lock.lock().unwrap();
+		outer_state_lock.get(counterparty_node_id).and_then(|inner| {
+			let peer_state = inner.lock().unwrap();
 			peer_state.outbound_channels_by_intercept_scid.values().map(|c| c.state.clone()).max()
-		} else {
-			None
-		}
+		})
 	}
 
 	/// Used by LSP to inform a client requesting a JIT Channel the token they used is invalid.

lightning-liquidity/src/lsps5/service.rs

@@ -22,7 +22,7 @@ use crate::prelude::*;
 use crate::sync::{Arc, Mutex};
 use crate::utils::time::TimeProvider;
 
-use crate::lsps2::service::OutboundJITChannelState;
+use crate::lsps2::service::{OutboundJITChannelState, OutboundJITStage};
 use bitcoin::secp256k1::PublicKey;
 
 use lightning::ln::channelmanager::AChannelManager;
@@ -162,15 +162,7 @@ where
 	) -> bool {
 		self.client_has_open_channel(client_id)
 			|| lsps1_has_activity
-			|| lsps2_max_state.map_or(false, |s| {
-				matches!(
-					s,
-					OutboundJITChannelState::PendingChannelOpen { .. }
-						| OutboundJITChannelState::PendingPaymentForward { .. }
-						| OutboundJITChannelState::PendingPayment { .. }
-						| OutboundJITChannelState::PaymentForwarded { .. }
-				)
-			})
+			|| lsps2_max_state.map_or(false, |s| s.stage() >= OutboundJITStage::PendingChannelOpen)
 	}
 
 	fn check_prune_stale_webhooks(&self) {