Skip to content

Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 6 commits into from
Sep 25, 2025
Merged

Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f53c5e9
Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers
TheBlueMatt Sep 23, 2025
d665bef
Drop unnecessary 'static bounds on BP async methods
TheBlueMatt Sep 23, 2025
603f901
Drop unnecessary `Arc`s around `KVStoreWrapper`
TheBlueMatt Sep 23, 2025
552cd39
Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`
TheBlueMatt Sep 24, 2025
b68f128
Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP
TheBlueMatt Sep 24, 2025
5e679b4
Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`
TheBlueMatt Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 113 additions & 84 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
'a,
UL: 'static + Deref,
CF: 'static + Deref,
T: 'static + Deref,
F: 'static + Deref,
G: 'static + Deref<Target = NetworkGraph<L>>,
L: 'static + Deref,
P: 'static + Deref,
UL: Deref,
CF: Deref,
T: Deref,
F: Deref,
G: Deref<Target = NetworkGraph<L>>,
L: Deref,
P: Deref,
EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
EventHandler: Fn(Event) -> EventHandlerFuture,
ES: 'static + Deref + Send,
M: 'static
+ Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
ES: Deref + Send,
M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
+ Send
+ Sync,
CM: 'static + Deref,
OM: 'static + Deref,
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
PM: 'static + Deref,
LM: 'static + Deref,
D: 'static + Deref,
O: 'static + Deref,
K: 'static + Deref,
OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
S: 'static + Deref<Target = SC> + Send + Sync,
CM: Deref,
OM: Deref,
PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
RGS: Deref<Target = RapidGossipSync<G, L>>,
PM: Deref,
LM: Deref,
D: Deref,
O: Deref,
K: Deref,
OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
S: Deref<Target = SC> + Send + Sync,
SC: for<'b> WriteableScore<'b>,
SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
UL::Target: 'static + UtxoLookup,
CF::Target: 'static + chain::Filter,
T::Target: 'static + BroadcasterInterface,
F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger,
P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
ES::Target: 'static + EntropySource,
UL::Target: UtxoLookup,
CF::Target: chain::Filter,
T::Target: BroadcasterInterface,
F::Target: FeeEstimator,
L::Target: Logger,
P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
ES::Target: EntropySource,
CM::Target: AChannelManager,
OM::Target: AOnionMessenger,
PM::Target: APeerManager,
LM::Target: ALiquidityManager,
O::Target: 'static + OutputSpender,
D::Target: 'static + ChangeDestinationSource,
K::Target: 'static + KVStore,
O::Target: OutputSpender,
D::Target: ChangeDestinationSource,
K::Target: KVStore,
{
let async_event_handler = |event| {
let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
UL: 'static + Deref,
CF: 'static + Deref,
T: 'static + Deref,
F: 'static + Deref,
G: 'static + Deref<Target = NetworkGraph<L>>,
L: 'static + Deref + Send + Sync,
P: 'static + Deref,
UL: Deref,
CF: Deref,
T: Deref,
F: Deref,
G: Deref<Target = NetworkGraph<L>>,
L: Deref + Send + Sync,
P: Deref,
EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
EventHandler: Fn(Event) -> EventHandlerFuture,
ES: 'static + Deref + Send,
M: 'static
+ Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
ES: Deref + Send,
M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
+ Send
+ Sync,
CM: 'static + Deref + Send + Sync,
OM: 'static + Deref,
PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
PM: 'static + Deref,
LM: 'static + Deref,
D: 'static + Deref,
O: 'static + Deref,
K: 'static + Deref,
OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
S: 'static + Deref<Target = SC> + Send + Sync,
CM: Deref + Send + Sync,
OM: Deref,
PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
RGS: Deref<Target = RapidGossipSync<G, L>>,
PM: Deref,
LM: Deref,
D: Deref,
O: Deref,
K: Deref,
OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,

@joostjagerjoostjagerSep 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.

S: Deref<Target = SC> + Send + Sync,
SC: for<'b> WriteableScore<'b>,
SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
UL::Target: 'static + UtxoLookup,
CF::Target: 'static + chain::Filter,
T::Target: 'static + BroadcasterInterface,
F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger,
P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
ES::Target: 'static + EntropySource,
UL::Target: UtxoLookup,
CF::Target: chain::Filter,
T::Target: BroadcasterInterface,
F::Target: FeeEstimator,
L::Target: Logger,
P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
ES::Target: EntropySource,
CM::Target: AChannelManager,
OM::Target: AOnionMessenger,
PM::Target: APeerManager,
LM::Target: ALiquidityManager,
O::Target: 'static + OutputSpender,
D::Target: 'static + ChangeDestinationSource,
K::Target: 'static + KVStoreSync,
O::Target: OutputSpender,
D::Target: ChangeDestinationSourceSync,
K::Target: KVStoreSync,
{
let kv_store = KVStoreSyncWrapper(kv_store);
process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
gossip_sync,
peer_manager,
liquidity_manager,
sweeper,
sweeper.as_ref().map(|os| os.sweeper_async()),
logger,
scorer,
sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::ser::Writeable;
use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
use lightning::util::sweep::{
OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
};
use lightning::util::test_utils;
use lightning::{get_event, get_event_msg};
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
use lightning_persister::fs_store::FilesystemStore;
use lightning_rapid_gossip_sync::RapidGossipSync;
use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
Arc<ChannelManager>,
Arc<dyn Filter + Sync + Send>,
Arc<Persister>,
Arc<DefaultTimeProvider>,
DefaultTimeProvider,
>;

struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
let kv_store_sync = Arc::new(
Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
);
let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
let kv_store = KVStoreSyncWrapper(kv_store_sync);

// Yes, you can unsafe { turn off the borrow checker }
let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {

@joostjagerjoostjagerSep 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...

@TheBlueMattTheBlueMattSep 25, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.

&*(nodes[0].liquidity_manager.get_lm_async()
as *const LiquidityManager<_, _, _, _, _, _>)
as &'static LiquidityManager<_, _, _, _, _, _>
};
let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
&*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
as &'static OutputSweeper<_, _, _, _, _, _, _>
};

let bp_future = super::process_events_async(
kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
Some(Arc::clone(&nodes[0].messenger)),
nodes[0].rapid_gossip_sync(),
Arc::clone(&nodes[0].peer_manager),
Some(nodes[0].liquidity_manager.get_lm_async()),
Some(nodes[0].sweeper.sweeper_async()),
Some(lm_async),
Some(sweeper_async),
Arc::clone(&nodes[0].logger),
Some(Arc::clone(&nodes[0].scorer)),
move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
let data_dir = nodes[0].kv_store.get_data_dir();
let kv_store_sync =
Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
let kv_store = KVStoreSyncWrapper(kv_store_sync);

// Yes, you can unsafe { turn off the borrow checker }
let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
&*(nodes[0].liquidity_manager.get_lm_async()
as *const LiquidityManager<_, _, _, _, _, _>)
as &'static LiquidityManager<_, _, _, _, _, _>
};
let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
&*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
as &'static OutputSweeper<_, _, _, _, _, _, _>
};

let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
Some(Arc::clone(&nodes[0].messenger)),
nodes[0].rapid_gossip_sync(),
Arc::clone(&nodes[0].peer_manager),
Some(nodes[0].liquidity_manager.get_lm_async()),
Some(nodes[0].sweeper.sweeper_async()),
Some(lm_async),
Some(sweeper_async),
Arc::clone(&nodes[0].logger),
Some(Arc::clone(&nodes[0].scorer)),
move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
let data_dir = nodes[0].kv_store.get_data_dir();
let kv_store_sync = Arc::new(Persister::new(data_dir));
let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
let kv_store = KVStoreSyncWrapper(kv_store_sync);

let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

// Yes, you can unsafe { turn off the borrow checker }
let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
&*(nodes[0].liquidity_manager.get_lm_async()
as *const LiquidityManager<_, _, _, _, _, _>)
as &'static LiquidityManager<_, _, _, _, _, _>
};
let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
&*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
as &'static OutputSweeper<_, _, _, _, _, _, _>
};

