Skip to content

Introduce Flow utilities and OffersMessageFlow implementation #3639

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.

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
24 changes: 21 additions & 3 deletions lightning-background-processor/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1081,11 +1081,14 @@ mod tests {
IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor,
};
use lightning::ln::types::ChannelId;
use lightning::offers::flow::OffersMessageFlow;
use lightning::onion_message::messenger::{DefaultMessageRouter, OnionMessenger};
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
use lightning::routing::router::{CandidateRouteHop, DefaultRouter, Path, RouteHop};
use lightning::routing::scoring::{ChannelUsage, LockableScore, ScoreLookUp, ScoreUpdate};
use lightning::sign::{ChangeDestinationSource, InMemorySigner, KeysManager};
use lightning::sign::{
ChangeDestinationSource, InMemorySigner, KeysManager, NodeSigner, Recipient,
};
use lightning::types::features::{ChannelFeatures, NodeFeatures};
use lightning::types::payment::PaymentHash;
use lightning::util::config::UserConfig;
@@ -1557,6 +1560,21 @@ mod tests {
network_graph.clone(),
Arc::clone(&keys_manager),
));
let best_block = BestBlock::from_network(network);
let params = ChainParameters { network, best_block };
let chain_hash = ChainHash::using_genesis_block(params.network);

let flow = OffersMessageFlow::new(
chain_hash,
params.best_block,
keys_manager.get_node_id(Recipient::Node).unwrap(),
genesis_block.header.time,
keys_manager.get_inbound_payment_key(),
keys_manager.clone(),
msg_router.clone(),
router.clone(),
);

let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
let kv_store =
Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -1569,14 +1587,14 @@ mod tests {
fee_estimator.clone(),
kv_store.clone(),
));
let best_block = BestBlock::from_network(network);
let params = ChainParameters { network, best_block };

let manager = Arc::new(ChannelManager::new(
fee_estimator.clone(),
chain_monitor.clone(),
tx_broadcaster.clone(),
router.clone(),
msg_router.clone(),
flow,
logger.clone(),
keys_manager.clone(),
keys_manager.clone(),
22 changes: 19 additions & 3 deletions lightning-liquidity/tests/common/mod.rs
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@
#![allow(unused_macros)]

use lightning::chain::Filter;
use lightning::sign::EntropySource;
use lightning::offers::flow::OffersMessageFlow;
use lightning::sign::{EntropySource, NodeSigner, Recipient};

use bitcoin::blockdata::constants::{genesis_block, ChainHash};
use bitcoin::blockdata::transaction::Transaction;
@@ -421,6 +422,22 @@ pub(crate) fn create_liquidity_node(
));
let msg_router =
Arc::new(DefaultMessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager)));

let best_block = BestBlock::from_network(network);
let chain_params = ChainParameters { network, best_block };
let chain_hash = ChainHash::using_genesis_block(chain_params.network);

let flow = OffersMessageFlow::new(
chain_hash,
chain_params.best_block,
keys_manager.get_node_id(Recipient::Node).unwrap(),
genesis_block.header.time,
keys_manager.get_inbound_payment_key(),
keys_manager.clone(),
msg_router.clone(),
router.clone(),
);

let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
let kv_store =
Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -431,14 +448,13 @@ pub(crate) fn create_liquidity_node(
fee_estimator.clone(),
kv_store.clone(),
));
let best_block = BestBlock::from_network(network);
let chain_params = ChainParameters { network, best_block };
let channel_manager = Arc::new(ChannelManager::new(
fee_estimator.clone(),
chain_monitor.clone(),
tx_broadcaster.clone(),
router.clone(),
msg_router.clone(),
flow,
logger.clone(),
keys_manager.clone(),
keys_manager.clone(),
Loading