Add tests for LSPS5 client and service.

Author: martinsaposnic

lightning-liquidity/tests/common/mod.rs

@@ -1,16 +1,16 @@
-#![cfg(test)]
+#![cfg(all(test, feature = "time"))]
 // TODO: remove these flags and unused code once we know what we'll need.
 #![allow(dead_code)]
 #![allow(unused_imports)]
 #![allow(unused_macros)]
 
-use lightning::chain::Filter;
-use lightning::sign::EntropySource;
-
 use bitcoin::blockdata::constants::{genesis_block, ChainHash};
 use bitcoin::blockdata::transaction::Transaction;
+use bitcoin::secp256k1::SecretKey;
 use bitcoin::Network;
+
 use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
+use lightning::chain::Filter;
 use lightning::chain::{chainmonitor, BestBlock, Confirm};
 use lightning::ln::channelmanager;
 use lightning::ln::channelmanager::ChainParameters;
@@ -24,6 +24,7 @@ use lightning::onion_message::messenger::DefaultMessageRouter;
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::router::{CandidateRouteHop, DefaultRouter, Path};
 use lightning::routing::scoring::{ChannelUsage, ScoreLookUp, ScoreUpdate};
+use lightning::sign::EntropySource;
 use lightning::sign::{InMemorySigner, KeysManager};
 use lightning::util::config::UserConfig;
 use lightning::util::persist::{
@@ -34,6 +35,8 @@ use lightning::util::persist::{
 	SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use lightning::util::test_utils;
+
+use lightning_liquidity::lsps5::service::TimeProvider;
 use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};
 use lightning_persister::fs_store::FilesystemStore;
 
@@ -67,7 +70,7 @@ type LockingWrapper<T> = lightning::routing::scoring::MultiThreadedLockableScore
 #[cfg(not(c_bindings))]
 type LockingWrapper<T> = std::sync::Mutex<T>;
 
-type ChannelManager = channelmanager::ChannelManager<
+pub(crate) type ChannelManager = channelmanager::ChannelManager<
 	Arc<ChainMonitor>,
 	Arc<test_utils::TestBroadcaster>,
 	Arc<KeysManager>,
@@ -400,7 +403,7 @@ fn get_full_filepath(filepath: String, filename: String) -> String {
 
 pub(crate) fn create_liquidity_node(
 	i: usize, persist_dir: &str, network: Network, service_config: Option<LiquidityServiceConfig>,
-	client_config: Option<LiquidityClientConfig>,
+	client_config: Option<LiquidityClientConfig>, time_provider: Option<Arc<dyn TimeProvider>>,
 ) -> Node {
 	let tx_broadcaster = Arc::new(test_utils::TestBroadcaster::new(network));
 	let fee_estimator = Arc::new(test_utils::TestFeeEstimator::new(253));
@@ -451,16 +454,27 @@ pub(crate) fn create_liquidity_node(
 		Some(chain_source.clone()),
 		logger.clone(),
 	));
+	let liquidity_manager = Arc::new(if let Some(tp) = time_provider.clone() {
+		LiquidityManager::new_with_custom_time_provider(
+			keys_manager.clone(),
+			channel_manager.clone(),
+			None::<Arc<dyn Filter + Send + Sync>>,
+			Some(chain_params.clone()),
+			service_config,
+			client_config,
+			tp,
+		)
+	} else {
+		LiquidityManager::new(
+			keys_manager.clone(),
+			channel_manager.clone(),
+			None,
+			Some(chain_params),
+			service_config,
+			client_config,
+		)
+	});
 
-	let liquidity_manager = Arc::new(LiquidityManager::new(
-		Arc::clone(&keys_manager),
-		Arc::clone(&channel_manager),
-		None::<Arc<dyn Filter + Send + Sync>>,
-		Some(chain_params),
-		service_config,
-		client_config,
-		None,
-	));
 	let msg_handler = MessageHandler {
 		chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new(
 			ChainHash::using_genesis_block(Network::Testnet),
@@ -489,14 +503,23 @@ pub(crate) fn create_liquidity_node(
 }
 
 pub(crate) fn create_service_and_client_nodes(
-	persist_dir: &str, service_config: LiquidityServiceConfig, client_config: LiquidityClientConfig,
+	persist_dir: &str, service_config: LiquidityServiceConfig,
+	client_config: LiquidityClientConfig, time_provider: Option<Arc<dyn TimeProvider>>,
 ) -> (Node, Node) {
 	let persist_temp_path = env::temp_dir().join(persist_dir);
 	let persist_dir = persist_temp_path.to_string_lossy().to_string();
 	let network = Network::Bitcoin;
 
-	let service_node = create_liquidity_node(1, &persist_dir, network, Some(service_config), None);
-	let client_node = create_liquidity_node(2, &persist_dir, network, None, Some(client_config));
+	let service_node = create_liquidity_node(
+		1,
+		&persist_dir,
+		network,
+		Some(service_config),
+		None,
+		time_provider.clone(),
+	);
+	let client_node =
+		create_liquidity_node(2, &persist_dir, network, None, Some(client_config), time_provider);
 
 	service_node
 		.channel_manager

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -88,17 +88,23 @@ fn invoice_generation_flow() {
 		#[cfg(lsps1_service)]
 		lsps1_service_config: None,
 		lsps2_service_config: Some(lsps2_service_config),
+		lsps5_service_config: None,
 		advertise_service: true,
 	};
 
 	let lsps2_client_config = LSPS2ClientConfig::default();
 	let client_config = LiquidityClientConfig {
 		lsps1_client_config: None,
 		lsps2_client_config: Some(lsps2_client_config),
+		lsps5_client_config: None,
 	};
 
-	let (service_node, client_node) =
-		create_service_and_client_nodes("invoice_generation_flow", service_config, client_config);
+	let (service_node, client_node) = create_service_and_client_nodes(
+		"invoice_generation_flow",
+		service_config,
+		client_config,
+		None,
+	);
 
 	let service_handler = service_node.liquidity_manager.lsps2_service_handler().unwrap();
 	let service_node_id = service_node.channel_manager.get_our_node_id();