let bp_future = super::process_events_async(
kv_store,
event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
Some(Arc::clone(&nodes[0].messenger)),
nodes[0].no_gossip_sync(),
Arc::clone(&nodes[0].peer_manager),
Some(nodes[0].liquidity_manager.get_lm_async()),
Some(nodes[0].sweeper.sweeper_async()),
Some(lm_async),
Some(sweeper_async),
Arc::clone(&nodes[0].logger),
Some(Arc::clone(&nodes[0].scorer)),
move |dur: Duration| {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Drop a pile of Arcs and `OutputSweeper::new_with_kv_store_sync` by TheBlueMatt · Pull Request #4119 · lightningdevkit/rust-lightning · GitHub
Skip to content
Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 6 commits into

from

Sep 25, 2025
 Merged


Drop a pile of Arcs and OutputSweeper::new_with_kv_store_sync#4119
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f53c5e9

Drop unnecessary Arcs in Sweeper and LiquidityManager sync wrappers


TheBlueMatt Sep 23, 2025
d665bef

Drop unnecessary 'static bounds on BP async methods


TheBlueMatt Sep 23, 2025
603f901

Drop unnecessary `Arc`s around `KVStoreWrapper`


TheBlueMatt Sep 23, 2025
552cd39

Drop `Arc`s around `lightning-liquidity`'s `DefaultTimeProvider`


TheBlueMatt Sep 24, 2025
b68f128

Allow passing an `OutputSweeperSync` to the sync-KVStore-async-BP


TheBlueMatt Sep 24, 2025
5e679b4

Drop unnecessary `Arc`s in `lightning-liquidity`'s `EventQueue`


TheBlueMatt Sep 24, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


197 changes: 113 additions & 84 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@ use lightning::onion_message::messenger::AOnionMessenger;
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
use lightning::routing::utxo::UtxoLookup;
use lightning::sign::ChangeDestinationSource;
#[cfg(feature = "std")]
use lightning::sign::ChangeDestinationSourceSync;
use lightning::sign::EntropySource;
use lightning::sign::OutputSpender;
use lightning::sign::{
	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
Expand All@@ -61,9 +59,7 @@ use lightning::util::persist::{
	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};
use lightning::util::sweep::OutputSweeper;
#[cfg(feature = "std")]
use lightning::util::sweep::OutputSweeperSync;
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
use lightning::util::wakers::Sleeper;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand DownExpand Up@@ -304,7 +300,7 @@ where

/// Updates scorer based on event and returns whether an update occurred so we can decide whether
/// to persist.
fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
fn update_scorer<'a, S: Deref<Target = SC> + Send + Sync, SC: 'a + WriteableScore<'a>>(
	scorer: &'a S, event: &Event, duration_since_epoch: Duration,
) -> bool {
	match event {
Expand DownExpand Up@@ -866,31 +862,30 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -902,20 +897,20 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStore,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1340,31 +1335,30 @@ fn check_and_reset_sleeper<
/// Async events processor that is based on [`process_events_async`] but allows for [`KVStoreSync`] to be used for
/// synchronous background persistence.
pub async fn process_events_async_with_kv_store_sync<
	UL: 'static + Deref,
	CF: 'static + Deref,
	T: 'static + Deref,
	F: 'static + Deref,
	G: 'static + Deref<Target = NetworkGraph<L>>,
	L: 'static + Deref + Send + Sync,
	P: 'static + Deref,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref + Send + Sync,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: 'static + Deref + Send,
	M: 'static
 + Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
	ES: Deref + Send,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>
 + Send
 + Sync,
	CM: 'static + Deref + Send + Sync,
	OM: 'static + Deref,
	PGS: 'static + Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>>,
	PM: 'static + Deref,
	LM: 'static + Deref,
	D: 'static + Deref,
	O: 'static + Deref,
	K: 'static + Deref,
	OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, KVStoreSyncWrapper<K>, L, O>>,
	S: 'static + Deref<Target = SC> + Send + Sync,
	CM: Deref + Send + Sync,
	OM: Deref,
	PGS: Deref<Target = P2PGossipSync<G, UL, L>>,
	RGS: Deref<Target = RapidGossipSync<G, L>>,
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me now why I didn't do this in the first place.
	S: Deref<Target = SC> + Send + Sync,
	SC: for<'b> WriteableScore<'b>,
	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
	Sleeper: Fn(Duration) -> SleepFuture,
Expand All@@ -1376,20 +1370,20 @@ pub async fn process_events_async_with_kv_store_sync<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	UL::Target: 'static + UtxoLookup,
	CF::Target: 'static + chain::Filter,
	T::Target: 'static + BroadcasterInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: 'static + EntropySource,
	UL::Target: UtxoLookup,
	CF::Target: chain::Filter,
	T::Target: BroadcasterInterface,
	F::Target: FeeEstimator,
	L::Target: Logger,
	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
	ES::Target: EntropySource,
	CM::Target: AChannelManager,
	OM::Target: AOnionMessenger,
	PM::Target: APeerManager,
	LM::Target: ALiquidityManager,
	O::Target: 'static + OutputSpender,
	D::Target: 'static + ChangeDestinationSource,
	K::Target: 'static + KVStoreSync,
	O::Target: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
	let kv_store = KVStoreSyncWrapper(kv_store);
	process_events_async(
Expand All@@ -1401,7 +1395,7 @@ where
 gossip_sync,
 peer_manager,
 liquidity_manager,
 sweeper,
 sweeper.as_ref().map(|os| os.sweeper_async()),
 logger,
 scorer,
 sleeper,
Expand DownExpand Up@@ -1846,11 +1840,13 @@ mod tests {
 SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
	};
	use lightning::util::ser::Writeable;
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::sweep::{
 OutputSpendStatus, OutputSweeper, OutputSweeperSync, PRUNE_DELAY_BLOCKS,
	};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManagerSync};
	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
	use std::collections::VecDeque;
Expand DownExpand Up@@ -1953,7 +1949,7 @@ mod tests {
 Arc<ChannelManager>,
 Arc<dyn Filter + Sync + Send>,
 Arc<Persister>,
Arc<DefaultTimeProvider>,
 DefaultTimeProvider,
	>;

	struct Node {
Expand DownExpand Up@@ -2779,7 +2775,18 @@ mod tests {
 let kv_store_sync = Arc::new(
 Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
 );
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
@joostjagerjoostjagerSep 25, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has a nice end result, but this - I am not sure how many devs understand it...
@TheBlueMattTheBlueMattSep 25, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope the comment is clear enough? Easy to just update the comment later if it makes it more readable.
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
Expand All@@ -2789,8 +2796,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3287,7 +3294,18 @@ mod tests {
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync =
 Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
 let bp_future = super::process_events_async(
Expand All@@ -3298,8 +3316,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].rapid_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand DownExpand Up@@ -3501,10 +3519,21 @@ mod tests {
 let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
 let data_dir = nodes[0].kv_store.get_data_dir();
 let kv_store_sync = Arc::new(Persister::new(data_dir));
 let kv_store = Arc::new(KVStoreSyncWrapper(kv_store_sync));
 let kv_store = KVStoreSyncWrapper(kv_store_sync);

 let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());

 // Yes, you can unsafe { turn off the borrow checker }
 let lm_async: &'static LiquidityManager<_, _, _, _, _, _> = unsafe {
 &*(nodes[0].liquidity_manager.get_lm_async()
 as *const LiquidityManager<_, _, _, _, _, _>)
 as &'static LiquidityManager<_, _, _, _, _, _>
 };
 let sweeper_async: &'static OutputSweeper<_, _, _, _, _, _, _> = unsafe {
 &*(nodes[0].sweeper.sweeper_async() as *const OutputSweeper<_, _, _, _, _, _, _>)
 as &'static OutputSweeper<_, _, _, _, _, _, _>
 };

 let bp_future = super::process_events_async(
 kv_store,
 event_handler,
Expand All@@ -3513,8 +3542,8 @@ mod tests {
 Some(Arc::clone(&nodes[0].messenger)),
 nodes[0].no_gossip_sync(),
 Arc::clone(&nodes[0].peer_manager),
 Some(nodes[0].liquidity_manager.get_lm_async()),
 Some(nodes[0].sweeper.sweeper_async()),
 Some(lm_async),
 Some(sweeper_async),
 Arc::clone(&nodes[0].logger),
 Some(Arc::clone(&nodes[0].scorer)),
 move |dur: Duration| {
Expand Down
Loading
Loading