Drop lsps1_service cfg flag

Author: tnull

ci/ci-tests.sh

@@ -144,6 +144,4 @@ RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
 [ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
 RUSTFLAGS="--cfg=simple_close" 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
-[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
 RUSTFLAGS="--cfg=peer_storage" cargo test --verbose --color always -p lightning

lightning-liquidity/Cargo.toml

@@ -47,7 +47,6 @@ parking_lot = { version = "0.12", default-features = false }
 level = "forbid"
 # When adding a new cfg attribute, ensure that it is added to this list.
 check-cfg = [
-	"cfg(lsps1_service)",
 	"cfg(c_bindings)",
 	"cfg(backtrace)",
 	"cfg(ldk_bench)",

lightning-liquidity/src/events/mod.rs

@@ -33,7 +33,6 @@ pub enum LiquidityEvent {
 	/// An LSPS1 (Channel Request) client event.
 	LSPS1Client(lsps1::event::LSPS1ClientEvent),
 	/// An LSPS1 (Channel Request) server event.
-	#[cfg(lsps1_service)]
 	LSPS1Service(lsps1::event::LSPS1ServiceEvent),
 	/// An LSPS2 (JIT Channel) client event.
 	LSPS2Client(lsps2::event::LSPS2ClientEvent),
@@ -57,7 +56,6 @@ impl From<lsps1::event::LSPS1ClientEvent> for LiquidityEvent {
 	}
 }
 
-#[cfg(lsps1_service)]
 impl From<lsps1::event::LSPS1ServiceEvent> for LiquidityEvent {
 	fn from(event: lsps1::event::LSPS1ServiceEvent) -> Self {
 		Self::LSPS1Service(event)

lightning-liquidity/src/lsps1/event.rs

@@ -142,7 +142,6 @@ pub enum LSPS1ClientEvent {
 }
 
 /// An event which an LSPS1 server should take some action in response to.
-#[cfg(lsps1_service)]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LSPS1ServiceEvent {
 	/// A client has selected the parameters to use from the supported options of the LSP

lightning-liquidity/src/lsps1/mod.rs

@@ -12,7 +12,5 @@
 pub mod client;
 pub mod event;
 pub mod msgs;
-#[cfg(lsps1_service)]
 pub(crate) mod peer_state;
-#[cfg(lsps1_service)]
 pub mod service;

lightning-liquidity/src/lsps1/msgs.rs

@@ -31,9 +31,7 @@ pub(crate) const LSPS1_CREATE_ORDER_METHOD_NAME: &str = "lsps1.create_order";
 pub(crate) const LSPS1_GET_ORDER_METHOD_NAME: &str = "lsps1.get_order";
 
 pub(crate) const _LSPS1_CREATE_ORDER_REQUEST_INVALID_PARAMS_ERROR_CODE: i32 = -32602;
-#[cfg(lsps1_service)]
 pub(crate) const LSPS1_CREATE_ORDER_REQUEST_ORDER_MISMATCH_ERROR_CODE: i32 = 100;
-#[cfg(lsps1_service)]
 pub(crate) const LSPS1_GET_ORDER_REQUEST_ORDER_NOT_FOUND_ERROR_CODE: i32 = 101;
 pub(crate) const LSPS1_CREATE_ORDER_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE: i32 = 102;
 

lightning-liquidity/src/manager.rs

@@ -23,15 +23,13 @@ use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
 use crate::lsps5::msgs::LSPS5Message;
 use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
 use crate::message_queue::MessageQueue;
-#[cfg(lsps1_service)]
-use crate::persist::read_lsps1_service_peer_states;
 use crate::persist::{
-	read_event_queue, read_lsps2_service_peer_states, read_lsps5_service_peer_states,
+	read_event_queue, read_lsps1_service_peer_states, read_lsps2_service_peer_states,
+	read_lsps5_service_peer_states,
 };
 
 use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
 use crate::lsps1::msgs::LSPS1Message;
-#[cfg(lsps1_service)]
 use crate::lsps1::service::{LSPS1ServiceConfig, LSPS1ServiceHandler, LSPS1ServiceHandlerSync};
 
 use crate::lsps2::client::{LSPS2ClientConfig, LSPS2ClientHandler};
@@ -73,7 +71,6 @@ const LSPS_FEATURE_BIT: usize = 729;
 #[derive(Clone)]
 pub struct LiquidityServiceConfig {
 	/// Optional server-side configuration for LSPS1 channel requests.
-	#[cfg(lsps1_service)]
 	pub lsps1_service_config: Option<LSPS1ServiceConfig>,
 	/// Optional server-side configuration for JIT channels
 	/// should you want to support them.
@@ -301,7 +298,6 @@ pub struct LiquidityManager<
 	ignored_peers: RwLock<HashSet<PublicKey>>,
 	lsps0_client_handler: LSPS0ClientHandler<ES, K>,
 	lsps0_service_handler: Option<LSPS0ServiceHandler>,
-	#[cfg(lsps1_service)]
 	lsps1_service_handler: Option<LSPS1ServiceHandler<ES, CM, K, TP>>,
 	lsps1_client_handler: Option<LSPS1ClientHandler<ES, K>>,
 	lsps2_service_handler: Option<LSPS2ServiceHandler<CM, K, T>>,
@@ -476,7 +472,6 @@ where
 			})
 		});
 
-		#[cfg(lsps1_service)]
 		let lsps1_service_handler = if let Some(service_config) = service_config.as_ref() {
 			if let Some(lsps1_service_config) = service_config.lsps1_service_config.as_ref() {
 				if let Some(number) =
@@ -524,7 +519,6 @@ where
 			lsps0_client_handler,
 			lsps0_service_handler,
 			lsps1_client_handler,
-			#[cfg(lsps1_service)]
 			lsps1_service_handler,
 			lsps2_client_handler,
 			lsps2_service_handler,
@@ -555,7 +549,6 @@ where
 	}
 
 	/// Returns a reference to the LSPS1 server-side handler.
-	#[cfg(lsps1_service)]
 	pub fn lsps1_service_handler(&self) -> Option<&LSPS1ServiceHandler<ES, CM, K, TP>> {
 		self.lsps1_service_handler.as_ref()
 	}
@@ -704,18 +697,15 @@ where
 					},
 				}
 			},
