Skip to content

Commit 7a4e690

Browse files
valentinewallacevalentinewallace
committed
Optionally parameterize ChannelManager by a Router trait
This will be used in upcoming work to fetch routes on-the-fly for trampoline payments (only Some for public routing nodes).
1 parent 759266a commit 7a4e690

File tree

17 files changed

+256
-142
lines changed

17 files changed

+256
-142
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ use lightning::chain::transaction::OutPoint;
3838
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
3939
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
4040
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
41-
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
41+
use lightning::ln::channelmanager::{self, ChainParameters, ChannelDetails, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
4242
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
43-
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
43+
use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
4444
use lightning::ln::script::ShutdownScript;
4545
use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
4646
use lightning::util::errors::APIError;
@@ -49,7 +49,7 @@ use lightning::util::logger::Logger;
4949
use lightning::util::config::UserConfig;
5050
use lightning::util::events::MessageSendEventsProvider;
5151
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
52-
use lightning::routing::router::{Route, RouteHop};
52+
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
5353

5454
use crate::utils::test_logger::{self, Output};
5555
use crate::utils::test_persister::TestPersister;
@@ -85,6 +85,20 @@ impl FeeEstimator for FuzzEstimator {
8585
}
8686
}
8787

88+
struct FuzzRouter {}
89+
90+
impl Router for FuzzRouter {
91+
fn find_route(
92+
&self, _payer: &PublicKey, _params: &RouteParameters, _first_hops: Option<&[&ChannelDetails]>,
93+
_inflight_htlcs: InFlightHtlcs
94+
) -> Result<Route, msgs::LightningError> {
95+
Err(msgs::LightningError {
96+
err: String::from("Not implemented"),
97+
action: msgs::ErrorAction::IgnoreError
98+
})
99+
}
100+
}
101+
88102
pub struct TestBroadcaster {}
89103
impl BroadcasterInterface for TestBroadcaster {
90104
fn broadcast_transaction(&self, _tx: &Transaction) { }
@@ -292,7 +306,7 @@ fn check_payment_err(send_err: PaymentSendFailure) {
292306
}
293307
}
294308

295-
type ChanMan = ChannelManager<Arc<TestChainMonitor>, Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<dyn Logger>>;
309+
type ChanMan = ChannelManager<Arc<TestChainMonitor>, Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<FuzzRouter>, Arc<dyn Logger>>;
296310

297311
#[inline]
298312
fn get_payment_secret_hash(dest: &ChanMan, payment_id: &mut u8) -> Option<(PaymentSecret, PaymentHash)> {
@@ -363,6 +377,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
363377
pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
364378
let out = SearchingOutput::new(underlying_out);
365379
let broadcast = Arc::new(TestBroadcaster{});
380+
let router = Arc::new(FuzzRouter {});
366381

367382
macro_rules! make_node {
368383
($node_id: expr, $fee_estimator: expr) => { {
@@ -381,7 +396,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
381396
network,
382397
best_block: BestBlock::from_genesis(network),
383398
};
384-
(ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, params),
399+
(ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), Some(router.clone()), Arc::clone(&logger), keys_manager.clone(), config, params),
385400
monitor, keys_manager)
386401
} }
387402
}
@@ -415,6 +430,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
415430
fee_estimator: $fee_estimator.clone(),
416431
chain_monitor: chain_monitor.clone(),
417432
tx_broadcaster: broadcast.clone(),
433+
router: Some(router.clone()),
418434
logger,
419435
default_config: config,
420436
channel_monitors: monitor_refs,

‎fuzz/src/full_stack.rs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ use lightning::chain::chainmonitor;
3535
use lightning::chain::transaction::OutPoint;
3636
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
3737
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
38-
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
38+
use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentId};
3939
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
40-
use lightning::ln::msgs::DecodeError;
40+
use lightning::ln::msgs::{self, DecodeError};
4141
use lightning::ln::script::ShutdownScript;
4242
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
43-
use lightning::routing::router::{find_route, PaymentParameters, RouteParameters};
43+
use lightning::routing::router::{find_route, InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
4444
use lightning::routing::scoring::FixedPenaltyScorer;
4545
use lightning::util::config::UserConfig;
4646
use lightning::util::errors::APIError;
@@ -127,6 +127,20 @@ impl FeeEstimator for FuzzEstimator {
127127
}
128128
}
129129

130+
struct FuzzRouter {}
131+
132+
impl Router for FuzzRouter {
133+
fn find_route(
134+
&self, _payer: &PublicKey, _params: &RouteParameters, _first_hops: Option<&[&ChannelDetails]>,
135+
_inflight_htlcs: InFlightHtlcs
136+
) -> Result<Route, msgs::LightningError> {
137+
Err(msgs::LightningError {
138+
err: String::from("Not implemented"),
139+
action: msgs::ErrorAction::IgnoreError
140+
})
141+
}
142+
}
143+
130144
struct TestBroadcaster {
131145
txn_broadcasted: Mutex<Vec<Transaction>>,
132146
}
@@ -164,7 +178,7 @@ impl<'a> std::hash::Hash for Peer<'a> {
164178

165179
type ChannelMan = ChannelManager<
166180
Arc<chainmonitor::ChainMonitor<EnforcingSigner, Arc<dyn chain::Filter>, Arc<TestBroadcaster>, Arc<FuzzEstimator>, Arc<dyn Logger>, Arc<TestPersister>>>,
167-
Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<dyn Logger>>;
181+
Arc<TestBroadcaster>, Arc<KeyProvider>, Arc<FuzzEstimator>, Arc<FuzzRouter>, Arc<dyn Logger>>;
168182
type PeerMan<'a> = PeerManager<Peer<'a>, Arc<ChannelMan>, Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn chain::Access>, Arc<dyn Logger>>>, IgnoringMessageHandler, Arc<dyn Logger>, IgnoringMessageHandler>;
169183

170184
struct MoneyLossDetector<'a> {
@@ -360,6 +374,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
360374
let fee_est = Arc::new(FuzzEstimator {
361375
input: input.clone(),
362376
});
377+
let router = Arc::new(FuzzRouter {});
363378

364379
macro_rules! get_slice {
365380
($len: expr) => {
@@ -399,7 +414,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
399414
network,
400415
best_block: BestBlock::from_genesis(network),
401416
};
402-
let channelmanager = Arc::new(ChannelManager::new(fee_est.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, params));
417+
let channelmanager = Arc::new(ChannelManager::new(fee_est.clone(), monitor.clone(), broadcast.clone(), Some(router), Arc::clone(&logger), keys_manager.clone(), config, params));
403418
// Adding new calls to `KeysInterface::get_secure_random_bytes` during startup can change all the
404419
// keys subsequently generated in this test. Rather than regenerating all the messages manually,
405420
// it's easier to just increment the counter here so the keys don't change.

‎lightning-background-processor/src/lib.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use lightning::ln::channelmanager::ChannelManager;
2222
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
2323
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
2424
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
25+
use lightning::routing::router::Router;
2526
use lightning::routing::scoring::WriteableScore;
2627
use lightning::util::events::{Event, EventHandler, EventsProvider};
2728
use lightning::util::logger::Logger;
@@ -372,6 +373,7 @@ pub async fn process_events_async<
372373
T: 'static + Deref + Send + Sync,
373374
K: 'static + Deref + Send + Sync,
374375
F: 'static + Deref + Send + Sync,
376+
R: 'static + Deref + Send + Sync,
375377
G: 'static + Deref<Target = NetworkGraph<L>> + Send + Sync,
376378
L: 'static + Deref + Send + Sync,
377379
P: 'static + Deref + Send + Sync,
@@ -382,7 +384,7 @@ pub async fn process_events_async<
382384
EH: 'static + EventHandler + Send,
383385
PS: 'static + Deref + Send,
384386
M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
385-
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
387+
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, R, L>> + Send + Sync,
386388
PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
387389
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
388390
UMH: 'static + Deref + Send + Sync,
@@ -403,13 +405,14 @@ where
403405
T::Target: 'static + BroadcasterInterface,
404406
K::Target: 'static + KeysInterface<Signer = Signer>,
405407
F::Target: 'static + FeeEstimator,
408+
R::Target: 'static + Router,
406409
L::Target: 'static + Logger,
407410
P::Target: 'static + Persist<Signer>,
408411
CMH::Target: 'static + ChannelMessageHandler,
409412
OMH::Target: 'static + OnionMessageHandler,
410413
RMH::Target: 'static + RoutingMessageHandler,
411414
UMH::Target: 'static + CustomMessageHandler,
412-
PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
415+
PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, R, L, SC>,
413416
{
414417
let mut should_continue = true;
415418
define_run_body!(persister, event_handler, chain_monitor, channel_manager,
@@ -478,6 +481,7 @@ impl BackgroundProcessor {
478481
T: 'static + Deref + Send + Sync,
479482
K: 'static + Deref + Send + Sync,
480483
F: 'static + Deref + Send + Sync,
484+
R: 'static + Deref + Send + Sync,
481485
G: 'static + Deref<Target = NetworkGraph<L>> + Send + Sync,
482486
L: 'static + Deref + Send + Sync,
483487
P: 'static + Deref + Send + Sync,
@@ -488,7 +492,7 @@ impl BackgroundProcessor {
488492
EH: 'static + EventHandler + Send,
489493
PS: 'static + Deref + Send,
490494
M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
491-
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
495+
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, R, L>> + Send + Sync,
492496
PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
493497
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
494498
UMH: 'static + Deref + Send + Sync,
@@ -506,13 +510,14 @@ impl BackgroundProcessor {
506510
T::Target: 'static + BroadcasterInterface,
507511
K::Target: 'static + KeysInterface<Signer = Signer>,
508512
F::Target: 'static + FeeEstimator,
513+
R::Target: 'static + Router,
509514
L::Target: 'static + Logger,
510515
P::Target: 'static + Persist<Signer>,
511516
CMH::Target: 'static + ChannelMessageHandler,
512517
OMH::Target: 'static + OnionMessageHandler,
513518
RMH::Target: 'static + RoutingMessageHandler,
514519
UMH::Target: 'static + CustomMessageHandler,
515-
PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, L, SC>,
520+
PS::Target: 'static + Persister<'a, Signer, CW, T, K, F, R, L, SC>,
516521
{
517522
let stop_thread = Arc::new(AtomicBool::new(false));
518523
let stop_thread_clone = stop_thread.clone();
@@ -625,7 +630,7 @@ mod tests {
625630
type RGS = Arc<RapidGossipSync<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestLogger>>>;
626631

627632
struct Node {
628-
node: Arc<SimpleArcChannelManager<ChainMonitor, test_utils::TestBroadcaster, test_utils::TestFeeEstimator, test_utils::TestLogger>>,
633+
node: Arc<SimpleArcChannelManager<ChainMonitor, test_utils::TestBroadcaster, test_utils::TestFeeEstimator, test_utils::TestRouter, test_utils::TestLogger>>,
629634
p2p_gossip_sync: PGS,
630635
rapid_gossip_sync: RGS,
631636
peer_manager: Arc<PeerManager<TestDescriptor, Arc<test_utils::TestChannelMessageHandler>, Arc<test_utils::TestRoutingMessageHandler>, IgnoringMessageHandler, Arc<test_utils::TestLogger>, IgnoringMessageHandler>>,
@@ -732,6 +737,7 @@ mod tests {
732737
for i in 0..num_nodes {
733738
let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))});
734739
let fee_estimator = Arc::new(test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) });
740+
let router = Arc::new(test_utils::TestRouter { });
735741
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
736742
let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
737743
let persister = Arc::new(FilesystemPersister::new(format!("{}_persister_{}", persist_dir, i)));
@@ -743,7 +749,7 @@ mod tests {
743749
let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
744750
let best_block = BestBlock::from_genesis(network);
745751
let params = ChainParameters { network, best_block };
746-
let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), logger.clone(), keys_manager.clone(), UserConfig::default(), params));
752+
let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Some(router.clone()), logger.clone(), keys_manager.clone(), UserConfig::default(), params));
747753
let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
748754
let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
749755
let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));

