f Account for LDK changes

.. that happended on `main` since 0.0.125.

Author: tnull

lightning-liquidity/src/lsps2/payment_queue.rs

@@ -1,6 +1,6 @@
 use crate::prelude::Vec;
 use lightning::ln::channelmanager::InterceptId;
-use lightning::ln::PaymentHash;
+use lightning_types::payment::PaymentHash;
 
 /// Holds payments with the corresponding HTLCs until it is possible to pay the fee.
 /// When the fee is successfully paid with a forwarded payment, the queue should be consumed and the

lightning-liquidity/src/manager.rs

@@ -22,14 +22,15 @@ use crate::sync::{Arc, Mutex, RwLock};
 
 use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
 use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
-use lightning::ln::features::{InitFeatures, NodeFeatures};
 use lightning::ln::msgs::{ErrorAction, LightningError};
 use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::ln::wire::CustomMessageReader;
 use lightning::sign::EntropySource;
 use lightning::util::logger::Level;
 use lightning::util::ser::Readable;
 
+use lightning_types::features::{InitFeatures, NodeFeatures};
+
 use bitcoin::secp256k1::PublicKey;
 
 use core::ops::Deref;
@@ -489,7 +490,7 @@ where
 	C::Target: Filter,
 {
 	fn handle_custom_message(
-		&self, msg: Self::CustomMessage, sender_node_id: &PublicKey,
+		&self, msg: Self::CustomMessage, sender_node_id: PublicKey,
 	) -> Result<(), lightning::ln::msgs::LightningError> {
 		{
 			if self.ignored_peers.read().unwrap().contains(&sender_node_id) {
@@ -513,8 +514,8 @@ where
 					data: None,
 				};
 
-				self.pending_messages.enqueue(sender_node_id, LSPSMessage::Invalid(error));
-				self.ignored_peers.write().unwrap().insert(*sender_node_id);
+				self.pending_messages.enqueue(&sender_node_id, LSPSMessage::Invalid(error));
+				self.ignored_peers.write().unwrap().insert(sender_node_id);
 				let err = format!(
 					"Failed to deserialize invalid LSPS message. Ignoring peer {} from now on.",
 					sender_node_id
@@ -523,7 +524,7 @@ where
 			})?
 		};
 
-		self.handle_lsps_message(message, sender_node_id)
+		self.handle_lsps_message(message, &sender_node_id)
 	}
 
 	fn get_and_clear_pending_msg(&self) -> Vec<(PublicKey, Self::CustomMessage)> {
@@ -565,7 +566,7 @@ where
 		features
 	}
 
-	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
+	fn provided_init_features(&self, _their_node_id: PublicKey) -> InitFeatures {
 		let mut features = InitFeatures::empty();
 
 		let advertise_service = self.service_config.as_ref().map_or(false, |c| c.advertise_service);
@@ -578,9 +579,9 @@ where
 		features
 	}
 
-	fn peer_disconnected(&self, _: &bitcoin::secp256k1::PublicKey) {}
+	fn peer_disconnected(&self, _: bitcoin::secp256k1::PublicKey) {}
 	fn peer_connected(
-		&self, _: &bitcoin::secp256k1::PublicKey, _: &lightning::ln::msgs::Init, _: bool,
+		&self, _: bitcoin::secp256k1::PublicKey, _: &lightning::ln::msgs::Init, _: bool,
 	) -> Result<(), ()> {
 		Ok(())
 	}

lightning-liquidity/tests/common/mod.rs

@@ -19,6 +19,8 @@ use lightning::ln::msgs::{ChannelMessageHandler, Init};
 use lightning::ln::peer_handler::{
 	IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor,
 };
+
+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};
@@ -77,6 +79,13 @@ type ChannelManager = channelmanager::ChannelManager<
 			TestScorer,
 		>,
 	>,
+	Arc<
+		DefaultMessageRouter<
+			Arc<NetworkGraph<Arc<test_utils::TestLogger>>>,
+			Arc<test_utils::TestLogger>,
+			Arc<KeysManager>,
+		>,
+	>,
 	Arc<test_utils::TestLogger>,
 >;
 
