highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-14 13:50:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

style-only: Rename *Chainstate return values

Browse Source
This commit is contained in:
Carl Dong 2021-12-23 16:40:03 -05:00
parent 1dd582782d
commit 3401630417
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/init.cpp
View File

@ -1404,31 +1404,31 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
uiInterface.InitMessage(_("Loading block index…").translated); uiInterface.InitMessage(_("Loading block index…").translated);
const int64_t load_block_index_start_time = GetTimeMillis(); const int64_t load_block_index_start_time = GetTimeMillis();
std::optional<ChainstateLoadingError> rv; std::optional<ChainstateLoadingError> maybe_load_error;
try { try {
rv = LoadChainstate(fReset, maybe_load_error = LoadChainstate(fReset,
chainman, chainman,
Assert(node.mempool.get()), Assert(node.mempool.get()),
fPruneMode, fPruneMode,
chainparams.GetConsensus(), chainparams.GetConsensus(),
fReindexChainState, fReindexChainState,
cache_sizes.block_tree_db, cache_sizes.block_tree_db,
cache_sizes.coins_db, cache_sizes.coins_db,
cache_sizes.coins, cache_sizes.coins,
false, false,
false, false,
ShutdownRequested, ShutdownRequested,
[]() { []() {
uiInterface.ThreadSafeMessageBox( uiInterface.ThreadSafeMessageBox(
_("Error reading from database, shutting down."), _("Error reading from database, shutting down."),
"", CClientUIInterface::MSG_ERROR); "", CClientUIInterface::MSG_ERROR);
}); });
} catch (const std::exception& e) { } catch (const std::exception& e) {
LogPrintf("%s\n", e.what()); LogPrintf("%s\n", e.what());
rv = ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED; maybe_load_error = ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED;
} }
if (rv.has_value()) { if (maybe_load_error.has_value()) {
switch (rv.value()) { switch (maybe_load_error.value()) {
case ChainstateLoadingError::ERROR_LOADING_BLOCK_DB: case ChainstateLoadingError::ERROR_LOADING_BLOCK_DB:
strLoadError = _("Error loading block database"); strLoadError = _("Error loading block database");
break; break;
@ -1462,7 +1462,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
break; break;
} }
} else { } else {
std::optional<ChainstateLoadVerifyError> rv2; std::optional<ChainstateLoadVerifyError> maybe_verify_error;
try { try {
uiInterface.InitMessage(_("Verifying blocks…").translated); uiInterface.InitMessage(_("Verifying blocks…").translated);
auto check_blocks = args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS); auto check_blocks = args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS);
@ -1470,19 +1470,19 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n", LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
MIN_BLOCKS_TO_KEEP); MIN_BLOCKS_TO_KEEP);
} }
rv2 = VerifyLoadedChainstate(chainman, maybe_verify_error = VerifyLoadedChainstate(chainman,
fReset, fReset,
fReindexChainState, fReindexChainState,
chainparams.GetConsensus(), chainparams.GetConsensus(),
check_blocks, check_blocks,
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL), args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
static_cast<int64_t(*)()>(GetTime)); static_cast<int64_t(*)()>(GetTime));
} catch (const std::exception& e) { } catch (const std::exception& e) {
LogPrintf("%s\n", e.what()); LogPrintf("%s\n", e.what());
rv2 = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE; maybe_verify_error = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;
} }
if (rv2.has_value()) { if (maybe_verify_error.has_value()) {
switch (rv2.value()) { switch (maybe_verify_error.value()) {
case ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE: case ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE:
strLoadError = _("The block database contains a block which appears to be from the future. " strLoadError = _("The block database contains a block which appears to be from the future. "
"This may be due to your computer's date and time being set incorrectly. " "This may be due to your computer's date and time being set incorrectly. "

28
src/test/util/setup_common.cpp
View File

@ -182,20 +182,20 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
// instead of unit tests, but for now we need these here. // instead of unit tests, but for now we need these here.
RegisterAllCoreRPCCommands(tableRPC); RegisterAllCoreRPCCommands(tableRPC);
auto rv = LoadChainstate(fReindex.load(), auto maybe_load_error = LoadChainstate(fReindex.load(),
*Assert(m_node.chainman.get()), *Assert(m_node.chainman.get()),
Assert(m_node.mempool.get()), Assert(m_node.mempool.get()),
fPruneMode, fPruneMode,
chainparams.GetConsensus(), chainparams.GetConsensus(),
m_args.GetBoolArg("-reindex-chainstate", false), m_args.GetBoolArg("-reindex-chainstate", false),
m_cache_sizes.block_tree_db, m_cache_sizes.block_tree_db,
m_cache_sizes.coins_db, m_cache_sizes.coins_db,
m_cache_sizes.coins, m_cache_sizes.coins,
true, true,
true); true);
assert(!rv.has_value()); assert(!maybe_load_error.has_value());
auto maybe_verify_failure = VerifyLoadedChainstate( auto maybe_verify_error = VerifyLoadedChainstate(
*Assert(m_node.chainman), *Assert(m_node.chainman),
fReindex.load(), fReindex.load(),
m_args.GetBoolArg("-reindex-chainstate", false), m_args.GetBoolArg("-reindex-chainstate", false),
@ -203,7 +203,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
m_args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS), m_args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS),
m_args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL), m_args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
static_cast<int64_t(*)()>(GetTime)); static_cast<int64_t(*)()>(GetTime));
assert(!maybe_verify_failure.has_value()); assert(!maybe_verify_error.has_value());
BlockValidationState state; BlockValidationState state;
if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) { if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) {