Re-introduce feature gate for lsps1_service

Author: tnull

Cargo.toml

@@ -48,5 +48,5 @@ tokio = { version = "1.35", default-features = false, features = [ "rt-multi-thr
 level = "forbid"
 # When adding a new cfg attribute, ensure that it is added to this list.
 check-cfg = [
-	"cfg(lsps1)",
+	"cfg(lsps1_service)",
 ]

src/events.rs

@@ -99,6 +99,7 @@ pub enum Event {
 	/// 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),

src/lsps1/event.rs

@@ -9,8 +9,11 @@
 
 //! Contains LSPS1 event types
 
-use super::msgs::{ChannelInfo, OptionsSupported, OrderId, OrderParams, PaymentInfo};
+#[cfg(lsps1_service)]
+use super::msgs::OrderId;
+use super::msgs::{ChannelInfo, OptionsSupported, OrderParams, PaymentInfo};
 
+#[cfg(lsps1_service)]
 use crate::lsps0::ser::RequestId;
 use crate::prelude::String;
 
@@ -67,6 +70,7 @@ 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

src/lsps1/mod.rs

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

src/lsps1/msgs.rs

@@ -21,7 +21,8 @@ pub(crate) const LSPS1_GET_INFO_METHOD_NAME: &str = "lsps1.get_info";
 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;
+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;
 
 /// The identifier of an order.

src/manager.rs

@@ -11,6 +11,7 @@ use crate::message_queue::MessageQueue;
 
 use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
 use crate::lsps1::msgs::LSPS1Message;
+#[cfg(lsps1_service)]
 use crate::lsps1::service::{LSPS1ServiceConfig, LSPS1ServiceHandler};
 
 use crate::lsps2::client::{LSPS2ClientConfig, LSPS2ClientHandler};
@@ -41,6 +42,7 @@ const LSPS_FEATURE_BIT: usize = 729;
 /// to provide liquidity services to clients.
 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.
@@ -92,6 +94,7 @@ where
 	ignored_peers: RwLock<HashSet<PublicKey>>,
 	lsps0_client_handler: LSPS0ClientHandler<ES>,
 	lsps0_service_handler: Option<LSPS0ServiceHandler>,
+	#[cfg(lsps1_service)]
 	lsps1_service_handler: Option<LSPS1ServiceHandler<ES, CM, C>>,
 	lsps1_client_handler: Option<LSPS1ClientHandler<ES, CM, C>>,
 	lsps2_service_handler: Option<LSPS2ServiceHandler<CM>>,
@@ -163,6 +166,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
@@ -201,6 +205,7 @@ where {
 			lsps0_client_handler,
 			lsps0_service_handler,
 			lsps1_client_handler,
+			#[cfg(lsps1_service)]
 			lsps1_service_handler,
 			lsps2_client_handler,
 			lsps2_service_handler,
@@ -227,6 +232,7 @@ where {
 	}
 
 	/// Returns a reference to the LSPS1 server-side handler.
+	#[cfg(lsps1_service)]
 	pub fn lsps1_service_handler(&self) -> Option<&LSPS1ServiceHandler<ES, CM, C>> {
 		self.lsps1_service_handler.as_ref()
 	}
@@ -420,15 +426,18 @@ where {
 					},
 				}
 			},
-			LSPSMessage::LSPS1(msg @ LSPS1Message::Request(..)) => {
+			LSPSMessage::LSPS1(_msg @ LSPS1Message::Request(..)) => {
+				#[cfg(lsps1_service)]
 				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::Info)});
 					},
 				}
+				#[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::Info)});
 			},
 			LSPSMessage::LSPS2(msg @ LSPS2Message::Response(..)) => {
 				match &self.lsps2_client_handler {

tests/lsps2_integration_tests.rs

@@ -85,6 +85,7 @@ fn invoice_generation_flow() {
 	let promise_secret = [42; 32];
 	let lsps2_service_config = LSPS2ServiceConfig { promise_secret };
 	let service_config = LiquidityServiceConfig {
+		#[cfg(lsps1_service)]
 		lsps1_service_config: None,
 		lsps2_service_config: Some(lsps2_service_config),
 		advertise_service: true,