WIP

Author: tnull

Cargo.toml

@@ -158,17 +158,17 @@ harness = false
 #lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
 
 [patch."https://github.com/lightningdevkit/rust-lightning"]
-lightning = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-types = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-invoice = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-persister = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-block-sync = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-liquidity = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
-lightning-macros = { git = "https://github.com/tnull/rust-lightning", rev = "fe77246afe56c80ed08221a50dfd487f2a811c9b" }
+lightning = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-types = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-invoice = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-persister = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-block-sync = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-liquidity = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
+lightning-macros = { git = "https://github.com/tnull/rust-lightning", rev = "071aa74424bbb15079a7daa75d37ecaf22cca4f1" }
 
 #vss-client-ng = { path = "../vss-client" }
 #vss-client-ng = { git = "https://github.com/lightningdevkit/vss-client", branch = "main" }

src/builder.rs

@@ -1632,11 +1632,7 @@ fn build_with_store_internal(
 	);
 	let inner_message_router =
 		InnerMessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager));
-	let router = Arc::new(LSPS2BOLT12Router::new(
-		inner_router,
-		inner_message_router,
-		Arc::clone(&keys_manager),
-	));
+	let router = Arc::new(LSPS2BOLT12Router::new(inner_router, Arc::clone(&keys_manager)));
 
 	let mut user_config = default_user_config(&config);
 
@@ -1664,7 +1660,7 @@ fn build_with_store_internal(
 		}
 	}
 
-	let message_router = Arc::clone(&router);
+	let message_router = Arc::new(inner_message_router);
 
 	// Initialize the ChannelManager
 	let channel_manager = {

src/types.rs

@@ -292,7 +292,7 @@ pub(crate) type InnerRouter = DefaultRouter<
 	ProbabilisticScoringFeeParameters,
 	Scorer,
 >;
-pub(crate) type Router = LSPS2BOLT12Router<InnerRouter, InnerMessageRouter, Arc<KeysManager>>;
+pub(crate) type Router = LSPS2BOLT12Router<InnerRouter, Arc<KeysManager>>;
 pub(crate) type Scorer = CombinedScorer<Arc<Graph>, Arc<Logger>>;
 
 pub(crate) type Graph = gossip::NetworkGraph<Arc<Logger>>;
@@ -331,7 +331,7 @@ pub(crate) type InnerMessageRouter = lightning::onion_message::messenger::Defaul
 	Arc<Logger>,
 	Arc<KeysManager>,
 >;
-pub(crate) type MessageRouter = Router;
+pub(crate) type MessageRouter = InnerMessageRouter;
 
 pub(crate) type Sweeper = OutputSweeper<
 	Arc<Broadcaster>,