merge bitcoin#23777: follow-ups from bitcoin#23365

This commit is contained in:
Kittywhiskers Van Gogh 2021-12-14 21:36:00 +00:00
parent a681750798
commit 577da313df
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
2 changed files with 4 additions and 0 deletions

View File

@ -99,6 +99,8 @@ bool BaseIndex::Init()
prune_violation = false; prune_violation = false;
break; break;
} }
// block->pprev must exist at this point, since block_to_test is part of the chain
// and thus must be encountered when going backwards from the tip
assert(block->pprev); assert(block->pprev);
block = block->pprev; block = block->pprev;
} }

View File

@ -30,6 +30,8 @@ class FeatureBlockfilterindexPruneTest(BitcoinTestFramework):
self.log.info("prune some blocks") self.log.info("prune some blocks")
pruneheight = self.nodes[0].pruneblockchain(400) pruneheight = self.nodes[0].pruneblockchain(400)
# the prune heights used here and below are magic numbers that are determined by the
# thresholds at which block files wrap, so they depend on disk serialization and default block file size.
assert_equal(pruneheight, 366) assert_equal(pruneheight, 366)
self.log.info("check if we can access the tips blockfilter when we have pruned some blocks") self.log.info("check if we can access the tips blockfilter when we have pruned some blocks")