]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Utility for syncing a set of chain listeners
authorJeffrey Czyz <jkczyz@gmail.com>
Fri, 5 Feb 2021 03:20:03 +0000 (19:20 -0800)
committerJeffrey Czyz <jkczyz@gmail.com>
Mon, 22 Feb 2021 16:49:14 +0000 (08:49 -0800)
Add a utility for syncing a set of chain listeners to a common chain
tip. Required to use before creating an SpvClient when the chain
listener used with the client is actually a set of listeners each of
which may have had left off at a different block. This would occur when
the listeners had been persisted individually at different frequencies
(e.g., a ChainMonitor's individual ChannelMonitors).

lightning-block-sync/src/init.rs [new file with mode: 0644]
lightning-block-sync/src/lib.rs

diff --git a/lightning-block-sync/src/init.rs b/lightning-block-sync/src/init.rs
new file mode 100644 (file)
index 0000000..b8418fe
--- /dev/null
@@ -0,0 +1,267 @@
+use crate::{BlockSource, BlockSourceResult, Cache, ChainListener, ChainNotifier};
+use crate::poll::{ChainPoller, Validate, ValidatedBlockHeader};
+
+use bitcoin::blockdata::block::{Block, BlockHeader};
+use bitcoin::hash_types::BlockHash;
+use bitcoin::network::constants::Network;
+
+/// Performs a one-time sync of chain listeners using a single *trusted* block source, bringing each
+/// listener's view of the chain from its paired block hash to `block_source`'s best chain tip.
+///
+/// Upon success, the returned header can be used to initialize [`SpvClient`]. In the case of
+/// failure, each listener may be left at a different block hash than the one it was originally
+/// paired with.
+///
+/// Useful during startup to bring the [`ChannelManager`] and each [`ChannelMonitor`] in sync before
+/// switching to [`SpvClient`].
+///
+/// [`SpvClient`]: ../struct.SpvClient.html
+/// [`ChannelManager`]: ../../lightning/ln/channelmanager/struct.ChannelManager.html
+/// [`ChannelMonitor`]: ../../lightning/chain/channelmonitor/struct.ChannelMonitor.html
+pub async fn sync_listeners<B: BlockSource, C: Cache>(
+       block_source: &mut B,
+       network: Network,
+       header_cache: &mut C,
+       mut chain_listeners: Vec<(BlockHash, &mut dyn ChainListener)>,
+) -> BlockSourceResult<ValidatedBlockHeader> {
+       let (best_block_hash, best_block_height) = block_source.get_best_block().await?;
+       let new_header = block_source
+               .get_header(&best_block_hash, best_block_height).await?
+               .validate(best_block_hash)?;
+
+       // Fetch the header for the block hash paired with each listener.
+       let mut chain_listeners_with_old_headers = Vec::new();
+       for (old_block, chain_listener) in chain_listeners.drain(..) {
+               let old_header = match header_cache.look_up(&old_block) {
+                       Some(header) => *header,
+                       None => block_source
+                               .get_header(&old_block, None).await?
+                               .validate(old_block)?
+               };
+               chain_listeners_with_old_headers.push((old_header, chain_listener))
+       }
+
+       // Find differences and disconnect blocks for each listener individually.
+       let mut chain_poller = ChainPoller::new(block_source, network);
+       let mut chain_listeners_at_height = Vec::new();
+       let mut most_common_ancestor = None;
+       let mut most_connected_blocks = Vec::new();
+       for (old_header, chain_listener) in chain_listeners_with_old_headers.drain(..) {
+               // Disconnect any stale blocks, but keep them in the cache for the next iteration.
+               let header_cache = &mut ReadOnlyCache(header_cache);
+               let mut chain_notifier = ChainNotifier { header_cache };
+               let difference =
+                       chain_notifier.find_difference(new_header, &old_header, &mut chain_poller).await?;
+               chain_notifier.disconnect_blocks(
+                       difference.disconnected_blocks,
+                       &mut DynamicChainListener(chain_listener),
+               );
+
+               // Keep track of the most common ancestor and all blocks connected across all listeners.
+               chain_listeners_at_height.push((difference.common_ancestor.height, chain_listener));
+               if difference.connected_blocks.len() > most_connected_blocks.len() {
+                       most_common_ancestor = Some(difference.common_ancestor);
+                       most_connected_blocks = difference.connected_blocks;
+               }
+       }
+
+       // Connect new blocks for all listeners at once to avoid re-fetching blocks.
+       if let Some(common_ancestor) = most_common_ancestor {
+               let mut chain_notifier = ChainNotifier { header_cache };
+               let mut chain_listener = ChainListenerSet(chain_listeners_at_height);
+               chain_notifier.connect_blocks(
+                       common_ancestor,
+                       most_connected_blocks,
+                       &mut chain_poller,
+                       &mut chain_listener,
+               ).await.or_else(|(e, _)| Err(e))?;
+       }
+
+       Ok(new_header)
+}
+
+/// A wrapper to make a cache read-only.
+///
+/// Used to prevent losing headers that may be needed to disconnect blocks common to more than one
+/// listener.
+struct ReadOnlyCache<'a, C: Cache>(&'a mut C);
+
+impl<'a, C: Cache> Cache for ReadOnlyCache<'a, C> {
+       fn look_up(&self, block_hash: &BlockHash) -> Option<&ValidatedBlockHeader> {
+               self.0.look_up(block_hash)
+       }
+
+       fn block_connected(&mut self, _block_hash: BlockHash, _block_header: ValidatedBlockHeader) {
+               unreachable!()
+       }
+
+       fn block_disconnected(&mut self, _block_hash: &BlockHash) -> Option<ValidatedBlockHeader> {
+               None
+       }
+}
+
+/// Wrapper for supporting dynamically sized chain listeners.
+struct DynamicChainListener<'a>(&'a mut dyn ChainListener);
+
+impl<'a> ChainListener for DynamicChainListener<'a> {
+       fn block_connected(&mut self, _block: &Block, _height: u32) {
+               unreachable!()
+       }
+
+       fn block_disconnected(&mut self, header: &BlockHeader, height: u32) {
+               self.0.block_disconnected(header, height)
+       }
+}
+
+/// A set of dynamically sized chain listeners, each paired with a starting block height.
+struct ChainListenerSet<'a>(Vec<(u32, &'a mut dyn ChainListener)>);
+
+impl<'a> ChainListener for ChainListenerSet<'a> {
+       fn block_connected(&mut self, block: &Block, height: u32) {
+               for (starting_height, chain_listener) in self.0.iter_mut() {
+                       if height > *starting_height {
+                               chain_listener.block_connected(block, height);
+                       }
+               }
+       }
+
+       fn block_disconnected(&mut self, _header: &BlockHeader, _height: u32) {
+               unreachable!()
+       }
+}
+
+#[cfg(test)]
+mod tests {
+       use crate::test_utils::{Blockchain, MockChainListener};
+       use super::*;
+
+       use bitcoin::network::constants::Network;
+
+       #[tokio::test]
+       async fn sync_from_same_chain() {
+               let mut chain = Blockchain::default().with_height(4);
+
+               let mut listener_1 = MockChainListener::new()
+                       .expect_block_connected(*chain.at_height(2))
+                       .expect_block_connected(*chain.at_height(3))
+                       .expect_block_connected(*chain.at_height(4));
+               let mut listener_2 = MockChainListener::new()
+                       .expect_block_connected(*chain.at_height(3))
+                       .expect_block_connected(*chain.at_height(4));
+               let mut listener_3 = MockChainListener::new()
+                       .expect_block_connected(*chain.at_height(4));
+
+               let listeners = vec![
+                       (chain.at_height(1).block_hash, &mut listener_1 as &mut dyn ChainListener),
+                       (chain.at_height(2).block_hash, &mut listener_2 as &mut dyn ChainListener),
+                       (chain.at_height(3).block_hash, &mut listener_3 as &mut dyn ChainListener),
+               ];
+               let mut cache = chain.header_cache(0..=4);
+               match sync_listeners(&mut chain, Network::Bitcoin, &mut cache, listeners).await {
+                       Ok(header) => assert_eq!(header, chain.tip()),
+                       Err(e) => panic!("Unexpected error: {:?}", e),
+               }
+       }
+
+       #[tokio::test]
+       async fn sync_from_different_chains() {
+               let mut main_chain = Blockchain::default().with_height(4);
+               let fork_chain_1 = main_chain.fork_at_height(1);
+               let fork_chain_2 = main_chain.fork_at_height(2);
+               let fork_chain_3 = main_chain.fork_at_height(3);
+
+               let mut listener_1 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_1.at_height(4))
+                       .expect_block_disconnected(*fork_chain_1.at_height(3))
+                       .expect_block_disconnected(*fork_chain_1.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(4));
+               let mut listener_2 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_2.at_height(4))
+                       .expect_block_disconnected(*fork_chain_2.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(4));
+               let mut listener_3 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_3.at_height(4))
+                       .expect_block_connected(*main_chain.at_height(4));
+
+               let listeners = vec![
+                       (fork_chain_1.tip().block_hash, &mut listener_1 as &mut dyn ChainListener),
+                       (fork_chain_2.tip().block_hash, &mut listener_2 as &mut dyn ChainListener),
+                       (fork_chain_3.tip().block_hash, &mut listener_3 as &mut dyn ChainListener),
+               ];
+               let mut cache = fork_chain_1.header_cache(2..=4);
+               cache.extend(fork_chain_2.header_cache(3..=4));
+               cache.extend(fork_chain_3.header_cache(4..=4));
+               match sync_listeners(&mut main_chain, Network::Bitcoin, &mut cache, listeners).await {
+                       Ok(header) => assert_eq!(header, main_chain.tip()),
+                       Err(e) => panic!("Unexpected error: {:?}", e),
+               }
+       }
+
+       #[tokio::test]
+       async fn sync_from_overlapping_chains() {
+               let mut main_chain = Blockchain::default().with_height(4);
+               let fork_chain_1 = main_chain.fork_at_height(1);
+               let fork_chain_2 = fork_chain_1.fork_at_height(2);
+               let fork_chain_3 = fork_chain_2.fork_at_height(3);
+
+               let mut listener_1 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_1.at_height(4))
+                       .expect_block_disconnected(*fork_chain_1.at_height(3))
+                       .expect_block_disconnected(*fork_chain_1.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(4));
+               let mut listener_2 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_2.at_height(4))
+                       .expect_block_disconnected(*fork_chain_2.at_height(3))
+                       .expect_block_disconnected(*fork_chain_2.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(4));
+               let mut listener_3 = MockChainListener::new()
+                       .expect_block_disconnected(*fork_chain_3.at_height(4))
+                       .expect_block_disconnected(*fork_chain_3.at_height(3))
+                       .expect_block_disconnected(*fork_chain_3.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(2))
+                       .expect_block_connected(*main_chain.at_height(3))
+                       .expect_block_connected(*main_chain.at_height(4));
+
+               let listeners = vec![
+                       (fork_chain_1.tip().block_hash, &mut listener_1 as &mut dyn ChainListener),
+                       (fork_chain_2.tip().block_hash, &mut listener_2 as &mut dyn ChainListener),
+                       (fork_chain_3.tip().block_hash, &mut listener_3 as &mut dyn ChainListener),
+               ];
+               let mut cache = fork_chain_1.header_cache(2..=4);
+               cache.extend(fork_chain_2.header_cache(3..=4));
+               cache.extend(fork_chain_3.header_cache(4..=4));
+               match sync_listeners(&mut main_chain, Network::Bitcoin, &mut cache, listeners).await {
+                       Ok(header) => assert_eq!(header, main_chain.tip()),
+                       Err(e) => panic!("Unexpected error: {:?}", e),
+               }
+       }
+
+       #[tokio::test]
+       async fn cache_connected_and_keep_disconnected_blocks() {
+               let mut main_chain = Blockchain::default().with_height(2);
+               let fork_chain = main_chain.fork_at_height(1);
+               let new_tip = main_chain.tip();
+               let old_tip = fork_chain.tip();
+
+               let mut listener = MockChainListener::new()
+                       .expect_block_disconnected(*old_tip)
+                       .expect_block_connected(*new_tip);
+
+               let listeners = vec![(old_tip.block_hash, &mut listener as &mut dyn ChainListener)];
+               let mut cache = fork_chain.header_cache(2..=2);
+               match sync_listeners(&mut main_chain, Network::Bitcoin, &mut cache, listeners).await {
+                       Ok(_) => {
+                               assert!(cache.contains_key(&new_tip.block_hash));
+                               assert!(cache.contains_key(&old_tip.block_hash));
+                       },
+                       Err(e) => panic!("Unexpected error: {:?}", e),
+               }
+       }
+}
index 2d46c7d81045e1c54240f3a429018d4a9af25114..13e7cdaf0421319895155662c6b2fc3d7ada384a 100644 (file)
@@ -19,6 +19,7 @@
 #[cfg(any(feature = "rest-client", feature = "rpc-client"))]
 pub mod http;
 
