highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Avoid use of Chain::Lock in rescanblockchain

Browse Source 
This is a step toward removing the Chain::Lock class and reducing cs_main
locking.

This change only affects behavior in the case where wallet last block processed
falls behind the chain tip. The rescanblockchain error height error checking
will just be stricter in this case and only accept values up to the last
processed height
This commit is contained in:
Russell Yanofsky
2020-01-21 17:08:12 -05:00
parent 3cb85ac594
commit 1be8ff280c
6 changed files with 78 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/test/interfaces_tests.cpp
View File

@@ -103,4 +103,40 @@ BOOST_AUTO_TEST_CASE(findCommonAncestor)
BOOST_CHECK_EQUAL(fork_hash, active[fork_height]->GetBlockHash());
}
BOOST_AUTO_TEST_CASE(hasBlocks)
{
auto chain = interfaces::MakeChain(m_node);
auto& active = ChainActive();
// Test ranges
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 10, 90));
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 10, {}));
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 0, 90));
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 0, {}));
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), -1000, 1000));
active[5]->nStatus &= ~BLOCK_HAVE_DATA;
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 10, 90));
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 10, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, 90));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), -1000, 1000));
active[95]->nStatus &= ~BLOCK_HAVE_DATA;
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 10, 90));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 10, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, 90));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), -1000, 1000));
active[50]->nStatus &= ~BLOCK_HAVE_DATA;
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 10, 90));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 10, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, 90));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 0, {}));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), -1000, 1000));
// Test edge cases
BOOST_CHECK(chain->hasBlocks(active.Tip()->GetBlockHash(), 6, 49));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 5, 49));
BOOST_CHECK(!chain->hasBlocks(active.Tip()->GetBlockHash(), 6, 50));
}
BOOST_AUTO_TEST_SUITE_END()