fixup: multiple fixes to address comments. List below:

- reuse channelmanager from functional_test_utils instead of re-declaring it in common/mod
- have consistent grouping on imports
- re-introduce create_service_and_client_nodes for DRY purposes
- have struct on return value on common mod fn for better readability
- get rid of invoice_generation_flow test extension. will come in a new PR after this is merged

Author: martinsaposnic

lightning-liquidity/tests/common/mod.rs

@@ -1,49 +1,79 @@
 #![cfg(test)]
 
-use lightning_liquidity::LiquidityManager;
+use bitcoin::Network;
+use lightning::ln::channelmanager::ChainParameters;
+use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};
 
-use lightning::chain::Filter;
-use lightning::ln::channelmanager;
-use lightning::util::test_utils;
+use lightning::chain::{BestBlock, Filter};
+use lightning::ln::functional_test_utils::{Node, TestChannelManager};
+use lightning::util::test_utils::TestKeysInterface;
+
+use core::ops::Deref;
 
 use std::sync::Arc;
 
-pub(crate) type TestCM<'a, 'b> = channelmanager::ChannelManager<
-	&'a test_utils::TestChainMonitor<'b>,
-	&'b test_utils::TestBroadcaster,
-	&'a test_utils::TestKeysInterface,
-	&'a test_utils::TestKeysInterface,
-	&'a test_utils::TestKeysInterface,
-	&'b test_utils::TestFeeEstimator,
-	&'a test_utils::TestRouter<'b>,
-	&'a test_utils::TestMessageRouter<'b>,
-	&'b test_utils::TestLogger,
->;
+pub(crate) struct LSPSNodes<'a, 'b, 'c> {
+	pub service_node: LiquidityNode<'a, 'b, 'c>,
+	pub client_node: LiquidityNode<'a, 'b, 'c>,
+}
+
+pub(crate) fn create_service_and_client_nodes_with_optional_payer_node<'a, 'b, 'c>(
+	nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
+	client_config: LiquidityClientConfig,
+) -> LSPSNodes<'a, 'b, 'c> {
+	let chain_params = ChainParameters {
+		network: Network::Testnet,
+		best_block: BestBlock::from_network(Network::Testnet),
+	};
+	let service_lm = LiquidityManager::new(
+		nodes[0].keys_manager,
+		nodes[0].node,
+		None::<Arc<dyn Filter + Send + Sync>>,
+		Some(chain_params.clone()),
+		Some(service_config),
+		None,
+	);
+
+	let client_lm = LiquidityManager::new(
+		nodes[1].keys_manager,
+		nodes[1].node,
+		None::<Arc<dyn Filter + Send + Sync>>,
+		Some(chain_params),
+		None,
+		Some(client_config),
+	);
+
+	let mut iter = nodes.into_iter();
+	let service_node = LiquidityNode::new(iter.next().unwrap(), service_lm);
+	let client_node = LiquidityNode::new(iter.next().unwrap(), client_lm);
+
+	LSPSNodes { service_node, client_node }
+}
 
 pub(crate) struct LiquidityNode<'a, 'b, 'c> {
-	pub inner: lightning::ln::functional_test_utils::Node<'a, 'b, 'c>,
+	pub inner: Node<'a, 'b, 'c>,
 	pub liquidity_manager: LiquidityManager<
-		&'c test_utils::TestKeysInterface,
-		&'a TestCM<'b, 'c>,
+		&'c TestKeysInterface,
+		&'a TestChannelManager<'b, 'c>,
 		Arc<dyn Filter + Send + Sync>,
 	>,
 }
 
 impl<'a, 'b, 'c> LiquidityNode<'a, 'b, 'c> {
 	pub fn new(
-		node: lightning::ln::functional_test_utils::Node<'a, 'b, 'c>,
+		node: Node<'a, 'b, 'c>,
 		liquidity_manager: LiquidityManager<
-			&'c test_utils::TestKeysInterface,
-			&'a TestCM<'b, 'c>,
+			&'c TestKeysInterface,
+			&'a TestChannelManager<'b, 'c>,
 			Arc<dyn Filter + Send + Sync>,
 		>,
 	) -> Self {
 		Self { inner: node, liquidity_manager }
 	}
 }
 
-impl<'a, 'b, 'c> core::ops::Deref for LiquidityNode<'a, 'b, 'c> {
-	type Target = lightning::ln::functional_test_utils::Node<'a, 'b, 'c>;
+impl<'a, 'b, 'c> Deref for LiquidityNode<'a, 'b, 'c> {
+	type Target = Node<'a, 'b, 'c>;
 	fn deref(&self) -> &Self::Target {
 		&self.inner
 	}

lightning-liquidity/tests/lsps0_integration_tests.rs

@@ -2,17 +2,8 @@
 
 mod common;
 
-use std::sync::Arc;
-
-use bitcoin::Network;
 use common::get_lsps_message;
-use lightning::chain::Filter;
 
-use lightning::chain::BestBlock;
-use lightning::ln::channelmanager::ChainParameters;
-use lightning::ln::functional_test_utils::{
-	create_chanmon_cfgs, create_network, create_node_cfgs, create_node_chanmgrs,
-};
 use lightning_liquidity::events::LiquidityEvent;
 use lightning_liquidity::lsps0::event::LSPS0ClientEvent;
 #[cfg(lsps1_service)]
@@ -21,11 +12,14 @@ use lightning_liquidity::lsps1::client::LSPS1ClientConfig;
 use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
 use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
 use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
-use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};
+use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
 
+use lightning::ln::functional_test_utils::{
+	create_chanmon_cfgs, create_network, create_node_cfgs, create_node_chanmgrs,
+};
 use lightning::ln::peer_handler::CustomMessageHandler;
 
-use crate::common::LiquidityNode;
+use crate::common::{create_service_and_client_nodes_with_optional_payer_node, LSPSNodes};
 
 #[test]
 fn list_protocols_integration_test() {
@@ -56,35 +50,16 @@ fn list_protocols_integration_test() {
 		lsps2_client_config: Some(lsps2_client_config),
 	};
 
-	let chain_params = ChainParameters {
-		network: Network::Testnet,
-		best_block: BestBlock::from_network(Network::Testnet),
-	};
-
-	let service_lm = LiquidityManager::new(
-		nodes[0].keys_manager,
-		nodes[0].node,
-		None::<Arc<dyn Filter + Send + Sync>>,
-		Some(chain_params.clone()),
-		Some(service_config),
-		None,
-	);
-
-	let client_lm = LiquidityManager::new(
-		nodes[1].keys_manager,
-		nodes[1].node,
-		None::<Arc<dyn Filter + Send + Sync>>,
-		Some(chain_params),
-		None,
-		Some(client_config),
-	);
-
 	let service_node_id = nodes[0].node.get_our_node_id();
 	let client_node_id = nodes[1].node.get_our_node_id();
 
-	let mut iter = nodes.into_iter();
-	let service_node = LiquidityNode::new(iter.next().unwrap(), service_lm);
-	let client_node = LiquidityNode::new(iter.next().unwrap(), client_lm);
+	let LSPSNodes { service_node, client_node } =
+		create_service_and_client_nodes_with_optional_payer_node(
+			nodes,
+			service_config,
+			client_config,
+		);
+
 	let client_handler = client_node.liquidity_manager.lsps0_client_handler();
 
 	client_handler.list_protocols(&service_node_id);