Add tests for LSPS5 client and service. Also tests for checking the correctness of the signing logic

Author: martinsaposnic

lightning-liquidity/tests/common/mod.rs

@@ -4,6 +4,7 @@
 #![allow(unused_imports)]
 #![allow(unused_macros)]
 
+use bitcoin::secp256k1::SecretKey;
 use lightning::chain::Filter;
 use lightning::sign::EntropySource;
 
@@ -34,6 +35,8 @@ use lightning::util::persist::{
 	SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use lightning::util::test_utils;
+use lightning_liquidity::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
+use lightning_liquidity::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
 use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};
 use lightning_persister::fs_store::FilesystemStore;
 
@@ -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));
@@ -459,7 +462,7 @@ pub(crate) fn create_liquidity_node(
 		Some(chain_params),
 		service_config,
 		client_config,
-		None,
+		time_provider,
 	));
 	let msg_handler = MessageHandler {
 		chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new(
@@ -489,14 +492,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
@@ -672,3 +684,52 @@ fn advance_chain(node: &mut Node, num_blocks: u32) {
 		}
 	}
 }
+
+pub(crate) fn get_client_and_service(
+	time_provider: Option<Arc<dyn TimeProvider>>,
+) -> (
+	&'static LSPS5ClientHandler<Arc<KeysManager>>,
+	&'static LSPS5ServiceHandler<Arc<ChannelManager>>,
+	bitcoin::secp256k1::PublicKey,
+	bitcoin::secp256k1::PublicKey,
+	&'static Node,
+	&'static Node,
+) {
+	let signing_key = SecretKey::from_slice(&[42; 32]).unwrap();
+	let mut lsps5_service_config = LSPS5ServiceConfig::default();
+	lsps5_service_config.signing_key = signing_key;
+	let service_config = LiquidityServiceConfig {
+		#[cfg(lsps1_service)]
+		lsps1_service_config: None,
+		lsps2_service_config: None,
+		lsps5_service_config: Some(lsps5_service_config),
+		advertise_service: true,
+	};
+
+	let lsps5_client_config = LSPS5ClientConfig::default();
+	let client_config = LiquidityClientConfig {
+		lsps1_client_config: None,
+		lsps2_client_config: None,
+		lsps5_client_config: Some(lsps5_client_config),
+	};
+
+	let (service_node, client_node) = create_service_and_client_nodes(
+		"webhook_registration_flow",
+		service_config,
+		client_config,
+		time_provider,
+	);
+
+	// Leak the nodes to extend their lifetime to 'static since this is test code
+	let service_node = Box::leak(Box::new(service_node));
+	let client_node = Box::leak(Box::new(client_node));
+
+	let client_handler = client_node.liquidity_manager.lsps5_client_handler().unwrap();
+	let service_handler = service_node.liquidity_manager.lsps5_service_handler().unwrap();
+
+	let secp = bitcoin::secp256k1::Secp256k1::new();
+	let service_node_id = bitcoin::secp256k1::PublicKey::from_secret_key(&secp, &signing_key);
+	let client_node_id = client_node.channel_manager.get_our_node_id();
+
+	(client_handler, service_handler, service_node_id, client_node_id, service_node, client_node)
+}

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();