highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-24 03:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33154: test: use local CBlockIndex in block read hash mismatch check

Browse Source 
cb173b8e93 test: use local `CBlockIndex` in block read hash mismatch test to avoid data race (Lőrinc)

Pull request description:

  Avoid mutating the shared active tip `CBlockIndex` in the `blockmanager_readblock_hash_mismatch` test.
  Instead, construct a local `CBlockIndex` with only the required fields set, ensuring the test remains self-contained and hopefully eliminating the data race reported in https://github.com/bitcoin/bitcoin/issues/33150.

ACKs for top commit:
  stickies-v:
    ACK cb173b8e93
  maflcko:
    lgtm ACK cb173b8e93

Tree-SHA512: 790528db0659f8cc5b87ed2b316bf274af68edc6158b0ce8821baccddf8d9bc4074afcb7260e3a61d5013d24ab51cc5c31e36693b8fb5ab913a44229fd6ad36b
This commit is contained in:
merge-script
2025-08-20 17:42:24 +01:00
parent d3c58a5be9 cb173b8e93
commit bc797d2271
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/blockmanager_tests.cpp
View File

@@ -139,12 +139,18 @@ BOOST_FIXTURE_TEST_CASE(blockmanager_block_data_availability, TestChain100Setup)
BOOST_FIXTURE_TEST_CASE(blockmanager_readblock_hash_mismatch, TestingSetup) BOOST_FIXTURE_TEST_CASE(blockmanager_readblock_hash_mismatch, TestingSetup)
{ {
CBlockIndex* fake_index{WITH_LOCK(m_node.chainman->GetMutex(), return m_node.chainman->ActiveChain().Tip())}; CBlockIndex index;
fake_index->phashBlock = &uint256::ONE; // invalid block hash {
LOCK(cs_main);
const auto tip{m_node.chainman->ActiveTip()};
index.nStatus = tip->nStatus;
index.nDataPos = tip->nDataPos;
index.phashBlock = &uint256::ONE; // mismatched block hash
}
ASSERT_DEBUG_LOG("GetHash() doesn't match index"); ASSERT_DEBUG_LOG("GetHash() doesn't match index");
CBlock dummy; CBlock block;
BOOST_CHECK(!m_node.chainman->m_blockman.ReadBlock(dummy, *fake_index)); BOOST_CHECK(!m_node.chainman->m_blockman.ReadBlock(block, index));
} }
BOOST_AUTO_TEST_CASE(blockmanager_flush_block_file) BOOST_AUTO_TEST_CASE(blockmanager_flush_block_file)