@@ -387,9 +396,7 @@ pub(crate) fn create_liquidity_node(
 	client_config: Option<LiquidityClientConfig>,
 ) -> Node {
 	let tx_broadcaster = Arc::new(test_utils::TestBroadcaster::new(network));
-	let target_override = Mutex::new(HashMap::new());
-	let fee_estimator =
-		Arc::new(test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253), target_override });
+	let fee_estimator = Arc::new(test_utils::TestFeeEstimator::new(253));
 	let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 	let genesis_block = genesis_block(network);
 	let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
@@ -398,12 +405,14 @@ pub(crate) fn create_liquidity_node(
 	let seed = [i as u8; 32];
 	let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 	let router = Arc::new(DefaultRouter::new(
-		network_graph.clone(),
+		Arc::clone(&network_graph),
 		logger.clone(),
 		keys_manager.clone(),
 		scorer.clone(),
 		Default::default(),
 	));
+	let msg_router =
+		Arc::new(DefaultMessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager)));
 	let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
 	let kv_store =
 		Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -421,6 +430,7 @@ pub(crate) fn create_liquidity_node(
 		chain_monitor.clone(),
 		tx_broadcaster.clone(),
 		router.clone(),
+		msg_router.clone(),
 		logger.clone(),
 		keys_manager.clone(),
 		keys_manager.clone(),
@@ -492,7 +502,7 @@ pub(crate) fn create_service_and_client_nodes(
 	service_node
 		.channel_manager
 		.peer_connected(
-			&client_node.channel_manager.get_our_node_id(),
+			client_node.channel_manager.get_our_node_id(),
 			&Init {
 				features: client_node.channel_manager.init_features(),
 				networks: None,
@@ -504,7 +514,7 @@ pub(crate) fn create_service_and_client_nodes(
 	client_node
 		.channel_manager
 		.peer_connected(
-			&service_node.channel_manager.get_our_node_id(),
+			service_node.channel_manager.get_our_node_id(),
 			&Init {
 				features: service_node.channel_manager.init_features(),
 				networks: None,

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -109,10 +109,7 @@ fn invoice_generation_flow() {
 	let get_info_request_id = client_handler.request_opening_params(service_node_id, None);
 	let get_info_request = get_lsps_message!(client_node, service_node_id);
 
-	service_node
-		.liquidity_manager
-		.handle_custom_message(get_info_request, &client_node_id)
-		.unwrap();
+	service_node.liquidity_manager.handle_custom_message(get_info_request, client_node_id).unwrap();
 
 	let get_info_event = service_node.liquidity_manager.next_event().unwrap();
 	match get_info_event {
@@ -149,7 +146,7 @@ fn invoice_generation_flow() {
 
 	client_node
 		.liquidity_manager
-		.handle_custom_message(get_info_response, &service_node_id)
+		.handle_custom_message(get_info_response, service_node_id)
 		.unwrap();
 
 	let opening_params_event = client_node.liquidity_manager.next_event().unwrap();
@@ -174,7 +171,7 @@ fn invoice_generation_flow() {
 		.unwrap();
 
 	let buy_request = get_lsps_message!(client_node, service_node_id);
-	service_node.liquidity_manager.handle_custom_message(buy_request, &client_node_id).unwrap();
+	service_node.liquidity_manager.handle_custom_message(buy_request, client_node_id).unwrap();
 
 	let buy_event = service_node.liquidity_manager.next_event().unwrap();
 	match buy_event {
@@ -209,7 +206,7 @@ fn invoice_generation_flow() {
 		.unwrap();
 
 	let buy_response = get_lsps_message!(service_node, client_node_id);
-	client_node.liquidity_manager.handle_custom_message(buy_response, &service_node_id).unwrap();
+	client_node.liquidity_manager.handle_custom_message(buy_response, service_node_id).unwrap();
 
 	let invoice_params_event = client_node.liquidity_manager.next_event().unwrap();
 	match invoice_params_event {