projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make MAX_PATH_LENGTH_ESTIMATE const pub and expand doc comment.
[rust-lightning]
/
lightning-block-sync
/
src
/
init.rs
diff --git
a/lightning-block-sync/src/init.rs
b/lightning-block-sync/src/init.rs
index 893f4b5d4d854c3e44ebf64922c46f338278fd9d..ba93d12f5bcd7ff49d703e530c448b27707bd1a5 100644
(file)
--- a/
lightning-block-sync/src/init.rs
+++ b/
lightning-block-sync/src/init.rs
@@
-4,7
+4,7
@@
use crate::{BlockSource, BlockSourceResult, Cache, ChainNotifier};
use crate::poll::{ChainPoller, Validate, ValidatedBlockHeader};
use crate::{BlockSource, BlockSourceResult, Cache, ChainNotifier};
use crate::poll::{ChainPoller, Validate, ValidatedBlockHeader};
-use bitcoin::blockdata::block::
Block
Header;
+use bitcoin::blockdata::block::Header;
use bitcoin::hash_types::BlockHash;
use bitcoin::network::constants::Network;
use bitcoin::hash_types::BlockHash;
use bitcoin::network::constants::Network;
@@
-47,10
+47,10
@@
BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
/// use lightning::chain::channelmonitor::ChannelMonitor;
/// use lightning::chain::chaininterface::BroadcasterInterface;
/// use lightning::chain::chaininterface::FeeEstimator;
/// use lightning::chain::channelmonitor::ChannelMonitor;
/// use lightning::chain::chaininterface::BroadcasterInterface;
/// use lightning::chain::chaininterface::FeeEstimator;
-/// use lightning::
chain::keysinterface
;
-/// use lightning::
chain::keysinterface::KeysInterface
;
-/// use lightning::ln::channelmanager::
ChannelManager
;
-/// use lightning::
ln::channelmanager::ChannelManagerReadArgs
;
+/// use lightning::
sign
;
+/// use lightning::
sign::{EntropySource, NodeSigner, SignerProvider}
;
+/// use lightning::ln::channelmanager::
{ChannelManager, ChannelManagerReadArgs}
;
+/// use lightning::
routing::router::Router
;
/// use lightning::util::config::UserConfig;
/// use lightning::util::logger::Logger;
/// use lightning::util::ser::ReadableArgs;
/// use lightning::util::config::UserConfig;
/// use lightning::util::logger::Logger;
/// use lightning::util::ser::ReadableArgs;
@@
-61,40
+61,49
@@
BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
///
/// async fn init_sync<
/// B: BlockSource,
///
/// async fn init_sync<
/// B: BlockSource,
-/// K: KeysInterface,
+/// ES: EntropySource,
+/// NS: NodeSigner,
+/// SP: SignerProvider,
/// T: BroadcasterInterface,
/// F: FeeEstimator,
/// T: BroadcasterInterface,
/// F: FeeEstimator,
+/// R: Router,
/// L: Logger,
/// C: chain::Filter,
/// L: Logger,
/// C: chain::Filter,
-/// P: chainmonitor::Persist<
K::
Signer>,
+/// P: chainmonitor::Persist<
SP::Ecdsa
Signer>,
/// >(
/// block_source: &B,
/// >(
/// block_source: &B,
-/// chain_monitor: &ChainMonitor<
K::
Signer, &C, &T, &F, &L, &P>,
+/// chain_monitor: &ChainMonitor<
SP::Ecdsa
Signer, &C, &T, &F, &L, &P>,
/// config: UserConfig,
/// config: UserConfig,
-/// keys_manager: &K,
+/// entropy_source: &ES,
+/// node_signer: &NS,
+/// signer_provider: &SP,
/// tx_broadcaster: &T,
/// fee_estimator: &F,
/// tx_broadcaster: &T,
/// fee_estimator: &F,
+/// router: &R,
/// logger: &L,
/// persister: &P,
/// ) {
/// // Read a serialized channel monitor paired with the block hash when it was persisted.
/// let serialized_monitor = "...";
/// logger: &L,
/// persister: &P,
/// ) {
/// // Read a serialized channel monitor paired with the block hash when it was persisted.
/// let serialized_monitor = "...";
-/// let (monitor_block_hash, mut monitor) = <(BlockHash, ChannelMonitor<
K::
Signer>)>::read(
-/// &mut Cursor::new(&serialized_monitor),
keys_manager
).unwrap();
+/// let (monitor_block_hash, mut monitor) = <(BlockHash, ChannelMonitor<
SP::Ecdsa
Signer>)>::read(
+/// &mut Cursor::new(&serialized_monitor),
(entropy_source, signer_provider)
).unwrap();
///
/// // Read the channel manager paired with the block hash when it was persisted.
/// let serialized_manager = "...";
/// let (manager_block_hash, mut manager) = {
/// let read_args = ChannelManagerReadArgs::new(
///
/// // Read the channel manager paired with the block hash when it was persisted.
/// let serialized_manager = "...";
/// let (manager_block_hash, mut manager) = {
/// let read_args = ChannelManagerReadArgs::new(
-/// keys_manager,
+/// entropy_source,
+/// node_signer,
+/// signer_provider,
/// fee_estimator,
/// chain_monitor,
/// tx_broadcaster,
/// fee_estimator,
/// chain_monitor,
/// tx_broadcaster,
+/// router,
/// logger,
/// config,
/// vec![&mut monitor],
/// );
/// logger,
/// config,
/// vec![&mut monitor],
/// );
-/// <(BlockHash, ChannelManager<&ChainMonitor<
K::Signer, &C, &T, &F, &L, &P>, &T, &K, &F
, &L>)>::read(
+/// <(BlockHash, ChannelManager<&ChainMonitor<
SP::EcdsaSigner, &C, &T, &F, &L, &P>, &T, &ES, &NS, &SP, &F, &R
, &L>)>::read(
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
/// };
///
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
/// };
///
@@
-172,7
+181,7
@@
pub async fn synchronize_listeners<B: Deref + Sized + Send + Sync, C: Cache, L:
let chain_listener = &ChainListenerSet(chain_listeners_at_height);
let mut chain_notifier = ChainNotifier { header_cache, chain_listener };
chain_notifier.connect_blocks(common_ancestor, most_connected_blocks, &mut chain_poller)
let chain_listener = &ChainListenerSet(chain_listeners_at_height);
let mut chain_notifier = ChainNotifier { header_cache, chain_listener };
chain_notifier.connect_blocks(common_ancestor, most_connected_blocks, &mut chain_poller)
- .await.
or_else(|(e, _)| Err(e)
)?;
+ .await.
map_err(|(e, _)| e
)?;
}
Ok(best_header)
}
Ok(best_header)
@@
-202,11
+211,11
@@
impl<'a, C: Cache> Cache for ReadOnlyCache<'a, C> {
struct DynamicChainListener<'a, L: chain::Listen + ?Sized>(&'a L);
impl<'a, L: chain::Listen + ?Sized> chain::Listen for DynamicChainListener<'a, L> {
struct DynamicChainListener<'a, L: chain::Listen + ?Sized>(&'a L);
impl<'a, L: chain::Listen + ?Sized> chain::Listen for DynamicChainListener<'a, L> {
- fn filtered_block_connected(&self, _header: &
Block
Header, _txdata: &chain::transaction::TransactionData, _height: u32) {
+ fn filtered_block_connected(&self, _header: &Header, _txdata: &chain::transaction::TransactionData, _height: u32) {
unreachable!()
}
unreachable!()
}
- fn block_disconnected(&self, header: &
Block
Header, height: u32) {
+ fn block_disconnected(&self, header: &Header, height: u32) {
self.0.block_disconnected(header, height)
}
}
self.0.block_disconnected(header, height)
}
}
@@
-225,7
+234,7
@@
impl<'a, L: chain::Listen + ?Sized> chain::Listen for ChainListenerSet<'a, L> {
}
}
}
}
- fn filtered_block_connected(&self, header: &
Block
Header, txdata: &chain::transaction::TransactionData, height: u32) {
+ fn filtered_block_connected(&self, header: &Header, txdata: &chain::transaction::TransactionData, height: u32) {
for (starting_height, chain_listener) in self.0.iter() {
if height > *starting_height {
chain_listener.filtered_block_connected(header, txdata, height);
for (starting_height, chain_listener) in self.0.iter() {
if height > *starting_height {
chain_listener.filtered_block_connected(header, txdata, height);
@@
-233,7
+242,7
@@
impl<'a, L: chain::Listen + ?Sized> chain::Listen for ChainListenerSet<'a, L> {
}
}
}
}
- fn block_disconnected(&self, _header: &
Block
Header, _height: u32) {
+ fn block_disconnected(&self, _header: &Header, _height: u32) {
unreachable!()
}
}
unreachable!()
}
}
@@
-243,8
+252,6
@@
mod tests {
use crate::test_utils::{Blockchain, MockChainListener};
use super::*;
use crate::test_utils::{Blockchain, MockChainListener};
use super::*;
- use bitcoin::network::constants::Network;
-
#[tokio::test]
async fn sync_from_same_chain() {
let chain = Blockchain::default().with_height(4);
#[tokio::test]
async fn sync_from_same_chain() {
let chain = Blockchain::default().with_height(4);