f: fix conflicts

Author: martinsaposnic

lightning-liquidity/src/lsps2/service.rs

@@ -23,14 +23,6 @@ use crate::lsps0::ser::{
 	LSPS0_CLIENT_REJECTED_ERROR_CODE,
 };
 use crate::lsps2::event::LSPS2ServiceEvent;
-use crate::lsps2::msgs::{
-	LSPS2BuyRequest, LSPS2BuyResponse, LSPS2GetInfoRequest, LSPS2GetInfoResponse, LSPS2Message,
-	LSPS2OpeningFeeParams, LSPS2RawOpeningFeeParams, LSPS2Request, LSPS2Response,
-	LSPS2_BUY_REQUEST_INVALID_OPENING_FEE_PARAMS_ERROR_CODE,
-	LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_LARGE_ERROR_CODE,
-	LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_SMALL_ERROR_CODE,
-	LSPS2_GET_INFO_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE,
-};
 use crate::lsps2::payment_queue::{InterceptedHTLC, PaymentQueue};
 use crate::lsps2::utils::{
 	compute_opening_fee, is_expired_opening_fee_params, is_valid_opening_fee_params,
@@ -52,6 +44,15 @@ use lightning_types::payment::PaymentHash;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::Transaction;
 
+use crate::lsps2::msgs::{
+	LSPS2BuyRequest, LSPS2BuyResponse, LSPS2GetInfoRequest, LSPS2GetInfoResponse, LSPS2Message,
+	LSPS2OpeningFeeParams, LSPS2RawOpeningFeeParams, LSPS2Request, LSPS2Response,
+	LSPS2_BUY_REQUEST_INVALID_OPENING_FEE_PARAMS_ERROR_CODE,
+	LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_LARGE_ERROR_CODE,
+	LSPS2_BUY_REQUEST_PAYMENT_SIZE_TOO_SMALL_ERROR_CODE,
+	LSPS2_GET_INFO_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE,
+};
+
 const MAX_PENDING_REQUESTS_PER_PEER: usize = 10;
 const MAX_TOTAL_PENDING_REQUESTS: usize = 1000;
 const MAX_TOTAL_PEERS: usize = 100000;
@@ -367,7 +368,6 @@ impl OutboundJITChannelState {
 						channel_id,
 						FeePayment { opening_fee_msat: *opening_fee_msat, htlcs },
 					);
-
 					*self = OutboundJITChannelState::PendingPaymentForward {
 						payment_queue: core::mem::take(payment_queue),
 						opening_fee_msat: *opening_fee_msat,
@@ -1036,9 +1036,9 @@ where
 								Err(e) => {
 									return Err(APIError::APIMisuseError {
 										err: format!(
-										"Forwarded payment was not applicable for JIT channel: {}",
-										e.err
-									),
+											"Forwarded payment was not applicable for JIT channel: {}",
+											e.err
+										),
 									})
 								},
 							}

lightning-liquidity/tests/common/mod.rs

@@ -17,13 +17,22 @@ use std::sync::Arc;
 pub(crate) struct LSPSNodes<'a, 'b, 'c> {
 	pub service_node: LiquidityNode<'a, 'b, 'c>,
 	pub client_node: LiquidityNode<'a, 'b, 'c>,
-	pub payer_node_optional: Option<Node<'a, 'b, 'c>>,
 }
 
-pub(crate) fn create_service_and_client_nodes<'a, 'b, 'c>(
-	nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
+// this is ONLY used on LSPS2 so it says it's not used but it is
+#[allow(dead_code)]
+pub(crate) struct LSPSNodesWithPayer<'a, 'b, 'c> {
+	pub service_node: LiquidityNode<'a, 'b, 'c>,
+	pub client_node: LiquidityNode<'a, 'b, 'c>,
+	pub payer_node: Node<'a, 'b, 'c>,
+}
+
+// Reusable helper: consumes a Vec<Node>, builds service + client LiquidityNodes, returns optional leftover node.
+fn build_service_and_client<'a, 'b, 'c>(
+	mut nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
 	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider + Send + Sync>,
-) -> LSPSNodes<'a, 'b, 'c> {
+) -> (LiquidityNode<'a, 'b, 'c>, LiquidityNode<'a, 'b, 'c>, Option<Node<'a, 'b, 'c>>) {
+	assert!(nodes.len() >= 2, "Need at least two nodes (service, client)");
 	let chain_params = ChainParameters {
 		network: Network::Testnet,
 		best_block: BestBlock::from_network(Network::Testnet),
@@ -50,11 +59,33 @@ pub(crate) fn create_service_and_client_nodes<'a, 'b, 'c>(
 		time_provider,
 	);
 
-	let mut iter = nodes.into_iter();
+	let mut iter = nodes.drain(..);
 	let service_node = LiquidityNode::new(iter.next().unwrap(), service_lm);
 	let client_node = LiquidityNode::new(iter.next().unwrap(), client_lm);
+	let leftover = iter.next(); // payer if present
+	(service_node, client_node, leftover)
+}
 
