phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 20:03:34 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

style-only: Various blockstorage.cpp cleanups

Browse source
This commit is contained in:
Carl Dong 2022-03-03 15:05:15 -05:00
parent 5be9ee3c54
commit 3bbb6fea05
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/node/blockstorage.cpp
View file

@ -203,8 +203,7 @@ CBlockIndex* BlockManager::InsertBlockIndex(const uint256& hash)
return nullptr; return nullptr;
} }
// Return existing or create new const auto [mi, inserted]{m_block_index.try_emplace(hash)};
auto [mi, inserted] = m_block_index.try_emplace(hash);
CBlockIndex* pindex = &(*mi).second; CBlockIndex* pindex = &(*mi).second;
if (inserted) { if (inserted) {
pindex->phashBlock = &((*mi).first); pindex->phashBlock = &((*mi).first);
@ -224,8 +223,7 @@ bool BlockManager::LoadBlockIndex(
std::vector<std::pair<int, CBlockIndex*>> vSortedByHeight; std::vector<std::pair<int, CBlockIndex*>> vSortedByHeight;
vSortedByHeight.reserve(m_block_index.size()); vSortedByHeight.reserve(m_block_index.size());
for (auto& [_, block_index] : m_block_index) { for (auto& [_, block_index] : m_block_index) {
CBlockIndex* pindex = &block_index; vSortedByHeight.push_back(std::make_pair(block_index.nHeight, &block_index));
vSortedByHeight.push_back(std::make_pair(pindex->nHeight, pindex));
} }
sort(vSortedByHeight.begin(), vSortedByHeight.end()); sort(vSortedByHeight.begin(), vSortedByHeight.end());
@ -382,9 +380,8 @@ bool BlockManager::LoadBlockIndexDB(ChainstateManager& chainman)
LogPrintf("Checking all blk files are present...\n"); LogPrintf("Checking all blk files are present...\n");
std::set<int> setBlkDataFiles; std::set<int> setBlkDataFiles;
for (const auto& [_, block_index] : m_block_index) { for (const auto& [_, block_index] : m_block_index) {
const CBlockIndex* pindex = &block_index; if (block_index.nStatus & BLOCK_HAVE_DATA) {
if (pindex->nStatus & BLOCK_HAVE_DATA) { setBlkDataFiles.insert(block_index.nFile);
setBlkDataFiles.insert(pindex->nFile);
} }
} }
for (std::set<int>::iterator it = setBlkDataFiles.begin(); it != setBlkDataFiles.end(); it++) { for (std::set<int>::iterator it = setBlkDataFiles.begin(); it != setBlkDataFiles.end(); it++) {