Fix lsps1_service builds

As we're not testing with `cfg(lsps1_service)`, the builds broke during
previous refactoring. This isn't bad as we're looking to completely
overhaul / rewrite LSPS1 service soon, but until then we fix this
pre-existing breakage to make sure following changes make sense.

Author: tnull

ci/ci-tests.sh

@@ -132,3 +132,5 @@ RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
 RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
 [ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
 RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
+[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
+RUSTFLAGS="--cfg=lsps1_service" cargo test --verbose --color always -p lightning-liquidity

lightning-liquidity/src/lsps1/service.rs

@@ -15,12 +15,11 @@ use super::msgs::{
 	LSPS1Message, LSPS1Options, LSPS1Request, LSPS1Response, OrderId, OrderParameters, OrderState,
 	PaymentInfo, LSPS1_CREATE_ORDER_REQUEST_ORDER_MISMATCH_ERROR_CODE,
 };
-use super::utils::is_valid;
 use crate::message_queue::MessageQueue;
 
 use crate::events::{Event, EventQueue};
 use crate::lsps0::ser::{ProtocolMessageHandler, RequestId, ResponseError};
-use crate::prelude::{new_hash_map, HashMap, String, ToString};
+use crate::prelude::{new_hash_map, HashMap, String};
 use crate::sync::{Arc, Mutex, RwLock};
 use crate::utils;
 
@@ -306,7 +305,7 @@ where
 		&self, request_id: RequestId, counterparty_node_id: &PublicKey, params: GetOrderRequest,
 	) -> Result<(), LightningError> {
 		let outer_state_lock = self.per_peer_state.read().unwrap();
-		match outer_state_lock.get(&counterparty_node_id) {
+		match outer_state_lock.get(counterparty_node_id) {
 			Some(inner_state_lock) => {
 				let mut peer_state_lock = inner_state_lock.lock().unwrap();
 
@@ -457,3 +456,25 @@ where
 		}
 	}
 }
+
+fn check_range(min: u64, max: u64, value: u64) -> bool {
+	(value >= min) && (value <= max)
+}
+
+fn is_valid(order: &OrderParameters, options: &LSPS1Options) -> bool {
+	let bool = check_range(
+		options.min_initial_client_balance_sat,
+		options.max_initial_client_balance_sat,
+		order.client_balance_sat,
+	) && check_range(
+		options.min_initial_lsp_balance_sat,
+		options.max_initial_lsp_balance_sat,
+		order.lsp_balance_sat,
+	) && check_range(
+		1,
+		options.max_channel_expiry_blocks.into(),
+		order.channel_expiry_blocks.into(),
+	);
+
+	bool
+}

lightning-liquidity/src/manager.rs

@@ -173,7 +173,7 @@ where {
 		#[cfg(lsps1_service)]
 		let lsps1_service_handler = service_config.as_ref().and_then(|config| {
 			if let Some(number) =
-				<LSPS1ServiceHandler<ES> as ProtocolMessageHandler>::PROTOCOL_NUMBER
+				<LSPS1ServiceHandler<ES, CM, C> as ProtocolMessageHandler>::PROTOCOL_NUMBER
 			{
 				supported_protocols.push(number);
 			}