-	LSPSNodes { service_node, client_node, payer_node_optional: iter.next() }
+pub(crate) fn create_service_and_client_nodes<'a, 'b, 'c>(
+	nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
+	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider + Send + Sync>,
+) -> LSPSNodes<'a, 'b, 'c> {
+	let (service_node, client_node, _extra) =
+		build_service_and_client(nodes, service_config, client_config, time_provider);
+	LSPSNodes { service_node, client_node }
+}
+
+// this is ONLY used on LSPS2 so it says it's not used but it is
+#[allow(dead_code)]
+pub(crate) fn create_service_client_and_payer_nodes<'a, 'b, 'c>(
+	nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
+	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider + Send + Sync>,
+) -> LSPSNodesWithPayer<'a, 'b, 'c> {
+	assert!(nodes.len() >= 3, "Need three nodes (service, client, payer)");
+	let (service_node, client_node, payer_opt) =
+		build_service_and_client(nodes, service_config, client_config, time_provider);
+	let payer_node = payer_opt.expect("payer node missing");
+	LSPSNodesWithPayer { service_node, client_node, payer_node }
 }
 
 pub(crate) struct LiquidityNode<'a, 'b, 'c> {

lightning-liquidity/tests/lsps0_integration_tests.rs

@@ -60,7 +60,7 @@ fn list_protocols_integration_test() {
 	let service_node_id = nodes[0].node.get_our_node_id();
 	let client_node_id = nodes[1].node.get_our_node_id();
 
-	let LSPSNodes { service_node, client_node , ..} = create_service_and_client_nodes(
+	let LSPSNodes { service_node, client_node } = create_service_and_client_nodes(
 		nodes,
 		service_config,
 		client_config,

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -2,7 +2,10 @@
 
 mod common;
 
-use common::{create_service_and_client_nodes, get_lsps_message, LSPSNodes, LiquidityNode};
+use common::{
+	create_service_and_client_nodes, create_service_client_and_payer_nodes, get_lsps_message,
+	LSPSNodes, LSPSNodesWithPayer, LiquidityNode,
+};
 
 use lightning::check_added_monitors;
 use lightning::events::Event;
@@ -61,9 +64,7 @@ use std::time::Duration;
 const MAX_PENDING_REQUESTS_PER_PEER: usize = 10;
 const MAX_TOTAL_PENDING_REQUESTS: usize = 1000;
 
-fn setup_test_lsps2_nodes<'a, 'b, 'c>(
-	nodes: Vec<Node<'a, 'b, 'c>>,
-) -> (LSPSNodes<'a, 'b, 'c>, [u8; 32]) {
+fn build_lsps2_configs() -> ([u8; 32], LiquidityServiceConfig, LiquidityClientConfig) {
 	let promise_secret = [42; 32];
 	let lsps2_service_config = LSPS2ServiceConfig { promise_secret };
 	let service_config = LiquidityServiceConfig {
@@ -73,20 +74,38 @@ fn setup_test_lsps2_nodes<'a, 'b, 'c>(
 		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 lsps_nodes = create_service_and_client_nodes(
+	(promise_secret, service_config, client_config)
+}
+
+fn setup_test_lsps2_nodes_with_payer<'a, 'b, 'c>(
+	nodes: Vec<Node<'a, 'b, 'c>>,
+) -> (LSPSNodesWithPayer<'a, 'b, 'c>, [u8; 32]) {
+	let (promise_secret, service_config, client_config) = build_lsps2_configs();
+	let lsps_nodes = create_service_client_and_payer_nodes(
 		nodes,
 		service_config,
 		client_config,
 		Arc::new(DefaultTimeProvider),
 	);
+	(lsps_nodes, promise_secret)
+}
 
+fn setup_test_lsps2_nodes<'a, 'b, 'c>(
+	nodes: Vec<Node<'a, 'b, 'c>>,
+) -> (LSPSNodes<'a, 'b, 'c>, [u8; 32]) {
+	let (promise_secret, service_config, client_config) = build_lsps2_configs();
+	let lsps_nodes = create_service_and_client_nodes(
+		nodes,
+		service_config,
+		client_config,
+		Arc::new(DefaultTimeProvider),
+	);
 	(lsps_nodes, promise_secret)
 }
 
@@ -103,10 +122,6 @@ fn create_jit_invoice(
 			log_error!(node.logger, "Failed to register inbound payment: {:?}", e);
 		})?;
 
-	// Add debugging here
-	println!("Creating route hint with intercept_scid: {}", intercept_scid);
-	println!("Service node ID: {}", service_node_id);
-
 	let route_hint = RouteHint(vec![RouteHintHop {
 		src_node_id: service_node_id,
 		short_channel_id: intercept_scid,
@@ -147,9 +162,6 @@ fn create_jit_invoice(
 		})
 	})?;
 
-	// Add debugging to verify the invoice
-	println!("Created invoice with route hints: {:?}", invoice.route_hints());
-
 	Ok(invoice)
 }
 
@@ -926,9 +938,9 @@ fn full_lsps2_flow() {
 		&[Some(service_node_config), Some(client_node_config), None],
 	);
 	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
-	let (lsps_nodes, promise_secret) = setup_test_lsps2_nodes(nodes);
-	let LSPSNodes { service_node, client_node, payer_node_optional } = lsps_nodes;
-	let payer_node = payer_node_optional.unwrap();
+	let (lsps_nodes, promise_secret) = setup_test_lsps2_nodes_with_payer(nodes);
+	let LSPSNodesWithPayer { service_node, client_node, payer_node } = lsps_nodes;
+
 	let payer_node_id = payer_node.node.get_our_node_id();
 	let service_node_id = service_node.inner.node.get_our_node_id();
 	let client_node_id = client_node.inner.node.get_our_node_id();
@@ -1188,15 +1200,15 @@ fn full_lsps2_flow() {
 	assert!(events.is_empty(), "Expected no events from service node, got: {:?}", events);
 
 	client_node.inner.node.claim_funds(preimage.unwrap());
-	/// TODO SIMPLIFY: put the payment_forwarded call inside a PaymentForwardedEvent
+	// TODO SIMPLIFY: put the payment_forwarded call inside a PaymentForwardedEvent
 	let expected_paths: &[&[&lightning::ln::functional_test_utils::Node<'_, '_, '_>]] =
 		&[&[&service_node.inner, &client_node.inner]];
 
 	let args = ClaimAlongRouteArgs::new(&payer_node, expected_paths, preimage.unwrap());
 	let total_fee_msat = pass_claimed_payment_along_route(args);
 
 	service_handler.payment_forwarded(channel_id).unwrap();
-	///
+
 	match service_node.liquidity_manager.next_event().unwrap() {
 		LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::BroadcastFundingTransaction {
 			counterparty_node_id,
@@ -1205,6 +1217,8 @@ fn full_lsps2_flow() {
 		}) => {
 			assert_eq!(counterparty_node_id, client_node_id);
 			assert_eq!(uid, user_channel_id);
+
+			// TODO actually broadcast transaction
 		},
 		other => panic!("Unexpected event: {:?}", other),
 	}

lightning/src/ln/functional_test_utils.rs

@@ -1952,7 +1952,7 @@ pub fn do_check_spends<F: Fn(&bitcoin::transaction::OutPoint) -> Option<TxOut>>(
 		total_value_out += output.value.to_sat();
 	}
 	let min_fee = (tx.weight().to_wu() as u64 + 3) / 4; // One sat per vbyte (ie per weight/4, rounded up)
-													 // Input amount - output amount = fee, so check that out + min_fee is smaller than input
+													// Input amount - output amount = fee, so check that out + min_fee is smaller than input
 	assert!(total_value_out + min_fee <= total_value_in);
 	tx.verify(get_output).unwrap();
 }
@@ -3010,7 +3010,6 @@ pub fn expect_channel_pending_event<'a, 'b, 'c, 'd>(
 	node: &'a Node<'b, 'c, 'd>, expected_counterparty_node_id: &PublicKey,
 ) -> ChannelId {
 	let events = node.node.get_and_clear_pending_events();
-	println!("Pending events: {:?}", events);
 	assert_eq!(events.len(), 1);
 	match &events[0] {
 		crate::events::Event::ChannelPending { channel_id, counterparty_node_id, .. } => {

lightning/src/routing/router.rs

@@ -1142,7 +1142,7 @@ impl PaymentParameters {
 }
 
 /// A struct for configuring parameters for routing the payment.
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct RouteParametersConfig {
 	/// The maximum total fees, in millisatoshi, that may accrue during route finding.
 	///