Skip to content

Commit 7131990

Browse files
committed
Introduce Flow parameter in ChannelManager
- Docs test failing
1 parent 136e08f commit 7131990

File tree

7 files changed

+183
-56
lines changed

7 files changed

+183
-56
lines changed

lightning-background-processor/src/lib.rs

+23-1
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@ mod tests {
10661066
use bitcoin::transaction::Version;
10671067
use bitcoin::transaction::{Transaction, TxOut};
10681068
use bitcoin::{Amount, ScriptBuf, Txid};
1069+
use lightning::offers::flow::OffersMessageFlow;
10691070
use core::sync::atomic::{AtomicBool, Ordering};
10701071
use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
10711072
use lightning::chain::transaction::OutPoint;
@@ -1087,7 +1088,7 @@ mod tests {
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::{ChangeDestinationSource, InMemorySigner, KeysManager, NodeSigner, Recipient};
10911092
use lightning::types::features::{ChannelFeatures, NodeFeatures};
10921093
use lightning::types::payment::PaymentHash;
10931094
use lightning::util::config::UserConfig;
@@ -1152,6 +1153,18 @@ mod tests {
11521153
Arc<KeysManager>,
11531154
>,
11541155
>,
1156+
Arc<
1157+
OffersMessageFlow<
1158+
Arc<KeysManager>,
1159+
Arc<
1160+
DefaultMessageRouter<
1161+
Arc<NetworkGraph<Arc<test_utils::TestLogger>>>,
1162+
Arc<test_utils::TestLogger>,
1163+
Arc<KeysManager>,
1164+
>,
1165+
>,
1166+
>
1167+
>,
11551168
Arc<test_utils::TestLogger>,
11561169
>;
11571170

@@ -1559,6 +1572,14 @@ mod tests {
15591572
network_graph.clone(),
15601573
Arc::clone(&keys_manager),
15611574
));
1575+
let flow = Arc::new(OffersMessageFlow::new(
1576+
network,
1577+
msg_router.clone(),
1578+
keys_manager.get_node_id(Recipient::Node).unwrap(),
1579+
genesis_block.header.time,
1580+
keys_manager.get_inbound_payment_key(),
1581+
keys_manager.clone(),
1582+
));
15621583
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
15631584
let kv_store =
15641585
Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -1579,6 +1600,7 @@ mod tests {
15791600
tx_broadcaster.clone(),
15801601
router.clone(),
15811602
msg_router.clone(),
1603+
flow.clone(),
15821604
logger.clone(),
15831605
keys_manager.clone(),
15841606
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)