fix: unit tests assume we always re-hash

Author: PastaPastaPasta

src/chainparams.cpp

@@ -94,7 +94,7 @@ static CBlock FindDevNetGenesisBlock(const CBlock &prevBlock, const CAmount& rew
 
     for (uint32_t nNonce = 0; nNonce < UINT32_MAX; nNonce++) {
         block.nNonce = nNonce;
-
+        block.cached_hash.SetNull();
         uint256 hash = block.GetHash();
         if (UintToArith256(hash) <= bnTarget)
             return block;

src/rpc/mining.cpp

@@ -133,6 +133,7 @@ static bool GenerateBlock(ChainstateManager& chainman, CBlock& block, uint64_t&
     CChainParams chainparams(Params());
 
     while (max_tries > 0 && block.nNonce < std::numeric_limits<uint32_t>::max() && !CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus()) && !ShutdownRequested()) {
+        block.cached_hash.SetNull();
         ++block.nNonce;
         --max_tries;
     }

src/test/blockencodings_tests.cpp

@@ -44,7 +44,10 @@ static CBlock BuildBlockTestCase() {
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
     assert(!mutated);
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) {
+        block.cached_hash.SetNull();
+        ++block.nNonce;
+    }
     return block;
 }
 
@@ -275,8 +278,10 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
     assert(!mutated);
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
-
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) {
+        block.cached_hash.SetNull();
+        ++block.nNonce;
+    }
     // Test simple header round-trip with only coinbase
     {
         CBlockHeaderAndShortTxIDs shortIDs{block};

src/test/blockfilter_index_tests.cpp

@@ -77,8 +77,10 @@ CBlock BuildChainTestingSetup::CreateBlock(const CBlockIndex* prev,
     unsigned int extraNonce = 0;
     IncrementExtraNonce(&block, prev, extraNonce);
 
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
-
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) {
+        block.cached_hash.SetNull();
+        ++block.nNonce;
+    }
     return block;
 }
 

src/test/miner_tests.cpp

@@ -242,15 +242,18 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
                 txFirst.push_back(pblock->vtx[0]);
             pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
             pblock->nNonce = BLOCKINFO[i].nonce;
+            pblock->cached_hash.SetNull();
 
             // This will usually succeed in the first round as we take the nonce from BLOCKINFO
             // It's however useful when adding new blocks with unknown nonces (you should add the found block to BLOCKINFO)
             while (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, chainparams.GetConsensus())) {
                 pblock->nNonce++;
+                pblock->cached_hash.SetNull();
             }
         }
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
         BOOST_CHECK(Assert(m_node.chainman)->ProcessNewBlock(chainparams, shared_pblock, true, nullptr));
+        pblock->cached_hash.SetNull();
         pblock->hashPrevBlock = pblock->GetHash();
     };
 

src/test/pow_tests.cpp

@@ -43,6 +43,7 @@ BOOST_AUTO_TEST_CASE(get_next_work)
 
     CBlockHeader blockHeader;
     blockHeader.nTime = 1408732505; // Block #123457
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParams->GetConsensus()), 0x1b1441deU); // Block #123457 has 0x1b1441de
 
     // test special rules for slow blocks on devnet/testnet
@@ -52,17 +53,22 @@ BOOST_AUTO_TEST_CASE(get_next_work)
 
     // make sure normal rules apply
     blockHeader.nTime = 1408732505; // Block #123457
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParamsDev->GetConsensus()), 0x1b1441deU); // Block #123457 has 0x1b1441de
 
     // 10x higher target
     blockHeader.nTime = 1408733090; // Block #123457 (10m+1sec)
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParamsDev->GetConsensus()), 0x1c00c8f8U); // Block #123457 has 0x1c00c8f8
     blockHeader.nTime = 1408733689; // Block #123457 (20m)
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParamsDev->GetConsensus()), 0x1c00c8f8U); // Block #123457 has 0x1c00c8f8
     // lowest diff possible
     blockHeader.nTime = 1408739690; // Block #123457 (2h+1sec)
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParamsDev->GetConsensus()), 0x207fffffU); // Block #123457 has 0x207fffff
     blockHeader.nTime = 1408743289; // Block #123457 (3h)
+    blockHeader.cached_hash.SetNull();
     BOOST_CHECK_EQUAL(GetNextWorkRequired(blockIndexLast, &blockHeader, chainParamsDev->GetConsensus()), 0x207fffffU); // Block #123457 has 0x207fffff
 }
 

src/test/util/mining.cpp

@@ -51,6 +51,7 @@ std::vector<std::shared_ptr<CBlock>> CreateBlockChain(size_t total_height, const
         block.nNonce = 0;
 
         while (!CheckProofOfWork(block.GetHash(), block.nBits, params.GetConsensus())) {
+            block.cached_hash.SetNull();
             ++block.nNonce;
             assert(block.nNonce);
         }
@@ -63,6 +64,7 @@ CTxIn MineBlock(const NodeContext& node, const CScript& coinbase_scriptPubKey)
     auto block = PrepareBlock(node, coinbase_scriptPubKey);
 
     while (!CheckProofOfWork(block->GetHash(), block->nBits, Params().GetConsensus())) {
+        block->cached_hash.SetNull();
         ++block->nNonce;
         assert(block->nNonce);
     }

src/test/util/setup_common.cpp

@@ -504,8 +504,10 @@ CBlock TestChainSetup::CreateBlock(
         IncrementExtraNonce(&block, chainstate.m_chain.Tip(), extraNonce);
     }
 
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
-
+    while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) {
+        ++block.nNonce;
+        block.cached_hash.SetNull();
+    }
     CBlock result = block;
     return result;
 }

src/test/validation_block_tests.cpp

@@ -91,6 +91,7 @@ std::shared_ptr<CBlock> MinerTestingSetup::FinalizeBlock(std::shared_ptr<CBlock>
     pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
 
     while (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, Params().GetConsensus())) {
+        pblock->cached_hash.SetNull();
         ++(pblock->nNonce);
     }