Skip to content

Commit 9658d90

Browse files
committed
Introduce Flow parameter in ChannelManager
- Docs test failing
1 parent de24b92 commit 9658d90

File tree

7 files changed

+183
-55
lines changed

7 files changed

+183
-55
lines changed

lightning-background-processor/src/lib.rs

+25-1
Original file line numberDiff line numberDiff line change
@@ -1083,11 +1083,14 @@ mod tests {
10831083
IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor,
10841084
};
10851085
use lightning::ln::types::ChannelId;
1086+
use lightning::offers::flow::OffersMessageFlow;
10861087
use lightning::onion_message::messenger::{DefaultMessageRouter, OnionMessenger};
10871088
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
10881089
use lightning::routing::router::{CandidateRouteHop, DefaultRouter, Path, RouteHop};
10891090
use lightning::routing::scoring::{ChannelUsage, LockableScore, ScoreLookUp, ScoreUpdate};
1090-
use lightning::sign::{ChangeDestinationSource, InMemorySigner, KeysManager};
1091+
use lightning::sign::{
1092+
ChangeDestinationSource, InMemorySigner, KeysManager, NodeSigner, Recipient,
1093+
};
10911094
use lightning::types::features::{ChannelFeatures, NodeFeatures};
10921095
use lightning::types::payment::PaymentHash;
10931096
use lightning::util::config::UserConfig;
@@ -1152,6 +1155,18 @@ mod tests {
11521155
Arc<KeysManager>,
11531156
>,
11541157
>,
1158+
Arc<
1159+
OffersMessageFlow<
1160+
Arc<KeysManager>,
1161+
Arc<
1162+
DefaultMessageRouter<
1163+
Arc<NetworkGraph<Arc<test_utils::TestLogger>>>,
1164+
Arc<test_utils::TestLogger>,
1165+
Arc<KeysManager>,
1166+
>,
1167+
>,
1168+
>,
1169+
>,
11551170
Arc<test_utils::TestLogger>,
11561171
>;
11571172

@@ -1559,6 +1574,14 @@ mod tests {
15591574
network_graph.clone(),
15601575
Arc::clone(&keys_manager),
15611576
));
1577+
let flow = Arc::new(OffersMessageFlow::new(
1578+
network,
1579+
msg_router.clone(),
1580+
keys_manager.get_node_id(Recipient::Node).unwrap(),
1581+
genesis_block.header.time,
1582+
keys_manager.get_inbound_payment_key(),
1583+
keys_manager.clone(),
1584+
));
15621585
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
15631586
let kv_store =
15641587
Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -1579,6 +1602,7 @@ mod tests {
15791602
tx_broadcaster.clone(),
15801603
router.clone(),
15811604
msg_router.clone(),
1605+
flow.clone(),
15821606
logger.clone(),
15831607
keys_manager.clone(),
15841608
keys_manager.clone(),

lightning-liquidity/tests/common/mod.rs

+23-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#![allow(unused_macros)]
66

77
use lightning::chain::Filter;
8-
use lightning::sign::EntropySource;
8+
use lightning::offers::flow::OffersMessageFlow;
9+
use lightning::sign::{EntropySource, NodeSigner, Recipient};
910

1011
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
1112
use bitcoin::blockdata::transaction::Transaction;
@@ -91,6 +92,18 @@ type ChannelManager = channelmanager::ChannelManager<
9192
Arc<KeysManager>,
9293
>,
9394
>,
95+
Arc<
96+
OffersMessageFlow<
97+
Arc<KeysManager>,
98+
Arc<
99+
DefaultMessageRouter<
100+
Arc<NetworkGraph<Arc<test_utils::TestLogger>>>,
101+
Arc<test_utils::TestLogger>,
102+
Arc<KeysManager>,
103+
>,
104+
>,
105+
>,
106+
>,
94107
Arc<test_utils::TestLogger>,
95108
>;
96109

@@ -421,6 +434,14 @@ pub(crate) fn create_liquidity_node(
421434
));
422435
let msg_router =
423436
Arc::new(DefaultMessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager)));
437+
let flow = Arc::new(OffersMessageFlow::new(
438+
network,
439+
msg_router.clone(),
440+
keys_manager.get_node_id(Recipient::Node).unwrap(),
441+
genesis_block.header.time,
442+
keys_manager.get_inbound_payment_key(),
443+
keys_manager.clone(),
444+
));
424445
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
425446
let kv_store =
426447
Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -439,6 +460,7 @@ pub(crate) fn create_liquidity_node(
439460
tx_broadcaster.clone(),
440461
router.clone(),
441462
msg_router.clone(),
463+
flow.clone(),
442464
logger.clone(),
443465
keys_manager.clone(),
444466
keys_manager.clone(),

0 commit comments

Comments
 (0)