‎lightning-block-sync/src/init.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
4949
/// use lightning::chain::chaininterface::FeeEstimator;
5050
/// use lightning::chain::keysinterface;
5151
/// use lightning::chain::keysinterface::KeysInterface;
52-
/// use lightning::ln::channelmanager::ChannelManager;
53-
/// use lightning::ln::channelmanager::ChannelManagerReadArgs;
52+
/// use lightning::ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
53+
/// use lightning::routing::router::Router;
5454
/// use lightning::util::config::UserConfig;
5555
/// use lightning::util::logger::Logger;
5656
/// use lightning::util::ser::ReadableArgs;
@@ -65,6 +65,7 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
6565
/// S: keysinterface::Sign,
6666
/// T: BroadcasterInterface,
6767
/// F: FeeEstimator,
68+
/// R: Router,
6869
/// L: Logger,
6970
/// C: chain::Filter,
7071
/// P: chainmonitor::Persist<S>,
@@ -75,6 +76,7 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
7576
/// keys_manager: &K,
7677
/// tx_broadcaster: &T,
7778
/// fee_estimator: &F,
79+
/// router: &R,
7880
/// logger: &L,
7981
/// persister: &P,
8082
/// ) {
@@ -91,11 +93,12 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
9193
/// fee_estimator,
9294
/// chain_monitor,
9395
/// tx_broadcaster,
96+
/// Some(router),
9497
/// logger,
9598
/// config,
9699
/// vec![&mut monitor],
97100
/// );
98-
/// <(BlockHash, ChannelManager<&ChainMonitor<S, &C, &T, &F, &L, &P>, &T, &K, &F, &L>)>::read(
101+
/// <(BlockHash, ChannelManager<&ChainMonitor<S, &C, &T, &F, &L, &P>, &T, &K, &F, &R, &L>)>::read(
99102
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
100103
/// };
101104
///