+pub mod init;
 pub mod poll;
 
 #[cfg(feature = "rest-client")]
@@ -154,10 +155,10 @@ pub struct BlockHeaderData {
 /// custom cache eviction policy. This offers flexibility to those sensitive to resource usage.
 /// Hence, there is a trade-off between a lower memory footprint and potentially increased network
 /// I/O as headers are re-fetched during fork detection.
-pub struct SpvClient<P: Poll, C: Cache, L: ChainListener> {
+pub struct SpvClient<'a, P: Poll, C: Cache, L: ChainListener> {
        chain_tip: ValidatedBlockHeader,
        chain_poller: P,
-       chain_notifier: ChainNotifier<C>,
+       chain_notifier: ChainNotifier<'a, C>,
        chain_listener: L,
 }
 
@@ -214,7 +215,7 @@ impl Cache for UnboundedCache {
        }
 }
 
-impl<P: Poll, C: Cache, L: ChainListener> SpvClient<P, C, L> {
+impl<'a, P: Poll, C: Cache, L: ChainListener> SpvClient<'a, P, C, L> {
        /// Creates a new SPV client using `chain_tip` as the best known chain tip.
        ///
        /// Subsequent calls to [`poll_best_tip`] will poll for the best chain tip using the given chain
@@ -228,7 +229,7 @@ impl<P: Poll, C: Cache, L: ChainListener> SpvClient<P, C, L> {
        pub fn new(
                chain_tip: ValidatedBlockHeader,
                chain_poller: P,
-               header_cache: C,
+               header_cache: &'a mut C,
                chain_listener: L,
        ) -> Self {
                let chain_notifier = ChainNotifier { header_cache };
@@ -278,9 +279,9 @@ impl<P: Poll, C: Cache, L: ChainListener> SpvClient<P, C, L> {
 /// Notifies [listeners] of blocks that have been connected or disconnected from the chain.
 ///
 /// [listeners]: trait.ChainListener.html
-struct ChainNotifier<C: Cache> {
+pub struct ChainNotifier<'a, C: Cache> {
        /// Cache for looking up headers before fetching from a block source.
-       header_cache: C,
+       header_cache: &'a mut C,
 }
 
 /// Changes made to the chain between subsequent polls that transformed it from having one chain tip
@@ -289,6 +290,11 @@ struct ChainNotifier<C: Cache> {
 /// Blocks are given in height-descending order. Therefore, blocks are first disconnected in order
 /// before new blocks are connected in reverse order.
 struct ChainDifference {
+       /// The most recent ancestor common between the chain tips.
+       ///
+       /// If there are any disconnected blocks, this is where the chain forked.
+       common_ancestor: ValidatedBlockHeader,
+
        /// Blocks that were disconnected from the chain since the last poll.
        disconnected_blocks: Vec<ValidatedBlockHeader>,
 
@@ -296,9 +302,9 @@ struct ChainDifference {
        connected_blocks: Vec<ValidatedBlockHeader>,
 }
 
-impl<C: Cache> ChainNotifier<C> {
-       /// Finds the fork point between `new_header` and `old_header`, disconnecting blocks from
-       /// `old_header` to get to that point and then connecting blocks until `new_header`.
+impl<'a, C: Cache> ChainNotifier<'a, C> {
+       /// Finds the first common ancestor between `new_header` and `old_header`, disconnecting blocks
+       /// from `old_header` to get to that point and then connecting blocks until `new_header`.
        ///
        /// Validates headers along the transition path, but doesn't fetch blocks until the chain is
        /// disconnected to the fork point. Thus, this may return an `Err` that includes where the tip
@@ -311,30 +317,15 @@ impl<C: Cache> ChainNotifier<C> {
                chain_poller: &mut P,
                chain_listener: &mut L,
        ) -> Result<(), (BlockSourceError, Option<ValidatedBlockHeader>)> {
-               let mut difference = self.find_difference(new_header, old_header, chain_poller).await
+               let difference = self.find_difference(new_header, old_header, chain_poller).await
                        .map_err(|e| (e, None))?;
-
-               let mut new_tip = *old_header;
-               for header in difference.disconnected_blocks.drain(..) {
-                       if let Some(cached_header) = self.header_cache.block_disconnected(&header.block_hash) {
-                               assert_eq!(cached_header, header);
-                       }
-                       chain_listener.block_disconnected(&header.header, header.height);
-                       new_tip = header;
-               }
-
-               for header in difference.connected_blocks.drain(..).rev() {
-                       let block = chain_poller
-                               .fetch_block(&header).await
-                               .or_else(|e| Err((e, Some(new_tip))))?;
-                       debug_assert_eq!(block.block_hash, header.block_hash);
-
-                       self.header_cache.block_connected(header.block_hash, header);
-                       chain_listener.block_connected(&block, header.height);
-                       new_tip = header;
-               }
-
-               Ok(())
+               self.disconnect_blocks(difference.disconnected_blocks, chain_listener);
+               self.connect_blocks(
+                       difference.common_ancestor,
+                       difference.connected_blocks,
+                       chain_poller,
+                       chain_listener,
+               ).await
        }
 
        /// Returns the changes needed to produce the chain with `current_header` as its tip from the
@@ -371,7 +362,8 @@ impl<C: Cache> ChainNotifier<C> {
                        }
                }
 
-               Ok(ChainDifference { disconnected_blocks, connected_blocks })
+               let common_ancestor = current;
+               Ok(ChainDifference { common_ancestor, disconnected_blocks, connected_blocks })
        }
 
        /// Returns the previous header for the given header, either by looking it up in the cache or
@@ -386,6 +378,42 @@ impl<C: Cache> ChainNotifier<C> {
                        None => chain_poller.look_up_previous_header(header).await,
                }
        }
+
+       /// Notifies the chain listeners of disconnected blocks.
+       fn disconnect_blocks<L: ChainListener>(
+               &mut self,
+               mut disconnected_blocks: Vec<ValidatedBlockHeader>,
+               chain_listener: &mut L,
+       ) {
+               for header in disconnected_blocks.drain(..) {
+                       if let Some(cached_header) = self.header_cache.block_disconnected(&header.block_hash) {
+                               assert_eq!(cached_header, header);
+                       }
+                       chain_listener.block_disconnected(&header.header, header.height);
+               }
+       }
+
+       /// Notifies the chain listeners of connected blocks.
+       async fn connect_blocks<L: ChainListener, P: Poll>(
+               &mut self,
+               mut new_tip: ValidatedBlockHeader,
+               mut connected_blocks: Vec<ValidatedBlockHeader>,
+               chain_poller: &mut P,
+               chain_listener: &mut L,
+       ) -> Result<(), (BlockSourceError, Option<ValidatedBlockHeader>)> {
+               for header in connected_blocks.drain(..).rev() {
+                       let block = chain_poller
+                               .fetch_block(&header).await
+                               .or_else(|e| Err((e, Some(new_tip))))?;
+                       debug_assert_eq!(block.block_hash, header.block_hash);
+
+                       self.header_cache.block_connected(header.block_hash, header);
+                       chain_listener.block_connected(&block, header.height);
+                       new_tip = header;
+               }
+
+               Ok(())
+       }
 }
 
 #[cfg(test)]
@@ -401,8 +429,8 @@ mod spv_client_tests {
                let best_tip = chain.at_height(1);
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(best_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(best_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => {
                                assert_eq!(e.kind(), BlockSourceErrorKind::Persistent);
@@ -419,8 +447,8 @@ mod spv_client_tests {
                let common_tip = chain.tip();
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(common_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(common_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => panic!("Unexpected error: {:?}", e),
                        Ok((chain_tip, blocks_connected)) => {
@@ -438,8 +466,8 @@ mod spv_client_tests {
                let old_tip = chain.at_height(1);
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(old_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(old_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => panic!("Unexpected error: {:?}", e),
                        Ok((chain_tip, blocks_connected)) => {
@@ -457,8 +485,8 @@ mod spv_client_tests {
                let old_tip = chain.at_height(1);
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(old_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(old_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => panic!("Unexpected error: {:?}", e),
                        Ok((chain_tip, blocks_connected)) => {
@@ -476,8 +504,8 @@ mod spv_client_tests {
                let old_tip = chain.at_height(1);
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(old_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(old_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => panic!("Unexpected error: {:?}", e),
                        Ok((chain_tip, blocks_connected)) => {
@@ -496,8 +524,8 @@ mod spv_client_tests {
                let worse_tip = chain.tip();
 
                let poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
-               let cache = UnboundedCache::new();
-               let mut client = SpvClient::new(best_tip, poller, cache, NullChainListener {});
+               let mut cache = UnboundedCache::new();
+               let mut client = SpvClient::new(best_tip, poller, &mut cache, NullChainListener {});
                match client.poll_best_tip().await {
                        Err(e) => panic!("Unexpected error: {:?}", e),
                        Ok((chain_tip, blocks_connected)) => {
@@ -525,7 +553,7 @@ mod chain_notifier_tests {
                let mut listener = MockChainListener::new()
                        .expect_block_connected(*chain.at_height(2))
                        .expect_block_connected(*new_tip);
-               let mut notifier = ChainNotifier { header_cache: chain.header_cache(0..=1) };
+               let mut notifier = ChainNotifier { header_cache: &mut chain.header_cache(0..=1) };
                let mut poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((e, _)) => panic!("Unexpected error: {:?}", e),
@@ -541,7 +569,7 @@ mod chain_notifier_tests {
                let new_tip = test_chain.tip();
                let old_tip = main_chain.tip();
                let mut listener = MockChainListener::new();
-               let mut notifier = ChainNotifier { header_cache: main_chain.header_cache(0..=1) };
+               let mut notifier = ChainNotifier { header_cache: &mut main_chain.header_cache(0..=1) };
                let mut poller = poll::ChainPoller::new(&mut test_chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((e, _)) => {
@@ -562,7 +590,7 @@ mod chain_notifier_tests {
                let mut listener = MockChainListener::new()
                        .expect_block_disconnected(*old_tip)
                        .expect_block_connected(*new_tip);
-               let mut notifier = ChainNotifier { header_cache: main_chain.header_cache(0..=2) };
+               let mut notifier = ChainNotifier { header_cache: &mut main_chain.header_cache(0..=2) };
                let mut poller = poll::ChainPoller::new(&mut fork_chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((e, _)) => panic!("Unexpected error: {:?}", e),
@@ -582,7 +610,7 @@ mod chain_notifier_tests {
                        .expect_block_disconnected(*old_tip)
                        .expect_block_disconnected(*main_chain.at_height(2))
                        .expect_block_connected(*new_tip);
-               let mut notifier = ChainNotifier { header_cache: main_chain.header_cache(0..=3) };
+               let mut notifier = ChainNotifier { header_cache: &mut main_chain.header_cache(0..=3) };
                let mut poller = poll::ChainPoller::new(&mut fork_chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((e, _)) => panic!("Unexpected error: {:?}", e),
@@ -602,7 +630,7 @@ mod chain_notifier_tests {
                        .expect_block_disconnected(*old_tip)
                        .expect_block_connected(*fork_chain.at_height(2))
                        .expect_block_connected(*new_tip);
-               let mut notifier = ChainNotifier { header_cache: main_chain.header_cache(0..=2) };
+               let mut notifier = ChainNotifier { header_cache: &mut main_chain.header_cache(0..=2) };
                let mut poller = poll::ChainPoller::new(&mut fork_chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((e, _)) => panic!("Unexpected error: {:?}", e),
@@ -617,7 +645,7 @@ mod chain_notifier_tests {
                let new_tip = chain.tip();
                let old_tip = chain.at_height(1);
                let mut listener = MockChainListener::new();
-               let mut notifier = ChainNotifier { header_cache: chain.header_cache(0..=1) };
+               let mut notifier = ChainNotifier { header_cache: &mut chain.header_cache(0..=1) };
                let mut poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((_, tip)) => assert_eq!(tip, None),
@@ -632,7 +660,7 @@ mod chain_notifier_tests {
                let new_tip = chain.tip();
                let old_tip = chain.at_height(1);
                let mut listener = MockChainListener::new();
-               let mut notifier = ChainNotifier { header_cache: chain.header_cache(0..=3) };
+               let mut notifier = ChainNotifier { header_cache: &mut chain.header_cache(0..=3) };
                let mut poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((_, tip)) => assert_eq!(tip, Some(old_tip)),
@@ -648,7 +676,7 @@ mod chain_notifier_tests {
                let old_tip = chain.at_height(1);
                let mut listener = MockChainListener::new()
                        .expect_block_connected(*chain.at_height(2));
-               let mut notifier = ChainNotifier { header_cache: chain.header_cache(0..=3) };
+               let mut notifier = ChainNotifier { header_cache: &mut chain.header_cache(0..=3) };
                let mut poller = poll::ChainPoller::new(&mut chain, Network::Testnet);
                match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
                        Err((_, tip)) => assert_eq!(tip, Some(chain.at_height(2))),