Add ChainNotifier tests for more error cases

Author: jkczyz

lightning-block-sync/src/lib.rs

@@ -589,6 +589,52 @@ mod chain_notifier_tests {
 			Ok(_) => {},
 		}
 	}
+
+	#[tokio::test]
+	async fn sync_from_chain_without_headers() {
+		let mut chain = Blockchain::default().with_height(3).without_headers();
+
+		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 poller = poller::ChainPoller::new(&mut chain as &mut dyn BlockSource, Network::Testnet);
+		match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
+			Err((_, tip)) => assert_eq!(tip, None),
+			Ok(_) => panic!("Expected error"),
+		}
+	}
+
+	#[tokio::test]
+	async fn sync_from_chain_without_any_new_blocks() {
+		let mut chain = Blockchain::default().with_height(3).without_blocks(2..);
+
+		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 poller = poller::ChainPoller::new(&mut chain as &mut dyn BlockSource, Network::Testnet);
+		match notifier.sync_listener(new_tip, &old_tip, &mut poller, &mut listener).await {
+			Err((_, tip)) => assert_eq!(tip, Some(old_tip)),
+			Ok(_) => panic!("Expected error"),
+		}
+	}
+
+	#[tokio::test]
+	async fn sync_from_chain_without_some_new_blocks() {
+		let mut chain = Blockchain::default().with_height(3).without_blocks(3..);
+
+		let new_tip = chain.tip();
+		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 poller = poller::ChainPoller::new(&mut chain as &mut dyn BlockSource, 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))),
+			Ok(_) => panic!("Expected error"),
+		}
+	}
 }
 
 #[cfg(test)]

lightning-block-sync/src/test_utils.rs

@@ -9,6 +9,7 @@ use std::collections::VecDeque;
 #[derive(Default)]
 pub struct Blockchain {
 	pub blocks: Vec<Block>,
+	without_blocks: Option<std::ops::RangeFrom<usize>>,
 	without_headers: bool,
 	malformed_headers: bool,
 }
@@ -45,6 +46,10 @@ impl Blockchain {
 		self
 	}
 
+	pub fn without_blocks(self, range: std::ops::RangeFrom<usize>) -> Self {
+		Self { without_blocks: Some(range), ..self }
+	}
+
 	pub fn without_headers(self) -> Self {
 		Self { without_headers: true, ..self }
 	}
@@ -62,7 +67,7 @@ impl Blockchain {
 			block.header.nonce += 1;
 			prev_blockhash = block.block_hash();
 		}
-		Self { blocks, ..*self }
+		Self { blocks, without_blocks: None, ..*self }
 	}
 
 	pub fn at_height(&self, height: usize) -> ValidatedBlockHeader {
@@ -124,8 +129,14 @@ impl BlockSource for Blockchain {
 
 	fn get_block<'a>(&'a mut self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, Block> {
 		Box::pin(async move {
-			for block in self.blocks.iter() {
+			for (height, block) in self.blocks.iter().enumerate() {
 				if block.header.block_hash() == *header_hash {
+					if let Some(without_blocks) = &self.without_blocks {
+						if without_blocks.contains(&height) {
+							return Err(BlockSourceError::Persistent);
+						}
+					}
+
 					return Ok(block.clone());
 				}
 			}