WIP test liquidity cleanup branch

Author: tnull

Cargo.toml

@@ -50,17 +50,28 @@ default = []
 #lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["esplora-async-https", "time"] }
 #lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
-lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["futures"] }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
-lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["esplora-async-https", "time"] }
-lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
-lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+lightning = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup", features = ["std"] }
+lightning-types = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup" }
+lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup" }
+lightning-persister = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup" }
+lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup", features = ["futures"] }
+lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup" }
+lightning-block-sync = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup", features = ["rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup", features = ["esplora-async-https", "time"] }
+lightning-liquidity = { git = "https://github.com/tnull/rust-lightning", branch = "2025-01-liquidity-cleanup" }
+
+#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
+#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+#lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std"] }
+#lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+#lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+#lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["futures"] }
+#lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+#lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["rpc-client", "tokio"] }
+#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["esplora-async-https", "time"] }
+#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
+#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c" }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["std"] }
 #lightning-types = { path = "../rust-lightning/lightning-types" }
@@ -103,7 +114,8 @@ winapi = { version = "0.3", features = ["winbase"] }
 [dev-dependencies]
 #lightning = { version = "0.1.0", features = ["std", "_test_utils"] }
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/tnull/rust-lightning", branch="2025-01-liquidity-cleanup", features = ["std", "_test_utils"] }
+#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "c5fd164f1db6773c6561c1d54bfbafdca8c6278c", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
 electrum-client = { version = "0.21.0", default-features = true }
 bitcoincore-rpc = { version = "0.19.0", default-features = false }

src/builder.rs

@@ -1204,8 +1204,6 @@ fn build_with_store_internal(
 		Arc::clone(&keys_manager),
 	));
 
-	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::clone(&peer_manager)));
-
 	gossip_source.set_gossip_verifier(
 		Arc::clone(&chain_source),
 		Arc::clone(&peer_manager),

src/lib.rs

@@ -546,6 +546,7 @@ impl Node {
 		let background_chan_man = Arc::clone(&self.channel_manager);
 		let background_gossip_sync = self.gossip_source.as_gossip_sync();
 		let background_peer_man = Arc::clone(&self.peer_manager);
+		let background_lm = self.liquidity_source.as_ref().map(|ls| ls.liquidity_manager());
 		let background_onion_messenger = Arc::clone(&self.onion_messenger);
 		let background_logger = Arc::clone(&self.logger);
 		let background_error_logger = Arc::clone(&self.logger);
@@ -582,6 +583,7 @@ impl Node {
 				Some(background_onion_messenger),
 				background_gossip_sync,
 				background_peer_man,
+				background_lm,
 				background_logger,
 				Some(background_scorer),
 				sleeper,

src/liquidity.rs

@@ -72,13 +72,8 @@ where
 		Self { lsps2_service, channel_manager, keys_manager, liquidity_manager, config, logger }
 	}
 
-	pub(crate) fn set_peer_manager(&self, peer_manager: Arc<PeerManager>) {
-		let process_msgs_callback = move || peer_manager.process_events();
-		self.liquidity_manager.set_process_msgs_callback(process_msgs_callback);
-	}
-
-	pub(crate) fn liquidity_manager(&self) -> &LiquidityManager {
-		self.liquidity_manager.as_ref()
+	pub(crate) fn liquidity_manager(&self) -> Arc<LiquidityManager> {
+		Arc::clone(&self.liquidity_manager)
 	}
 
 	pub(crate) fn get_liquidity_source_details(&self) -> Option<(PublicKey, SocketAddress)> {