Parameterize ChannelManager with MessageRouter

ChannelManager is parameterized by a Router, which must also implement
MessageRouter. Instead, add a MessageRouter parameter such that the
Router and MessageRouter traits can be de-coupled. This simplifies using
something other than DefaultMessageRouter, which DefaultRouter currently
delegates to.

Author: jkczyz

fuzz/src/chanmon_consistency.rs

@@ -503,6 +503,7 @@ type ChanMan<'a> = ChannelManager<
 	Arc<KeyProvider>,
 	Arc<FuzzEstimator>,
 	&'a FuzzRouter,
+	&'a FuzzRouter,
 	Arc<dyn Logger>,
 >;
 
@@ -709,6 +710,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 					monitor.clone(),
 					broadcast.clone(),
 					&router,
+					&router,
 					Arc::clone(&logger),
 					keys_manager.clone(),
 					keys_manager.clone(),
@@ -777,6 +779,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 				chain_monitor: chain_monitor.clone(),
 				tx_broadcaster: broadcast.clone(),
 				router: &router,
+				message_router: &router,
 				logger,
 				default_config: config,
 				channel_monitors: monitor_refs,

fuzz/src/full_stack.rs

@@ -236,6 +236,7 @@ type ChannelMan<'a> = ChannelManager<
 	Arc<KeyProvider>,
 	Arc<FuzzEstimator>,
 	&'a FuzzRouter,
+	&'a FuzzRouter,
 	Arc<dyn Logger>,
 >;
 type PeerMan<'a> = PeerManager<
@@ -653,6 +654,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 		monitor.clone(),
 		broadcast.clone(),
 		&router,
+		&router,
 		Arc::clone(&logger),
 		keys_manager.clone(),
 		keys_manager.clone(),

lightning-background-processor/src/lib.rs

@@ -1154,6 +1154,13 @@ mod tests {
 				TestScorer,
 			>,
 		>,
+		Arc<
+			DefaultMessageRouter<
+				Arc<NetworkGraph<Arc<test_utils::TestLogger>>>,
+				Arc<test_utils::TestLogger>,
+				Arc<KeysManager>,
+			>,
+		>,
 		Arc<test_utils::TestLogger>,
 	>;
 
@@ -1579,6 +1586,7 @@ mod tests {
 				chain_monitor.clone(),
 				tx_broadcaster.clone(),
 				router.clone(),
+				msg_router.clone(),
 				logger.clone(),
 				keys_manager.clone(),
 				keys_manager.clone(),

lightning-block-sync/src/init.rs

@@ -50,6 +50,7 @@ where
 /// use lightning::chain::chaininterface::BroadcasterInterface;
 /// use lightning::chain::chaininterface::FeeEstimator;
 /// use lightning::ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
+/// use lightning::onion_message::messenger::MessageRouter;
 /// use lightning::routing::router::Router;
 /// use lightning::sign;
 /// use lightning::sign::{EntropySource, NodeSigner, SignerProvider};
@@ -69,6 +70,7 @@ where
 /// 	T: BroadcasterInterface,
 /// 	F: FeeEstimator,
 /// 	R: Router,
+/// 	MR: MessageRouter,
 /// 	L: Logger,
 /// 	C: chain::Filter,
 /// 	P: chainmonitor::Persist<SP::EcdsaSigner>,
@@ -82,6 +84,7 @@ where
 /// 	tx_broadcaster: &T,
 /// 	fee_estimator: &F,
 /// 	router: &R,
+/// 	message_router: &MR,
 /// 	logger: &L,
 /// 	persister: &P,
 /// ) {
@@ -101,11 +104,12 @@ where
 /// 			chain_monitor,
 /// 			tx_broadcaster,
 /// 			router,
+/// 			message_router,
 /// 			logger,
 /// 			config,
 /// 			vec![&mut monitor],
 /// 		);
-/// 		<(BlockHash, ChannelManager<&ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P>, &T, &ES, &NS, &SP, &F, &R, &L>)>::read(
+/// 		<(BlockHash, ChannelManager<&ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P>, &T, &ES, &NS, &SP, &F, &R, &MR, &L>)>::read(
 /// 			&mut Cursor::new(&serialized_manager), read_args).unwrap()
 /// 	};
 ///