Use PeerState::{get_order, has_active_requests} instead of map

Previously, we'd directly access the internal `outbound_` map of
`PeerState`. Here we refactor the code to avoid this.

Note this also highlighted a bug in that we currently don't actually
update/persist the order state in `update_order_state`. We don't fix
this here, but just improve isolation for now, as all state update
behavior will be reworked later.

Author: tnull

lightning-liquidity/src/lsps1/peer_state.rs

@@ -16,7 +16,7 @@ use crate::prelude::HashMap;
 
 #[derive(Default)]
 pub(super) struct PeerState {
-	pub(super) outbound_channels_by_order_id: HashMap<LSPS1OrderId, OutboundCRChannel>,
+	outbound_channels_by_order_id: HashMap<LSPS1OrderId, OutboundCRChannel>,
 	pub(super) pending_requests: HashMap<LSPSRequestId, LSPS1Request>,
 }
 
@@ -26,25 +26,32 @@ impl PeerState {
 		created_at: LSPSDateTime, payment_details: LSPS1PaymentInfo,
 	) {
 		let channel = OutboundCRChannel::new(order_params, created_at, payment_details);
-
 		self.outbound_channels_by_order_id.insert(order_id, channel);
 	}
+
+	pub(super) fn get_order<'a>(&'a self, order_id: &LSPS1OrderId) -> Option<&'a ChannelOrder> {
+		self.outbound_channels_by_order_id.get(order_id).map(|channel| &channel.order)
+	}
+
+	pub(super) fn has_active_requests(&self) -> bool {
+		!self.outbound_channels_by_order_id.is_empty()
+	}
 }
 
-pub(super) struct OutboundLSPS1Config {
-	pub(super) order: LSPS1OrderParams,
+pub(super) struct ChannelOrder {
+	pub(super) order_params: LSPS1OrderParams,
 	pub(super) created_at: LSPSDateTime,
-	pub(super) payment: LSPS1PaymentInfo,
+	pub(super) payment_details: LSPS1PaymentInfo,
 }
 
-pub(super) struct OutboundCRChannel {
-	pub(super) config: OutboundLSPS1Config,
+struct OutboundCRChannel {
+	order: ChannelOrder,
 }
 
 impl OutboundCRChannel {
-	pub(super) fn new(
-		order: LSPS1OrderParams, created_at: LSPSDateTime, payment: LSPS1PaymentInfo,
+	fn new(
+		order_params: LSPS1OrderParams, created_at: LSPSDateTime, payment_details: LSPS1PaymentInfo,
 	) -> Self {
-		Self { config: OutboundLSPS1Config { order, created_at, payment } }
+		Self { order: ChannelOrder { order_params, created_at, payment_details } }
 	}
 }

lightning-liquidity/src/lsps1/service.rs

@@ -101,7 +101,7 @@ where
 		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_order_id.is_empty()
+			peer_state.has_active_requests()
 		})
 	}
 
@@ -275,29 +275,26 @@ where
 
 		match outer_state_lock.get(&counterparty_node_id) {
 			Some(inner_state_lock) => {
-				let mut peer_state_lock = inner_state_lock.lock().unwrap();
-
-				if let Some(outbound_channel) =
-					peer_state_lock.outbound_channels_by_order_id.get_mut(&order_id)
-				{
-					let config = &outbound_channel.config;
-
-					let response = LSPS1Response::GetOrder(LSPS1CreateOrderResponse {
-						order_id,
-						order: config.order.clone(),
-						order_state,
-						created_at: config.created_at.clone(),
-						payment: config.payment.clone(),
-						channel,
-					});
-					let msg = LSPS1Message::Response(request_id, response).into();
-					message_queue_notifier.enqueue(&counterparty_node_id, msg);
-					Ok(())
-				} else {
-					Err(APIError::APIMisuseError {
+				let peer_state_lock = inner_state_lock.lock().unwrap();
+				let order =
+					peer_state_lock.get_order(&order_id).ok_or(APIError::APIMisuseError {
 						err: format!("Channel with order_id {} not found", order_id.0),
-					})
-				}
+					})?;
+
+				// FIXME: we need to actually remember the order state (and eventually persist it)
+				// here.
+
+				let response = LSPS1Response::GetOrder(LSPS1CreateOrderResponse {
+					order_id,
+					order: order.order_params.clone(),
+					order_state,
+					created_at: order.created_at.clone(),
+					payment: order.payment_details.clone(),
+					channel,
+				});
+				let msg = LSPS1Message::Response(request_id, response).into();
+				message_queue_notifier.enqueue(&counterparty_node_id, msg);
+				Ok(())
 			},
 			None => Err(APIError::APIMisuseError {
 				err: format!("No existing state with counterparty {}", counterparty_node_id),