projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1927 from jkczyz/2022-12-invoice-rework
[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 7a8fada9c3c5b03663e586f137e05eb43c9b8903..23e4435a6f513a6e58ba8c428d32d6c031c46d35 100644
(file)
--- a/
lightning-block-sync/src/init.rs
+++ b/
lightning-block-sync/src/init.rs
@@
-49,8
+49,8
@@
BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
/// use lightning::chain::chaininterface::FeeEstimator;
/// use lightning::chain::keysinterface;
/// use lightning::chain::keysinterface::KeysInterface;
/// 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::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,26
+61,27
@@
BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
///
/// async fn init_sync<
/// B: BlockSource,
///
/// async fn init_sync<
/// B: BlockSource,
-/// K: KeysInterface<Signer = S>,
-/// S: keysinterface::Sign,
+/// K: KeysInterface,
/// T: BroadcasterInterface,
/// F: FeeEstimator,
/// T: BroadcasterInterface,
/// F: FeeEstimator,
+/// R: Router,
/// L: Logger,
/// C: chain::Filter,
/// L: Logger,
/// C: chain::Filter,
-/// P: chainmonitor::Persist<
S
>,
+/// P: chainmonitor::Persist<
K::Signer
>,
/// >(
/// block_source: &B,
/// >(
/// block_source: &B,
-/// chain_monitor: &ChainMonitor<
S
, &C, &T, &F, &L, &P>,
+/// chain_monitor: &ChainMonitor<
K::Signer
, &C, &T, &F, &L, &P>,
/// config: UserConfig,
/// keys_manager: &K,
/// tx_broadcaster: &T,
/// fee_estimator: &F,
/// config: UserConfig,
/// keys_manager: &K,
/// 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<
S
>)>::read(
+/// let (monitor_block_hash, mut monitor) = <(BlockHash, ChannelMonitor<
K::Signer
>)>::read(
/// &mut Cursor::new(&serialized_monitor), keys_manager).unwrap();
///
/// // Read the channel manager paired with the block hash when it was persisted.
/// &mut Cursor::new(&serialized_monitor), keys_manager).unwrap();
///
/// // Read the channel manager paired with the block hash when it was persisted.
@@
-91,11
+92,12
@@
BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
/// 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<
S, &ChainMonitor<S, &C, &T, &F, &L, &P>, &T, &K, &F
, &L>)>::read(
+/// <(BlockHash, ChannelManager<
&ChainMonitor<K::Signer, &C, &T, &F, &L, &P>, &T, &K, &F, &R
, &L>)>::read(
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
/// };
///
/// &mut Cursor::new(&serialized_manager), read_args).unwrap()
/// };
///