-			LSPSMessage::LSPS1(_msg @ LSPS1Message::Request(..)) => {
-				#[cfg(lsps1_service)]
+			LSPSMessage::LSPS1(msg @ LSPS1Message::Request(..)) => {
 				match &self.lsps1_service_handler {
 					Some(lsps1_service_handler) => {
-						lsps1_service_handler.handle_message(_msg, sender_node_id)?;
+						lsps1_service_handler.handle_message(msg, sender_node_id)?;
 					},
 					None => {
 						return Err(LightningError { err: format!("Received LSPS1 request message without LSPS1 service handler configured. From node {}", sender_node_id), action: ErrorAction::IgnoreAndLog(Level::Debug)});
 					},
 				}
-				#[cfg(not(lsps1_service))]
-				return Err(LightningError { err: format!("Received LSPS1 request message without LSPS1 service handler configured. From node {}", sender_node_id), action: ErrorAction::IgnoreAndLog(Level::Debug)});
 			},
 			LSPSMessage::LSPS2(msg @ LSPS2Message::Response(..)) => {
 				match &self.lsps2_client_handler {
@@ -756,14 +746,10 @@ where
 									.lsps2_service_handler
 									.as_ref()
 									.is_some_and(|h| h.has_active_requests(sender_node_id));
-								#[cfg(lsps1_service)]
 								let lsps1_has_active_requests = self
 									.lsps1_service_handler
 									.as_ref()
 									.is_some_and(|h| h.has_active_requests(sender_node_id));
-								#[cfg(not(lsps1_service))]
-								let lsps1_has_active_requests = false;
-
 								lsps5_service_handler.enforce_prior_activity_or_reject(
 									sender_node_id,
 									lsps2_has_active_requests,
@@ -927,7 +913,6 @@ where
 		// If the peer was misbehaving, drop it from the ignored list to cleanup the kept state.
 		self.ignored_peers.write().unwrap().remove(&counterparty_node_id);
 
-		#[cfg(lsps1_service)]
 		if let Some(lsps1_service_handler) = self.lsps1_service_handler.as_ref() {
 			lsps1_service_handler.peer_disconnected(counterparty_node_id);
 		}
@@ -1092,7 +1077,6 @@ where
 	/// Returns a reference to the LSPS1 server-side handler.
 	///
 	/// Wraps [`LiquidityManager::lsps1_service_handler`].
-	#[cfg(lsps1_service)]
 	pub fn lsps1_service_handler<'a>(
 		&'a self,
 	) -> Option<LSPS1ServiceHandlerSync<'a, ES, CM, KVStoreSyncWrapper<KS>, TP>> {

lightning-liquidity/src/persist.rs

@@ -10,7 +10,6 @@
 //! Types and utils for persistence.
 
 use crate::events::{EventQueueDeserWrapper, LiquidityEvent};
-#[cfg(lsps1_service)]
 use crate::lsps1::peer_state::PeerState as LSPS1ServicePeerState;
 use crate::lsps2::service::PeerState as LSPS2ServicePeerState;
 use crate::lsps5::service::PeerState as LSPS5ServicePeerState;
@@ -92,7 +91,6 @@ where
 	Ok(Some(queue.0))
 }
 
-#[cfg(lsps1_service)]
 pub(crate) async fn read_lsps1_service_peer_states<K: Deref>(
 	kv_store: K,
 ) -> Result<HashMap<PublicKey, Mutex<LSPS1ServicePeerState>>, lightning::io::Error>

lightning-liquidity/tests/lsps0_integration_tests.rs

@@ -6,11 +6,8 @@ use common::{create_service_and_client_nodes, get_lsps_message, LSPSNodes};
 
 use lightning_liquidity::events::LiquidityEvent;
 use lightning_liquidity::lsps0::event::LSPS0ClientEvent;
-#[cfg(lsps1_service)]
 use lightning_liquidity::lsps1::client::LSPS1ClientConfig;
-#[cfg(lsps1_service)]
 use lightning_liquidity::lsps1::msgs::LSPS1Options;
-#[cfg(lsps1_service)]
 use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
 use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
 use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
@@ -35,7 +32,6 @@ fn list_protocols_integration_test() {
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 	let promise_secret = [42; 32];
 	let lsps2_service_config = LSPS2ServiceConfig { promise_secret };
-	#[cfg(lsps1_service)]
 	let lsps1_service_config = {
 		let supported_options = LSPS1Options {
 			min_required_channel_confirmations: 0,
@@ -53,22 +49,17 @@ fn list_protocols_integration_test() {
 	};
 	let lsps5_service_config = LSPS5ServiceConfig::default();
 	let service_config = LiquidityServiceConfig {
-		#[cfg(lsps1_service)]
 		lsps1_service_config: Some(lsps1_service_config),
 		lsps2_service_config: Some(lsps2_service_config),
 		lsps5_service_config: Some(lsps5_service_config),
 		advertise_service: true,
 	};
 
 	let lsps2_client_config = LSPS2ClientConfig::default();
-	#[cfg(lsps1_service)]
 	let lsps1_client_config: LSPS1ClientConfig = LSPS1ClientConfig { max_channel_fees_msat: None };
 	let lsps5_client_config = LSPS5ClientConfig::default();
 	let client_config = LiquidityClientConfig {
-		#[cfg(lsps1_service)]
 		lsps1_client_config: Some(lsps1_client_config),
-		#[cfg(not(lsps1_service))]
-		lsps1_client_config: None,
 		lsps2_client_config: Some(lsps2_client_config),
 		lsps5_client_config: Some(lsps5_client_config),
 	};
@@ -107,16 +98,12 @@ fn list_protocols_integration_test() {
 			protocols,
 		}) => {
 			assert_eq!(counterparty_node_id, client_node_id);
-			#[cfg(lsps1_service)]
 			{
 				assert!(protocols.contains(&1));
 				assert!(protocols.contains(&2));
 				assert!(protocols.contains(&5));
 				assert_eq!(protocols.len(), 3);
 			}
-
-			#[cfg(not(lsps1_service))]
-			assert_eq!(protocols, vec![2, 5]);
 		},
 		_ => panic!("Unexpected event"),
 	}

lightning-liquidity/tests/lsps1_integration_tests.rs

@@ -1,4 +1,4 @@
-#![cfg(all(test, feature = "time", lsps1_service))]
+#![cfg(all(test, feature = "time"))]
 
 mod common;