Skip to content

Commit b6565b6

Browse files
committed
Merge bitcoin/bitcoin#26243: test: Remove unused fCheckpointsEnabled from miner_tests
fa9436e test: Remove unused fCheckpointsEnabled from miner_tests (MacroFake) Pull request description: The earliest checkpoint is at height 11111, so this can't possibly have any impact on this test. ACKs for top commit: fanquake: ACK fa9436e - given the low number of blocks, having the additional check in `ContextualCheckBlockHeader()` enabled should be a no-op, so disabling and re-enabling is dead code. Tree-SHA512: 7d1b952c297c915e9588761f82f5006cf5186b7ff30e8a1c702302e0b44afe536bde9eda8acf2995825ae01d2ad9d2393ae2feefb29f15676aaf71881941579b
2 parents d919e8d + fa9436e commit b6565b6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/test/miner_tests.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
558558
CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
559559
std::unique_ptr<CBlockTemplate> pblocktemplate;
560560

561-
fCheckpointsEnabled = false;
562-
563561
// Simple block creation, nothing special yet:
564562
BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));
565563

@@ -608,8 +606,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
608606
m_node.mempool->clear();
609607

610608
TestPrioritisedMining(chainparams, scriptPubKey, txFirst);
611-
612-
fCheckpointsEnabled = true;
613609
}
614610

615611
BOOST_AUTO_TEST_SUITE_END()

0 commit comments

Comments
 (0)