fixup: create LiquidityManager::new_with_custom_time_provider

Author: martinsaposnic

lightning-background-processor/src/lib.rs

@@ -1142,6 +1142,7 @@ mod tests {
 	use lightning::util::sweep::{OutputSpendStatus, OutputSweeper, PRUNE_DELAY_BLOCKS};
 	use lightning::util::test_utils;
 	use lightning::{get_event, get_event_msg};
+	use lightning_liquidity::lsps5::service::TimeProvider;
 	use lightning_liquidity::LiquidityManager;
 	use lightning_persister::fs_store::FilesystemStore;
 	use lightning_rapid_gossip_sync::RapidGossipSync;
@@ -1578,6 +1579,16 @@ mod tests {
 		path.to_str().unwrap().to_string()
 	}
 
+	pub struct DefaultTimeProvider;
+
+	#[cfg(feature = "std")]
+	impl TimeProvider for DefaultTimeProvider {
+		fn duration_since_epoch(&self) -> Duration {
+			use std::time::{SystemTime, UNIX_EPOCH};
+			SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
+		}
+	}
+
 	fn create_nodes(num_nodes: usize, persist_dir: &str) -> (String, Vec<Node>) {
 		let persist_temp_path = env::temp_dir().join(persist_dir);
 		let persist_dir = persist_temp_path.to_string_lossy().to_string();
@@ -1676,14 +1687,15 @@ mod tests {
 				logger.clone(),
 				keys_manager.clone(),
 			));
-			let liquidity_manager = Arc::new(LiquidityManager::new(
+			let time_provider = Arc::new(DefaultTimeProvider);
+			let liquidity_manager = Arc::new(LiquidityManager::new_with_custom_time_provider(
 				Arc::clone(&keys_manager),
 				Arc::clone(&manager),
 				None,
 				None,
 				None,
 				None,
-				None,
+				time_provider,
 			));
 			let node = Node {
 				node: manager,

lightning-liquidity/src/manager.rs

@@ -12,6 +12,8 @@ use crate::lsps0::ser::{
 use crate::lsps0::service::LSPS0ServiceHandler;
 use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
 use crate::lsps5::msgs::LSPS5Message;
+#[cfg(feature = "time")]
+use crate::lsps5::service::DefaultTimeProvider;
 use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
 use crate::message_queue::MessageQueue;
 
@@ -169,10 +171,34 @@ where
 	///
 	/// Sets up the required protocol message handlers based on the given
 	/// [`LiquidityClientConfig`] and [`LiquidityServiceConfig`].
+	#[cfg(feature = "time")]
 	pub fn new(
 		entropy_source: ES, channel_manager: CM, chain_source: Option<C>,
 		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
-		client_config: Option<LiquidityClientConfig>, time_provider: Option<Arc<dyn TimeProvider>>,
+		client_config: Option<LiquidityClientConfig>,
+	) -> Self {
+		let time_provider = Arc::new(DefaultTimeProvider);
+		Self::new_with_custom_time_provider(
+			entropy_source,
+			channel_manager,
+			chain_source,
+			chain_params,
+			service_config,
+			client_config,
+			time_provider,
+		)
+	}
+
+	/// Constructor for the [`LiquidityManager`] with a custom time provider.
+	///
+	/// This should be used on non-std platforms where access to the system time is not
+	/// available.
+	/// Sets up the required protocol message handlers based on the given
+	/// [`LiquidityClientConfig`] and [`LiquidityServiceConfig`].
+	pub fn new_with_custom_time_provider(
+		entropy_source: ES, channel_manager: CM, chain_source: Option<C>,
+		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
+		client_config: Option<LiquidityClientConfig>, time_provider: Arc<dyn TimeProvider>,
 	) -> Self
 where {
 		let pending_messages = Arc::new(MessageQueue::new());
@@ -182,7 +208,7 @@ where {
 		let mut supported_protocols = Vec::new();
 
 		let lsps2_client_handler = client_config.as_ref().and_then(|config| {
-			config.lsps2_client_config.as_ref().map(|config| {
+			config.lsps2_client_config.map(|config| {
 				LSPS2ClientHandler::new(
 					entropy_source.clone(),
 					Arc::clone(&pending_messages),
@@ -209,29 +235,13 @@ where {
 
 		let lsps5_client_handler = client_config.as_ref().and_then(|config| {
 			config.lsps5_client_config.as_ref().map(|config| {
-				if time_provider.is_some() {
-					LSPS5ClientHandler::new_with_custom_time_provider(
-						entropy_source.clone(),
-						Arc::clone(&pending_messages),
-						Arc::clone(&pending_events),
-						config.clone(),
-						time_provider.clone().unwrap(),
-					)
-				} else {
-					#[cfg(feature = "time")]
-					{
-						LSPS5ClientHandler::new(
-							entropy_source.clone(),
-							Arc::clone(&pending_messages),
-							Arc::clone(&pending_events),
-							config.clone(),
-						)
-					}
-					#[cfg(not(feature = "time"))]
-					{
-						panic!("A custom time_provider must be provided if the 'time' feature is not enabled.");
-					}
-				}
+				LSPS5ClientHandler::new(
+					entropy_source.clone(),
+					Arc::clone(&pending_messages),
+					Arc::clone(&pending_events),
+					config.clone(),
+					time_provider.clone(),
+				)
 			})
 		});
 
@@ -243,29 +253,13 @@ where {
 					supported_protocols.push(number);
 				}
 
-				if time_provider.is_some() {
-					return LSPS5ServiceHandler::new_with_custom_time_provider(
-						Arc::clone(&pending_events),
-						Arc::clone(&pending_messages),
-						channel_manager.clone(),
-						config.clone(),
-						time_provider.unwrap(),
-					);
-				} else {
-					#[cfg(feature = "time")]
-					{
-						return LSPS5ServiceHandler::new(
-							Arc::clone(&pending_events),
-							Arc::clone(&pending_messages),
-							channel_manager.clone(),
-							config.clone(),
-						);
-					}
-					#[cfg(not(feature = "time"))]
-					{
-						panic!("A custom time_provider must be provided if the 'time' feature is not enabled.");
-					}
-				}
+				return LSPS5ServiceHandler::new(
+					Arc::clone(&pending_events),
+					Arc::clone(&pending_messages),
+					channel_manager.clone(),
+					config.clone(),
+					time_provider,
+				);
 			})
 		});