f Account for lightning-liquidity changes post-LSPS5 merge

Author: tnull

src/liquidity.rs

@@ -223,16 +223,22 @@ where
 	pub(crate) fn build(self) -> LiquiditySource<L> {
 		let liquidity_service_config = self.lsps2_service.as_ref().map(|s| {
 			let lsps2_service_config = Some(s.ldk_service_config.clone());
+			let lsps5_service_config = None;
 			let advertise_service = s.service_config.advertise_service;
-			LiquidityServiceConfig { lsps2_service_config, advertise_service }
+			LiquidityServiceConfig { lsps2_service_config, lsps5_service_config, advertise_service }
 		});
 
 		let lsps1_client_config = self.lsps1_client.as_ref().map(|s| s.ldk_client_config.clone());
 		let lsps2_client_config = self.lsps2_client.as_ref().map(|s| s.ldk_client_config.clone());
-		let liquidity_client_config =
-			Some(LiquidityClientConfig { lsps1_client_config, lsps2_client_config });
+		let lsps5_client_config = None;
+		let liquidity_client_config = Some(LiquidityClientConfig {
+			lsps1_client_config,
+			lsps2_client_config,
+			lsps5_client_config,
+		});
 
 		let liquidity_manager = Arc::new(LiquidityManager::new(
+			Arc::clone(&self.keys_manager),
 			Arc::clone(&self.keys_manager),
 			Arc::clone(&self.channel_manager),
 			Some(Arc::clone(&self.chain_source)),

src/types.rs

@@ -34,6 +34,8 @@ use lightning_block_sync::gossip::{GossipVerifier, UtxoSource};
 
 use lightning_net_tokio::SocketDescriptor;
 
+use lightning_liquidity::utils::time::DefaultTimeProvider;
+
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::OutPoint;
 
@@ -62,8 +64,13 @@ pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
 	Arc<ChainMonitor>,
 >;
 
-pub(crate) type LiquidityManager =
-	lightning_liquidity::LiquidityManager<Arc<KeysManager>, Arc<ChannelManager>, Arc<ChainSource>>;
+pub(crate) type LiquidityManager = lightning_liquidity::LiquidityManager<
+	Arc<KeysManager>,
+	Arc<KeysManager>,
+	Arc<ChannelManager>,
+	Arc<ChainSource>,
+	Arc<DefaultTimeProvider>,
+>;
 
 pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
 	Arc<ChainMonitor>,