f Account for updated OnionMessenger types

Author: tnull

src/builder.rs

@@ -15,7 +15,7 @@ use crate::peer_store::PeerStore;
 use crate::sweep::OutputSweeper;
 use crate::tx_broadcaster::TransactionBroadcaster;
 use crate::types::{
-	ChainMonitor, ChannelManager, FakeMessageRouter, GossipSync, KeysManager, NetworkGraph,
+	ChainMonitor, ChannelManager, GossipSync, KeysManager, MessageRouter, NetworkGraph,
 	OnionMessenger, PeerManager,
 };
 use crate::wallet::Wallet;
@@ -776,12 +776,15 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		})?;
 	}
 
+	let message_router = MessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager));
+
 	// Initialize the PeerManager
-	let onion_messenger: Arc<OnionMessenger> = Arc::new(OnionMessenger::new(
+	let onion_messenger: Arc<OnionMessenger<K>> = Arc::new(OnionMessenger::new(
 		Arc::clone(&keys_manager),
 		Arc::clone(&keys_manager),
 		Arc::clone(&logger),
-		Arc::new(FakeMessageRouter {}),
+		Arc::clone(&channel_manager),
+		Arc::new(message_router),
 		IgnoringMessageHandler {},
 		IgnoringMessageHandler {},
 	));

src/types.rs

@@ -2,7 +2,6 @@ use crate::logger::FilesystemLogger;
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::sweep::OutputSweeper;
 
-use lightning::blinded_path::BlindedPath;
 use lightning::chain::chainmonitor;
 use lightning::ln::channelmanager::ChannelDetails as LdkChannelDetails;
 use lightning::ln::msgs::RoutingMessageHandler;
@@ -19,7 +18,7 @@ use lightning::util::ser::{Readable, Writeable, Writer};
 use lightning_net_tokio::SocketDescriptor;
 use lightning_transaction_sync::EsploraSyncClient;
 
-use bitcoin::secp256k1::{self, PublicKey, Secp256k1};
+use bitcoin::secp256k1::PublicKey;
 use bitcoin::OutPoint;
 
 use std::sync::{Arc, Mutex, RwLock};
@@ -37,7 +36,7 @@ pub(crate) type PeerManager<K> = lightning::ln::peer_handler::PeerManager<
 	SocketDescriptor,
 	Arc<ChannelManager<K>>,
 	Arc<dyn RoutingMessageHandler + Send + Sync>,
-	Arc<OnionMessenger>,
+	Arc<OnionMessenger<K>>,
 	Arc<FilesystemLogger>,
 	Arc<NodeCustomMessageHandler<K, Arc<FilesystemLogger>>>,
 	Arc<KeysManager>,
@@ -110,31 +109,21 @@ pub(crate) type GossipSync = lightning_background_processor::GossipSync<
 	Arc<FilesystemLogger>,
 >;
 
-pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMessenger<
+pub(crate) type OnionMessenger<K> = lightning::onion_message::messenger::OnionMessenger<
 	Arc<KeysManager>,
 	Arc<KeysManager>,
 	Arc<FilesystemLogger>,
-	Arc<FakeMessageRouter>,
-	IgnoringMessageHandler,
+	Arc<ChannelManager<K>>,
+	Arc<MessageRouter>,
 	IgnoringMessageHandler,
 	IgnoringMessageHandler,
 >;
 
-pub(crate) struct FakeMessageRouter {}
-
-impl lightning::onion_message::messenger::MessageRouter for FakeMessageRouter {
-	fn find_path(
-		&self, _sender: PublicKey, _peers: Vec<PublicKey>,
-		_destination: lightning::onion_message::messenger::Destination,
-	) -> Result<lightning::onion_message::messenger::OnionMessagePath, ()> {
-		unimplemented!()
-	}
-	fn create_blinded_paths<T: secp256k1::Signing + secp256k1::Verification>(
-		&self, _recipient: PublicKey, _peers: Vec<PublicKey>, _secp_ctx: &Secp256k1<T>,
-	) -> Result<Vec<BlindedPath>, ()> {
-		unreachable!()
-	}
-}
+pub(crate) type MessageRouter = lightning::onion_message::messenger::DefaultMessageRouter<
+	Arc<NetworkGraph>,
+	Arc<FilesystemLogger>,
+	Arc<KeysManager>,
+>;
 
 pub(crate) type Sweeper<K> = OutputSweeper<
 	Arc<Broadcaster>,