Drop Deref indirection for most trait parameters#4311

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
valentinewallace merged 16 commits into from
Jan 30, 2026
Merged

Drop Deref indirection for most trait parameters #4311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
26f6cbb
Bump lightning-liquidity version
valentinewallace Jan 14, 2026
aa9feac
Drop Deref indirection for BroadcasterInterface
valentinewallace Jan 13, 2026
32e6e10
Drop Deref indirection for EntropySource
valentinewallace Jan 14, 2026
fb2759e
Drop Deref indirection for NodeSigner
valentinewallace Jan 14, 2026
b6f3670
Drop Deref indirection for FeeEstimator
valentinewallace Jan 14, 2026
3f8f1ba
Drop Deref indirection for Router
valentinewallace Jan 14, 2026
dcb81f9
Drop Deref indirection for MessageRouter
valentinewallace Jan 15, 2026
ac8074e
Drop Deref indirection for Logger
valentinewallace Jan 15, 2026
9432adb
Drop Deref indirection for SignerProvider
valentinewallace Jan 15, 2026
54a8858
Drop Deref indirection for chain::Watch
valentinewallace Jan 15, 2026
75b29b8
Drop Deref indirection for KVStore
valentinewallace Jan 15, 2026
9e81ce9
Drop Deref indirection for NodeIdLookup
valentinewallace Jan 15, 2026
c35b41b
Drop Deref indirection for message handler traits
valentinewallace Jan 15, 2026
f60a33f
Drop Deref indirection for chain::Filter
valentinewallace Jan 17, 2026
644ca0c
Drop Deref indirection for OutputSpender
valentinewallace Jan 20, 2026
101d206
Drop Deref indirection for UtxoLookup
valentinewallace Jan 20, 2026
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
4 changes: 2 additions & 2 deletions lightning-background-processor/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down
155 changes: 51 additions & 104 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
P: Deref<Target = P2PGossipSync<G, U, L>>,
R: Deref<Target = RapidGossipSync<G, L>>,
G: Deref<Target = NetworkGraph<L>>,
U: Deref,
L: Deref,
> where
U::Target: UtxoLookup,
L::Target: Logger,
{
U: UtxoLookup,
L: Logger,
> {
/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
P2P(P),
/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
P: Deref<Target = P2PGossipSync<G, U, L>>,
R: Deref<Target = RapidGossipSync<G, L>>,
G: Deref<Target = NetworkGraph<L>>,
U: Deref,
L: Deref,
U: UtxoLookup,
L: Logger,
> GossipSync<P, R, G, U, L>
where
U::Target: UtxoLookup,
L::Target: Logger,
{
fn network_graph(&self) -> Option<&G> {
match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
P: Deref<Target = P2PGossipSync<G, U, L>>,
G: Deref<Target = NetworkGraph<L>>,
U: Deref,
L: Deref,
U: UtxoLookup,
L: Logger,
> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
U::Target: UtxoLookup,
L::Target: Logger,
{
/// Initializes a new [`GossipSync::P2P`] variant.
pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
'a,
R: Deref<Target = RapidGossipSync<G, L>>,
G: Deref<Target = NetworkGraph<L>>,
L: Deref,
L: Logger,
>
GossipSync<
&P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
R,
G,
&'a (dyn UtxoLookup + Send + Sync),
L,
> where
L::Target: Logger,
>
{
/// Initializes a new [`GossipSync::Rapid`] variant.
pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
GossipSync<
&P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
&RapidGossipSync<&'a NetworkGraph<L>, L>,
&'a NetworkGraph<L>,
&'a (dyn UtxoLookup + Send + Sync),
L,
> where
L::Target: Logger,
>
{
/// Initializes a new [`GossipSync::None`] variant.
pub fn none() -> Self {
GossipSync::None
}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
if let Event::PaymentPathFailed {
failure: PathFailure::OnPath { network_update: Some(ref upd) },
..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
Arc<
dyn AOnionMessenger<
EntropySource = dyn EntropySource + Send + Sync,
ES = &(dyn EntropySource + Send + Sync),
NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
Logger = dyn Logger + Send + Sync,
L = &'static (dyn Logger + Send + Sync),
NodeIdLookUp = DynChannelManager,
EntropySource = &(dyn EntropySource + Send + Sync),
NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
Logger = &'static (dyn Logger + Send + Sync),
NL = &'static DynChannelManager,
MessageRouter = DynMessageRouter,
MR = &'static DynMessageRouter,
OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
MessageRouter = &'static DynMessageRouter,
OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
APH = lightning::ln::peer_handler::IgnoringMessageHandler,
DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
> + Send
+ Sync,
>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
Arc<
dyn ALiquidityManager<
EntropySource = dyn EntropySource + Send + Sync,
ES = &(dyn EntropySource + Send + Sync),
NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
EntropySource = &(dyn EntropySource + Send + Sync),
NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
AChannelManager = DynChannelManager,
CM = &DynChannelManager,
Filter = dyn chain::Filter + Send + Sync,
C = &(dyn chain::Filter + Send + Sync),
KVStore = DummyKVStore,
K = &DummyKVStore,
TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
+ Send
+ Sync,
T = &(dyn BroadcasterInterface + Send + Sync),
BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
+ Send
+ Sync),
> + Send
+ Sync,
>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
Arc<
dyn ALiquidityManagerSync<
EntropySource = dyn EntropySource + Send + Sync,
ES = &(dyn EntropySource + Send + Sync),
NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
EntropySource = &(dyn EntropySource + Send + Sync),
NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
AChannelManager = DynChannelManager,
CM = &DynChannelManager,
Filter = dyn chain::Filter + Send + Sync,
C = &(dyn chain::Filter + Send + Sync),
KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
+ Send
+ Sync,
T = &(dyn BroadcasterInterface + Send + Sync),
BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
+ Send
+ Sync),
> + Send
+ Sync,
>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
'a,
UL: Deref,
CF: Deref,
T: Deref,
F: Deref,
UL: UtxoLookup,
CF: chain::Filter,
T: BroadcasterInterface,
F: FeeEstimator,
G: Deref<Target = NetworkGraph<L>>,
L: Deref,
L: Logger,
P: Deref,
EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
EventHandler: Fn(Event) -> EventHandlerFuture,
ES: Deref,
ES: EntropySource,
M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
CM: Deref,
OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
PM: Deref,
LM: Deref,
D: Deref,
O: Deref,
K: Deref,
O: OutputSpender,
K: KVStore,
OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
S: Deref<Target = SC>,
SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
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: OutputSpender,
D::Target: ChangeDestinationSource,
K::Target: KVStore,
{
let async_event_handler = |event| {
let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
CF: Deref,
T: Deref,
F: Deref,
UL: UtxoLookup,
CF: chain::Filter,
T: BroadcasterInterface,
F: FeeEstimator,
G: Deref<Target = NetworkGraph<L>>,
L: Deref,
L: Logger,
P: Deref,
EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
EventHandler: Fn(Event) -> EventHandlerFuture,
ES: Deref,
ES: EntropySource,
M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
CM: Deref,
OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
PM: Deref,
LM: Deref,
D: Deref,
O: Deref,
O: OutputSpender,
K: Deref,
OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
D::Target: ChangeDestinationSourceSync,
K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
pub fn start<
'a,
UL: 'static + Deref,
CF: 'static + Deref,
T: 'static + Deref,
F: 'static + Deref + Send,
UL: 'static + UtxoLookup,
CF: 'static + chain::Filter,
T: 'static + BroadcasterInterface,
F: 'static + FeeEstimator + Send,
G: 'static + Deref<Target = NetworkGraph<L>>,
L: 'static + Deref + Send,
P: 'static + Deref,
EH: 'static + EventHandler + Send,
ES: 'static + Deref + Send,
ES: 'static + EntropySource + Send,
M: 'static
+ Deref<
Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
S: 'static + Deref<Target = SC> + Send + Sync,
SC: for<'b> WriteableScore<'b>,
D: 'static + Deref,
O: 'static + Deref,
O: 'static + OutputSpender,
K: 'static + Deref + Send,
OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
) -> Self
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,
CM::Target: AChannelManager,
OM::Target: AOnionMessenger,
PM::Target: APeerManager,
LM::Target: ALiquidityManagerSync,
D::Target: ChangeDestinationSourceSync,
O::Target: 'static + OutputSpender,
K::Target: 'static + KVStoreSync,
{
let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down
10 changes: 0 additions & 10 deletions lightning-block-sync/src/gossip.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
Blocks::Target: UtxoSource,
{
type Target = Self;
fn deref(&self) -> &Self {
self
}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
Blocks::Target: UtxoSource,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

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

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

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

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading

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

Skip to content
Drop Deref indirection for most trait parameters#4311

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

valentinewallace
merged 16 commits into

from

Jan 30, 2026
 Merged


Drop Deref indirection for most trait parameters
#4311
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
26f6cbb

Bump lightning-liquidity version


valentinewallace Jan 14, 2026
aa9feac

Drop Deref indirection for BroadcasterInterface


valentinewallace Jan 13, 2026
32e6e10

Drop Deref indirection for EntropySource


valentinewallace Jan 14, 2026
fb2759e

Drop Deref indirection for NodeSigner


valentinewallace Jan 14, 2026
b6f3670

Drop Deref indirection for FeeEstimator


valentinewallace Jan 14, 2026
3f8f1ba

Drop Deref indirection for Router


valentinewallace Jan 14, 2026
dcb81f9

Drop Deref indirection for MessageRouter


valentinewallace Jan 15, 2026
ac8074e

Drop Deref indirection for Logger


valentinewallace Jan 15, 2026
9432adb

Drop Deref indirection for SignerProvider


valentinewallace Jan 15, 2026
54a8858

Drop Deref indirection for chain::Watch


valentinewallace Jan 15, 2026
75b29b8

Drop Deref indirection for KVStore


valentinewallace Jan 15, 2026
9e81ce9

Drop Deref indirection for NodeIdLookup


valentinewallace Jan 15, 2026
c35b41b

Drop Deref indirection for message handler traits


valentinewallace Jan 15, 2026
f60a33f

Drop Deref indirection for chain::Filter


valentinewallace Jan 17, 2026
644ca0c

Drop Deref indirection for OutputSpender


valentinewallace Jan 20, 2026
101d206

Drop Deref indirection for UtxoLookup


valentinewallace Jan 20, 2026

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,14 @@ bitcoin_hashes = { version = "0.14.0", default-features = false }
bitcoin-io = { version = "0.1.2", default-features = false }
lightning = { version = "0.3.0", path = "../lightning", default-features = false }
lightning-rapid-gossip-sync = { version = "0.2.0", path = "../lightning-rapid-gossip-sync", default-features = false }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false }
possiblyrandom = { version = "0.2", path = "../possiblyrandom", default-features = false }

[dev-dependencies]
tokio = { version = "1.35", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
lightning = { version = "0.3.0", path = "../lightning", features = ["_test_utils"] }
lightning-invoice = { version = "0.34.0", path = "../lightning-invoice" }
lightning-liquidity = { version = "0.2.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-liquidity = { version = "0.3.0", path = "../lightning-liquidity", default-features = false, features = ["_test_utils"] }
lightning-persister = { version = "0.2.0", path = "../lightning-persister" }

[lints]
Expand Down

155 changes: 51 additions & 104 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,12 +200,9 @@ pub enum GossipSync<
	P: Deref<Target = P2PGossipSync<G, U, L>>,
	R: Deref<Target = RapidGossipSync<G, L>>,
	G: Deref<Target = NetworkGraph<L>>,
	U: Deref,
	L: Deref,
> where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	U: UtxoLookup,
	L: Logger,
> {
	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
	P2P(P),
	/// Rapid gossip sync from a trusted server.
Expand All@@ -218,12 +215,9 @@ impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, R, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	fn network_graph(&self) -> Option<&G> {
 match self {
Expand DownExpand Up@@ -260,12 +254,9 @@ where
impl<
 P: Deref<Target = P2PGossipSync<G, U, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 U: Deref,
 L: Deref,
 U: UtxoLookup,
 L: Logger,
	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
where
	U::Target: UtxoLookup,
	L::Target: Logger,
{
	/// Initializes a new [`GossipSync::P2P`] variant.
	pub fn p2p(gossip_sync: P) -> Self {
Expand All@@ -278,16 +269,15 @@ impl<
 'a,
 R: Deref<Target = RapidGossipSync<G, L>>,
 G: Deref<Target = NetworkGraph<L>>,
 L: Deref,
 L: Logger,
	>
	GossipSync<
 &P2PGossipSync<G, &'a (dyn UtxoLookup + Send + Sync), L>,
 R,
 G,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::Rapid`] variant.
	pub fn rapid(gossip_sync: R) -> Self {
Expand All@@ -296,26 +286,22 @@ impl<
}

/// This is not exported to bindings users as the bindings concretize everything and have constructors for us
impl<'a, L: Deref>
impl<'a, L: Logger>
	GossipSync<
 &P2PGossipSync<&'a NetworkGraph<L>, &'a (dyn UtxoLookup + Send + Sync), L>,
 &RapidGossipSync<&'a NetworkGraph<L>, L>,
 &'a NetworkGraph<L>,
 &'a (dyn UtxoLookup + Send + Sync),
 L,
	> where
	L::Target: Logger,
	>
{
	/// Initializes a new [`GossipSync::None`] variant.
	pub fn none() -> Self {
 GossipSync::None
	}
}

fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
where
	L::Target: Logger,
{
fn handle_network_graph_update<L: Logger>(network_graph: &NetworkGraph<L>, event: &Event) {
	if let Event::PaymentPathFailed {
 failure: PathFailure::OnPath { network_update: Some(ref upd) },
 ..
Expand DownExpand Up@@ -420,24 +406,15 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
pub const NO_ONION_MESSENGER: Option<
	Arc<
 dyn AOnionMessenger<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = dyn Logger + Send + Sync,
 L = &'static (dyn Logger + Send + Sync),
 NodeIdLookUp = DynChannelManager,
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 Logger = &'static (dyn Logger + Send + Sync),
 NL = &'static DynChannelManager,
 MessageRouter = DynMessageRouter,
 MR = &'static DynMessageRouter,
 OffersMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 OMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 AsyncPaymentsMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 DNSResolverMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 CustomOnionMessageHandler = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = &'static lightning::ln::peer_handler::IgnoringMessageHandler,
 MessageRouter = &'static DynMessageRouter,
 OMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 APH = lightning::ln::peer_handler::IgnoringMessageHandler,
 DRH = lightning::ln::peer_handler::IgnoringMessageHandler,
 CMH = lightning::ln::peer_handler::IgnoringMessageHandler,
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -480,22 +457,17 @@ impl KVStore for DummyKVStore {
pub const NO_LIQUIDITY_MANAGER: Option<
	Arc<
 dyn ALiquidityManager<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStore = DummyKVStore,
 K = &DummyKVStore,
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand All@@ -507,22 +479,18 @@ pub const NO_LIQUIDITY_MANAGER: Option<
pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
	Arc<
 dyn ALiquidityManagerSync<
 EntropySource = dyn EntropySource + Send + Sync,
 ES = &(dyn EntropySource + Send + Sync),
 NodeSigner = dyn lightning::sign::NodeSigner + Send + Sync,
 NS = &(dyn lightning::sign::NodeSigner + Send + Sync),
 EntropySource = &(dyn EntropySource + Send + Sync),
 NodeSigner = &(dyn lightning::sign::NodeSigner + Send + Sync),
 AChannelManager = DynChannelManager,
 CM = &DynChannelManager,
 Filter = dyn chain::Filter + Send + Sync,
 C = &(dyn chain::Filter + Send + Sync),
 KVStoreSync = dyn lightning::util::persist::KVStoreSync + Send + Sync,
 KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
 BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync,
 T = &(dyn BroadcasterInterface + Send + Sync),
 BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 + Send
 + Sync),
 > + Send
 + Sync,
	>,
Expand DownExpand Up@@ -954,16 +922,16 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp
///```
pub async fn process_events_async<
	'a,
	UL: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -972,8 +940,8 @@ pub async fn process_events_async<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	K: Deref,
	O: OutputSpender,
	K: KVStore,
	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
	SC: for<'b> WriteableScore<'b>,
Expand All@@ -987,20 +955,12 @@ pub async fn process_events_async<
	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
) -> Result<(), lightning::io::Error>
where
	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: OutputSpender,
	D::Target: ChangeDestinationSource,
	K::Target: KVStore,
{
	let async_event_handler = |event| {
 let network_graph = gossip_sync.network_graph();
Expand DownExpand Up@@ -1455,16 +1415,16 @@ 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: Deref,
	CF: Deref,
	T: Deref,
	F: Deref,
	UL: UtxoLookup,
	CF: chain::Filter,
	T: BroadcasterInterface,
	F: FeeEstimator,
	G: Deref<Target = NetworkGraph<L>>,
	L: Deref,
	L: Logger,
	P: Deref,
	EventHandlerFuture: core::future::Future<Output = Result<(), ReplayEvent>>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	ES: Deref,
	ES: EntropySource,
	M: Deref<Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>>,
	CM: Deref,
	OM: Deref,
Expand All@@ -1473,7 +1433,7 @@ pub async fn process_events_async_with_kv_store_sync<
	PM: Deref,
	LM: Deref,
	D: Deref,
	O: Deref,
	O: OutputSpender,
	K: Deref,
	OS: Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>>,
	S: Deref<Target = SC>,
Expand All@@ -1488,18 +1448,11 @@ 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: 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: OutputSpender,
	D::Target: ChangeDestinationSourceSync,
	K::Target: KVStoreSync,
{
Expand DownExpand Up@@ -1569,15 +1522,15 @@ impl BackgroundProcessor {
	/// [`NetworkGraph::write`]: lightning::routing::gossip::NetworkGraph#impl-Writeable
	pub fn start<
 'a,
 UL: 'static + Deref,
 CF: 'static + Deref,
 T: 'static + Deref,
 F: 'static + Deref + Send,
 UL: 'static + UtxoLookup,
 CF: 'static + chain::Filter,
 T: 'static + BroadcasterInterface,
 F: 'static + FeeEstimator + Send,
 G: 'static + Deref<Target = NetworkGraph<L>>,
 L: 'static + Deref + Send,
 P: 'static + Deref,
 EH: 'static + EventHandler + Send,
 ES: 'static + Deref + Send,
 ES: 'static + EntropySource + Send,
 M: 'static
 + Deref<
 Target = ChainMonitor<<CM::Target as AChannelManager>::Signer, CF, T, F, L, P, ES>,
Expand All@@ -1593,7 +1546,7 @@ impl BackgroundProcessor {
 S: 'static + Deref<Target = SC> + Send + Sync,
 SC: for<'b> WriteableScore<'b>,
 D: 'static + Deref,
 O: 'static + Deref,
 O: 'static + OutputSpender,
 K: 'static + Deref + Send,
 OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
	>(
Expand All@@ -1602,19 +1555,13 @@ impl BackgroundProcessor {
 liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
	) -> Self
	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,
 CM::Target: AChannelManager,
 OM::Target: AOnionMessenger,
 PM::Target: APeerManager,
 LM::Target: ALiquidityManagerSync,
 D::Target: ChangeDestinationSourceSync,
 O::Target: 'static + OutputSpender,
 K::Target: 'static + KVStoreSync,
	{
 let stop_thread = Arc::new(AtomicBool::new(false));
Expand Down

10 changes: 0 additions & 10 deletions
lightning-block-sync/src/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,16 +239,6 @@ where
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> Deref for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
{
	type Target = Self;
	fn deref(&self) -> &Self {
 self
	}
}

impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone> UtxoLookup for GossipVerifier<S, Blocks>
where
	Blocks::Target: UtxoSource,
Expand Down
Loading
Loading