X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Ftest_utils.rs;h=597d2a85fd51ca8fae8274ec1e6b78adcdc5c9b4;hb=e94647ca4ebc63be4a8164804d08cf37e4655d6c;hp=c101d4bd3e8f0bdd516d2c0039cb579ceb5d5b89;hpb=54e9c07ad9ae1d187d57e5a8847cc5c84b4a4d0c;p=rust-lightning diff --git a/lightning-block-sync/src/test_utils.rs b/lightning-block-sync/src/test_utils.rs index c101d4bd..597d2a85 100644 --- a/lightning-block-sync/src/test_utils.rs +++ b/lightning-block-sync/src/test_utils.rs @@ -1,4 +1,4 @@ -use crate::{AsyncBlockSourceResult, BlockHeaderData, BlockSource, BlockSourceError, UnboundedCache}; +use crate::{AsyncBlockSourceResult, BlockData, BlockHeaderData, BlockSource, BlockSourceError, UnboundedCache}; use crate::poll::{Validate, ValidatedBlockHeader}; use bitcoin::blockdata::block::{Block, BlockHeader}; @@ -6,6 +6,8 @@ use bitcoin::blockdata::constants::genesis_block; use bitcoin::hash_types::BlockHash; use bitcoin::network::constants::Network; use bitcoin::util::uint::Uint256; +use bitcoin::util::hash::bitcoin_merkle_root; +use bitcoin::{PackedLockTime, Transaction}; use lightning::chain; @@ -18,6 +20,7 @@ pub struct Blockchain { without_blocks: Option>, without_headers: bool, malformed_headers: bool, + filtered_blocks: bool, } impl Blockchain { @@ -37,16 +40,27 @@ impl Blockchain { let prev_block = &self.blocks[i - 1]; let prev_blockhash = prev_block.block_hash(); let time = prev_block.header.time + height as u32; + // Must have at least one transaction, because the merkle root is not defined for an empty block + // and we would fail when we later checked, as of bitcoin crate 0.28.0. + // Note that elsewhere in tests we assume that the merkle root of an empty block is all zeros, + // but that's OK because those tests don't trigger the check. + let coinbase = Transaction { + version: 0, + lock_time: PackedLockTime::ZERO, + input: vec![], + output: vec![] + }; + let merkle_root = bitcoin_merkle_root(vec![coinbase.txid().as_hash()].into_iter()).unwrap(); self.blocks.push(Block { header: BlockHeader { version: 0, prev_blockhash, - merkle_root: Default::default(), + merkle_root: merkle_root.into(), time, bits, nonce: 0, }, - txdata: vec![], + txdata: vec![coinbase], }); } self @@ -64,6 +78,10 @@ impl Blockchain { Self { malformed_headers: true, ..self } } + pub fn filtered_blocks(self) -> Self { + Self { filtered_blocks: true, ..self } + } + pub fn fork_at_height(&self, height: usize) -> Self { assert!(height + 1 < self.blocks.len()); let mut blocks = self.blocks.clone(); @@ -88,7 +106,7 @@ impl Blockchain { BlockHeaderData { chainwork: self.blocks[0].header.work() + Uint256::from_u64(height as u64).unwrap(), height: height as u32, - header: self.blocks[height].header.clone(), + header: self.blocks[height].header, } } @@ -133,7 +151,7 @@ impl BlockSource for Blockchain { }) } - fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, Block> { + fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, BlockData> { Box::pin(async move { for (height, block) in self.blocks.iter().enumerate() { if block.header.block_hash() == *header_hash { @@ -143,7 +161,11 @@ impl BlockSource for Blockchain { } } - return Ok(block.clone()); + if self.filtered_blocks { + return Ok(BlockData::HeaderOnly(block.header)); + } else { + return Ok(BlockData::FullBlock(block.clone())); + } } } Err(BlockSourceError::transient("block not found")) @@ -172,6 +194,7 @@ impl chain::Listen for NullChainListener { pub struct MockChainListener { expected_blocks_connected: RefCell>, + expected_filtered_blocks_connected: RefCell>, expected_blocks_disconnected: RefCell>, } @@ -179,6 +202,7 @@ impl MockChainListener { pub fn new() -> Self { Self { expected_blocks_connected: RefCell::new(VecDeque::new()), + expected_filtered_blocks_connected: RefCell::new(VecDeque::new()), expected_blocks_disconnected: RefCell::new(VecDeque::new()), } } @@ -188,6 +212,11 @@ impl MockChainListener { self } + pub fn expect_filtered_block_connected(self, block: BlockHeaderData) -> Self { + self.expected_filtered_blocks_connected.borrow_mut().push_back(block); + self + } + pub fn expect_block_disconnected(self, block: BlockHeaderData) -> Self { self.expected_blocks_disconnected.borrow_mut().push_back(block); self @@ -195,10 +224,22 @@ impl MockChainListener { } impl chain::Listen for MockChainListener { - fn filtered_block_connected(&self, header: &BlockHeader, _txdata: &chain::transaction::TransactionData, height: u32) { + fn block_connected(&self, block: &Block, height: u32) { match self.expected_blocks_connected.borrow_mut().pop_front() { None => { - panic!("Unexpected block connected: {:?}", header.block_hash()); + panic!("Unexpected block connected: {:?}", block.block_hash()); + }, + Some(expected_block) => { + assert_eq!(block.block_hash(), expected_block.header.block_hash()); + assert_eq!(height, expected_block.height); + }, + } + } + + fn filtered_block_connected(&self, header: &BlockHeader, _txdata: &chain::transaction::TransactionData, height: u32) { + match self.expected_filtered_blocks_connected.borrow_mut().pop_front() { + None => { + panic!("Unexpected filtered block connected: {:?}", header.block_hash()); }, Some(expected_block) => { assert_eq!(header.block_hash(), expected_block.header.block_hash()); @@ -231,6 +272,11 @@ impl Drop for MockChainListener { panic!("Expected blocks connected: {:?}", expected_blocks_connected); } + let expected_filtered_blocks_connected = self.expected_filtered_blocks_connected.borrow(); + if !expected_filtered_blocks_connected.is_empty() { + panic!("Expected filtered_blocks connected: {:?}", expected_filtered_blocks_connected); + } + let expected_blocks_disconnected = self.expected_blocks_disconnected.borrow(); if !expected_blocks_disconnected.is_empty() { panic!("Expected blocks disconnected: {:?}", expected_blocks_disconnected);