Leaves at least 1 block in the partial chain (#6552)
This commit is contained in:
parent
85534ab027
commit
8a9113c4e2
|
@ -308,18 +308,20 @@ fn finalized_equals_pushed_genesis() -> Result<()> {
|
||||||
prop_assert!(empty_tree.is_none());
|
prop_assert!(empty_tree.is_none());
|
||||||
|
|
||||||
// TODO: fix this test or the code so the full_chain temporary trees aren't overwritten
|
// TODO: fix this test or the code so the full_chain temporary trees aren't overwritten
|
||||||
let chain = chain.iter().filter(|block| block.height != Height(0));
|
let chain = chain.iter()
|
||||||
|
.filter(|block| block.height != Height(0))
|
||||||
|
.map(ContextuallyValidBlock::test_with_zero_spent_utxos);
|
||||||
|
|
||||||
// use `end_count` as the number of non-finalized blocks at the end of the chain
|
// use `end_count` as the number of non-finalized blocks at the end of the chain,
|
||||||
let finalized_count = chain.clone().count() - end_count;
|
// make sure this test pushes at least 1 block in the partial chain.
|
||||||
|
let finalized_count = 1.max(chain.clone().count() - end_count);
|
||||||
|
|
||||||
let fake_value_pool = ValueBalance::<NonNegative>::fake_populated_pool();
|
let fake_value_pool = ValueBalance::<NonNegative>::fake_populated_pool();
|
||||||
|
|
||||||
let mut full_chain = Chain::new(network, Height(0), Default::default(), Default::default(), Default::default(), empty_tree, fake_value_pool);
|
let mut full_chain = Chain::new(network, Height(0), Default::default(), Default::default(), Default::default(), empty_tree, fake_value_pool);
|
||||||
for block in chain
|
for block in chain
|
||||||
.clone()
|
.clone()
|
||||||
.take(finalized_count)
|
.take(finalized_count) {
|
||||||
.map(ContextuallyValidBlock::test_with_zero_spent_utxos) {
|
|
||||||
full_chain = full_chain.push(block)?;
|
full_chain = full_chain.push(block)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -334,14 +336,12 @@ fn finalized_equals_pushed_genesis() -> Result<()> {
|
||||||
);
|
);
|
||||||
for block in chain
|
for block in chain
|
||||||
.clone()
|
.clone()
|
||||||
.skip(finalized_count)
|
.skip(finalized_count) {
|
||||||
.map(ContextuallyValidBlock::test_with_zero_spent_utxos) {
|
|
||||||
partial_chain = partial_chain.push(block.clone())?;
|
partial_chain = partial_chain.push(block.clone())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
for block in chain
|
for block in chain
|
||||||
.skip(finalized_count)
|
.skip(finalized_count) {
|
||||||
.map(ContextuallyValidBlock::test_with_zero_spent_utxos) {
|
|
||||||
full_chain = full_chain.push(block.clone())?;
|
full_chain = full_chain.push(block.clone())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue