f Use MAX_PENDING_REQUESTS_PER_PEER const

Author: tnull

lightning-liquidity/src/lsps2/service.rs

@@ -42,8 +42,7 @@ use crate::lsps2::msgs::{
 	LSPS2_GET_INFO_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE,
 };
 
-/// The default value applied for [`LSPS2ServiceLimits::max_pending_requests_per_peer`].
-pub const DEFAULT_MAX_PENDING_REQUESTS_PER_PEER: usize = 10;
+const MAX_PENDING_REQUESTS_PER_PEER: usize = 10;
 
 /// Server-side configuration options for JIT channels.
 #[derive(Clone, Debug)]
@@ -52,23 +51,6 @@ pub struct LSPS2ServiceConfig {
 	///
 	/// Note: If this changes then old promises given out will be considered invalid.
 	pub promise_secret: [u8; 32],
-	/// Configuration limits for JIT channels.
-	pub service_limits: LSPS2ServiceLimits,
-}
-
-/// Server-side configuration limits for JIT channels.
-#[derive(Clone, Debug)]
-pub struct LSPS2ServiceLimits {
-	/// The maximum number of pending requests we allow on a per-peer basis.
-	///
-	/// Any requests beyond this limit will be ignored.
-	pub max_pending_requests_per_peer: usize,
-}
-
-impl Default for LSPS2ServiceLimits {
-	fn default() -> Self {
-		Self { max_pending_requests_per_peer: DEFAULT_MAX_PENDING_REQUESTS_PER_PEER }
-	}
 }
 
 /// Information about the initial payment size and JIT channel opening fee.
@@ -1010,9 +992,7 @@ where
 				.entry(*counterparty_node_id)
 				.or_insert(Mutex::new(PeerState::new()));
 			let mut peer_state_lock = inner_state_lock.lock().unwrap();
-			if peer_state_lock.pending_requests.len()
-				< self.config.service_limits.max_pending_requests_per_peer
-			{
+			if peer_state_lock.pending_requests.len() < MAX_PENDING_REQUESTS_PER_PEER {
 				peer_state_lock
 					.pending_requests
 					.insert(request_id.clone(), LSPS2Request::GetInfo(params.clone()));
@@ -1035,7 +1015,7 @@ where
 
 				let err = format!(
 					"Peer {} reached maximum number of pending requests: {}",
-					counterparty_node_id, self.config.service_limits.max_pending_requests_per_peer
+					counterparty_node_id, MAX_PENDING_REQUESTS_PER_PEER
 				);
 
 				let result =
@@ -1143,9 +1123,7 @@ where
 				.or_insert(Mutex::new(PeerState::new()));
 			let mut peer_state_lock = inner_state_lock.lock().unwrap();
 
-			if peer_state_lock.pending_requests.len()
-				< self.config.service_limits.max_pending_requests_per_peer
-			{
+			if peer_state_lock.pending_requests.len() < MAX_PENDING_REQUESTS_PER_PEER {
 				peer_state_lock
 					.pending_requests
 					.insert(request_id.clone(), LSPS2Request::Buy(params.clone()));
@@ -1170,7 +1148,7 @@ where
 
 				let err = format!(
 					"Peer {} reached maximum number of pending requests: {}",
-					counterparty_node_id, self.config.service_limits.max_pending_requests_per_peer
+					counterparty_node_id, MAX_PENDING_REQUESTS_PER_PEER
 				);
 				let result =
 					Err(LightningError { err, action: ErrorAction::IgnoreAndLog(Level::Debug) });

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -83,8 +83,7 @@ fn create_jit_invoice(
 #[test]
 fn invoice_generation_flow() {
 	let promise_secret = [42; 32];
-	let service_limits = Default::default();
-	let lsps2_service_config = LSPS2ServiceConfig { promise_secret, service_limits };
+	let lsps2_service_config = LSPS2ServiceConfig { promise_secret };
 	let service_config = LiquidityServiceConfig {
 		#[cfg(lsps1_service)]
 		lsps1_service_config: None,