‎lightning-invoice/src/utils.rs

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,16 @@ where
235235
///
236236
/// `invoice_expiry_delta_secs` describes the number of seconds that the invoice is valid for
237237
/// in excess of the current time.
238-
pub fn create_invoice_from_channelmanager<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
239-
channelmanager: &ChannelManager<M, T, K, F, L>, keys_manager: K, logger: L,
238+
pub fn create_invoice_from_channelmanager<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref>(
239+
channelmanager: &ChannelManager<M, T, K, F, R, L>, keys_manager: K, logger: L,
240240
network: Currency, amt_msat: Option<u64>, description: String, invoice_expiry_delta_secs: u32
241241
) -> Result<Invoice, SignOrCreationError<()>>
242242
where
243243
M::Target: chain::Watch<<K::Target as KeysInterface>::Signer>,
244244
T::Target: BroadcasterInterface,
245245
K::Target: KeysInterface,
246246
F::Target: FeeEstimator,
247+
R::Target: Router,
247248
L::Target: Logger,
248249
{
249250
use std::time::SystemTime;
@@ -265,8 +266,8 @@ where
265266
///
266267
/// `invoice_expiry_delta_secs` describes the number of seconds that the invoice is valid for
267268
/// in excess of the current time.
268-
pub fn create_invoice_from_channelmanager_with_description_hash<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
269-
channelmanager: &ChannelManager<M, T, K, F, L>, keys_manager: K, logger: L,
269+
pub fn create_invoice_from_channelmanager_with_description_hash<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref>(
270+
channelmanager: &ChannelManager<M, T, K, F, R, L>, keys_manager: K, logger: L,
270271
network: Currency, amt_msat: Option<u64>, description_hash: Sha256,
271272
invoice_expiry_delta_secs: u32
272273
) -> Result<Invoice, SignOrCreationError<()>>
@@ -275,6 +276,7 @@ where
275276
T::Target: BroadcasterInterface,
276277
K::Target: KeysInterface,
277278
F::Target: FeeEstimator,
279+
R::Target: Router,
278280
L::Target: Logger,
279281
{
280282
use std::time::SystemTime;
@@ -292,8 +294,8 @@ where
292294
/// See [`create_invoice_from_channelmanager_with_description_hash`]
293295
/// This version can be used in a `no_std` environment, where [`std::time::SystemTime`] is not
294296
/// available and the current time is supplied by the caller.
295-
pub fn create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
296-
channelmanager: &ChannelManager<M, T, K, F, L>, keys_manager: K, logger: L,
297+
pub fn create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref>(
298+
channelmanager: &ChannelManager<M, T, K, F, R, L>, keys_manager: K, logger: L,
297299
network: Currency, amt_msat: Option<u64>, description_hash: Sha256,
298300
duration_since_epoch: Duration, invoice_expiry_delta_secs: u32
299301
) -> Result<Invoice, SignOrCreationError<()>>
@@ -302,6 +304,7 @@ where
302304
T::Target: BroadcasterInterface,
303305
K::Target: KeysInterface,
304306
F::Target: FeeEstimator,
307+
R::Target: Router,
305308
L::Target: Logger,
306309
{
307310
_create_invoice_from_channelmanager_and_duration_since_epoch(
@@ -314,8 +317,8 @@ where
314317
/// See [`create_invoice_from_channelmanager`]
315318
/// This version can be used in a `no_std` environment, where [`std::time::SystemTime`] is not
316319
/// available and the current time is supplied by the caller.
317-
pub fn create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
318-
channelmanager: &ChannelManager<M, T, K, F, L>, keys_manager: K, logger: L,
320+
pub fn create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref>(
321+
channelmanager: &ChannelManager<M, T, K, F, R, L>, keys_manager: K, logger: L,
319322
network: Currency, amt_msat: Option<u64>, description: String, duration_since_epoch: Duration,
320323
invoice_expiry_delta_secs: u32
321324
) -> Result<Invoice, SignOrCreationError<()>>
@@ -324,6 +327,7 @@ where
324327
T::Target: BroadcasterInterface,
325328
K::Target: KeysInterface,
326329
F::Target: FeeEstimator,
330+
R::Target: Router,
327331
L::Target: Logger,
328332
{
329333
_create_invoice_from_channelmanager_and_duration_since_epoch(
@@ -335,8 +339,8 @@ where
335339
)
336340
}
337341

338-
fn _create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
339-
channelmanager: &ChannelManager<M, T, K, F, L>, keys_manager: K, logger: L,
342+
fn _create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref>(
343+
channelmanager: &ChannelManager<M, T, K, F, R, L>, keys_manager: K, logger: L,
340344
network: Currency, amt_msat: Option<u64>, description: InvoiceDescription,
341345
duration_since_epoch: Duration, invoice_expiry_delta_secs: u32
342346
) -> Result<Invoice, SignOrCreationError<()>>
@@ -345,6 +349,7 @@ where
345349
T::Target: BroadcasterInterface,
346350
K::Target: KeysInterface,
347351
F::Target: FeeEstimator,
352+
R::Target: Router,
348353
L::Target: Logger,
349354
{
350355
// `create_inbound_payment` only returns an error if the amount is greater than the total bitcoin
@@ -590,12 +595,13 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, S: Deref> ScoringRouter for D
590595
}
591596
}
592597

593-
impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> Payer for ChannelManager<M, T, K, F, L>
598+
impl<M: Deref, T: Deref, K: Deref, F: Deref, R: Deref, L: Deref> Payer for ChannelManager<M, T, K, F, R, L>
594599
where
595600
M::Target: chain::Watch<<K::Target as KeysInterface>::Signer>,
596601
T::Target: BroadcasterInterface,
597602
K::Target: KeysInterface,
598603
F::Target: FeeEstimator,
604+
R::Target: Router,
599605
L::Target: Logger,
600606
{
601607
fn node_id(&self) -> PublicKey {

0 commit comments

Comments
 (0)