mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-03-03 18:47:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make lightning-block-sync's init module slightly more generic

Browse source 
Users who want to use lightning-block-sync's init module would
be reasonable in wanting to use it in a multithreaded environment,
however because it takes a list of listeners as dyn chain::Listen
without any Send or Sync bound they fail in doing so.

Here we make the type bounds on `chain::Listen` generic across
`chain::Listen + ?Sized`, which the existing bound of `&dyn
chain::Listen` satisfies. Thus, this is strictly less restrictive
and allows for the use of `&dyn chain::Listen + Send + Sync`.
This commit is contained in:
Matt Corallo 2022-03-09 18:15:30 +00:00
parent 6259e7a674
commit 84a08dbf8a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lightning-block-sync/src/init.rs
View file

@ -121,11 +121,11 @@ BlockSourceResult<ValidatedBlockHeader> {
/// [`SpvClient`]: crate::SpvClient /// [`SpvClient`]: crate::SpvClient
/// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager /// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
/// [`ChannelMonitor`]: lightning::chain::channelmonitor::ChannelMonitor /// [`ChannelMonitor`]: lightning::chain::channelmonitor::ChannelMonitor
pub async fn synchronize_listeners<B: BlockSource, C: Cache>( pub async fn synchronize_listeners<'a, B: BlockSource, C: Cache, L: chain::Listen + ?Sized>(
block_source: &mut B, block_source: &mut B,
network: Network, network: Network,
header_cache: &mut C, header_cache: &mut C,
mut chain_listeners: Vec<(BlockHash, &dyn chain::Listen)>, mut chain_listeners: Vec<(BlockHash, &'a L)>,
) -> BlockSourceResult<ValidatedBlockHeader> { ) -> BlockSourceResult<ValidatedBlockHeader> {
let best_header = validate_best_block_header(block_source).await?; let best_header = validate_best_block_header(block_source).await?;
@ -198,9 +198,9 @@ impl<'a, C: Cache> Cache for ReadOnlyCache<'a, C> {
} }
/// Wrapper for supporting dynamically sized chain listeners. /// Wrapper for supporting dynamically sized chain listeners.
struct DynamicChainListener<'a>(&'a dyn chain::Listen); struct DynamicChainListener<'a, L: chain::Listen + ?Sized>(&'a L);
impl<'a> chain::Listen for DynamicChainListener<'a> { impl<'a, L: chain::Listen + ?Sized> chain::Listen for DynamicChainListener<'a, L> {
fn block_connected(&self, _block: &Block, _height: u32) { fn block_connected(&self, _block: &Block, _height: u32) {
unreachable!() unreachable!()
} }
@ -211,9 +211,9 @@ impl<'a> chain::Listen for DynamicChainListener<'a> {
} }
/// A set of dynamically sized chain listeners, each paired with a starting block height. /// A set of dynamically sized chain listeners, each paired with a starting block height.
struct ChainListenerSet<'a>(Vec<(u32, &'a dyn chain::Listen)>); struct ChainListenerSet<'a, L: chain::Listen + ?Sized>(Vec<(u32, &'a L)>);
impl<'a> chain::Listen for ChainListenerSet<'a> { impl<'a, L: chain::Listen + ?Sized> chain::Listen for ChainListenerSet<'a, L> {
fn block_connected(&self, block: &Block, height: u32) { fn block_connected(&self, block: &Block, height: u32) {
for (starting_height, chain_listener) in self.0.iter() { for (starting_height, chain_listener) in self.0.iter() {
if height > *starting_height { if height > *starting_height {