zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-enable the checkpoint restart tests

This commit is contained in:
teor 2021-03-02 16:22:23 +10:00
parent 8883543a85
commit db23258216
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zebra-consensus/src/checkpoint/tests.rs
View File

@ -213,9 +213,7 @@ async fn multi_item_checkpoint_list() -> Result<(), Report> {
Ok(()) Ok(())
} }
// Temporarily ignore this test, until the state can handle out-of-order blocks #[tokio::test]
// #[tokio::test]
#[allow(dead_code)]
async fn continuous_blockchain_test() -> Result<(), Report> { async fn continuous_blockchain_test() -> Result<(), Report> {
continuous_blockchain(None).await?; continuous_blockchain(None).await?;
for height in 0..=10 { for height in 0..=10 {
@ -226,7 +224,6 @@ async fn continuous_blockchain_test() -> Result<(), Report> {
/// Test a continuous blockchain, restarting verification at `restart_height`. /// Test a continuous blockchain, restarting verification at `restart_height`.
// TODO: does this duplicate the test code commented out in src/chain/tests.rs? // TODO: does this duplicate the test code commented out in src/chain/tests.rs?
#[allow(dead_code)]
#[spandoc::spandoc] #[spandoc::spandoc]
async fn continuous_blockchain(restart_height: Option<block::Height>) -> Result<(), Report> { async fn continuous_blockchain(restart_height: Option<block::Height>) -> Result<(), Report> {
zebra_test::init(); zebra_test::init();
@ -313,6 +310,7 @@ async fn continuous_blockchain(restart_height: Option<block::Height>) -> Result<
// Now verify each block // Now verify each block
for (block, height, _hash) in blockchain { for (block, height, _hash) in blockchain {
// Commit directly to the state until after the (fake) restart height
if let Some(restart_height) = restart_height { if let Some(restart_height) = restart_height {
if height <= restart_height { if height <= restart_height {
let mut state_service = state_service.clone(); let mut state_service = state_service.clone();
@ -320,15 +318,20 @@ async fn continuous_blockchain(restart_height: Option<block::Height>) -> Result<
let ready_state_service = let ready_state_service =
state_service.ready_and().map_err(|e| eyre!(e)).await?; state_service.ready_and().map_err(|e| eyre!(e)).await?;
/// SPANDOC: Add block to the state {?height} /// SPANDOC: Add block directly to the state {?height}
ready_state_service ready_state_service
.call(zebra_state::Request::CommitFinalizedBlock( .call(zebra_state::Request::CommitFinalizedBlock(
block.clone().into(), block.clone().into(),
)) ))
.await .await
.map_err(|e| eyre!(e))?; .map_err(|e| eyre!(e))?;
// Skip verification for (fake) previous blocks
continue;
} }
} }
// Stop verifying after the final checkpoint is reached
if height > checkpoint_verifier.checkpoint_list.max_height() { if height > checkpoint_verifier.checkpoint_list.max_height() {
break; break;
} }