diff options
author | Carl Dong <contact@carldong.me> | 2020-11-04 17:18:09 -0500 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2021-06-10 15:04:39 -0400 |
commit | 3e82abb8dd7e21ec918966105648be7ae077fd8c (patch) | |
tree | e06a808ce6e0b98b601084e70d5fddee67057ef6 /src/miner.cpp | |
parent | f323248aba5088c9630e5cdfe5ce980f21633fe8 (diff) | |
download | bitcoin-3e82abb8dd7e21ec918966105648be7ae077fd8c.tar.xz |
tree-wide: Remove stray review-only assertion
Unfortunately, these assertion don't fit the regex in the scripted-diff.
Therefore, we remove it manually.
Diffstat (limited to 'src/miner.cpp')
-rw-r--r-- | src/miner.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index eccddbb04f..b83cde4e4b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -45,15 +45,7 @@ void RegenerateCommitments(CBlock& block, ChainstateManager& chainman) tx.vout.erase(tx.vout.begin() + GetWitnessCommitmentIndex(block)); block.vtx.at(0) = MakeTransactionRef(tx); - CBlockIndex* prev_block; - { - // TODO: Temporary scope to check correctness of refactored code. - // Should be removed manually after merge of - // https://github.com/bitcoin/bitcoin/pull/20158 - LOCK(::cs_main); - assert(std::addressof(g_chainman.m_blockman) == std::addressof(chainman.m_blockman)); - prev_block = chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock); - } + CBlockIndex* prev_block = WITH_LOCK(::cs_main, return chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock)); GenerateCoinbaseCommitment(block, prev_block, Params().GetConsensus()); block.hashMerkleRoot = BlockMerkleRoot(block); |