Skip to content

Commit 3401630

Browse files
dongcarldongcarl
committed
style-only: Rename *Chainstate return values
1 parent 1dd5827 commit 3401630

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎src/init.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,31 +1404,31 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
14041404

14051405
uiInterface.InitMessage(_("Loading block index…").translated);
14061406
const int64_t load_block_index_start_time = GetTimeMillis();
1407-
std::optional<ChainstateLoadingError> rv;
1407+
std::optional<ChainstateLoadingError> maybe_load_error;
14081408
try {
1409-
rv = LoadChainstate(fReset,
1410-
chainman,
1411-
Assert(node.mempool.get()),
1412-
fPruneMode,
1413-
chainparams.GetConsensus(),
1414-
fReindexChainState,
1415-
cache_sizes.block_tree_db,
1416-
cache_sizes.coins_db,
1417-
cache_sizes.coins,
1418-
false,
1419-
false,
1420-
ShutdownRequested,
1421-
[]() {
1422-
uiInterface.ThreadSafeMessageBox(
1423-
_("Error reading from database, shutting down."),
1424-
"", CClientUIInterface::MSG_ERROR);
1425-
});
1409+
maybe_load_error = LoadChainstate(fReset,
1410+
chainman,
1411+
Assert(node.mempool.get()),
1412+
fPruneMode,
1413+
chainparams.GetConsensus(),
1414+
fReindexChainState,
1415+
cache_sizes.block_tree_db,
1416+
cache_sizes.coins_db,
1417+
cache_sizes.coins,
1418+
false,
1419+
false,
1420+
ShutdownRequested,
1421+
[]() {
1422+
uiInterface.ThreadSafeMessageBox(
1423+
_("Error reading from database, shutting down."),
1424+
"", CClientUIInterface::MSG_ERROR);
1425+
});
14261426
} catch (const std::exception& e) {
14271427
LogPrintf("%s\n", e.what());
1428-
rv = ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED;
1428+
maybe_load_error = ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED;
14291429
}
1430-
if (rv.has_value()) {
1431-
switch (rv.value()) {
1430+
if (maybe_load_error.has_value()) {
1431+
switch (maybe_load_error.value()) {
14321432
case ChainstateLoadingError::ERROR_LOADING_BLOCK_DB:
14331433
strLoadError = _("Error loading block database");
14341434
break;
@@ -1462,27 +1462,27 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
14621462
break;
14631463
}
14641464
} else {
1465-
std::optional<ChainstateLoadVerifyError> rv2;
1465+
std::optional<ChainstateLoadVerifyError> maybe_verify_error;
14661466
try {
14671467
uiInterface.InitMessage(_("Verifying blocks…").translated);
14681468
auto check_blocks = args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS);
14691469
if (fHavePruned && check_blocks > MIN_BLOCKS_TO_KEEP) {
14701470
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
14711471
MIN_BLOCKS_TO_KEEP);
14721472
}
1473-
rv2 = VerifyLoadedChainstate(chainman,
1474-
fReset,
1475-
fReindexChainState,
1476-
chainparams.GetConsensus(),
1477-
check_blocks,
1478-
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
1479-
static_cast<int64_t(*)()>(GetTime));
1473+
maybe_verify_error = VerifyLoadedChainstate(chainman,
1474+
fReset,
1475+
fReindexChainState,
1476+
chainparams.GetConsensus(),
1477+
check_blocks,
1478+
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
1479+
static_cast<int64_t(*)()>(GetTime));
14801480
} catch (const std::exception& e) {
14811481
LogPrintf("%s\n", e.what());
1482-
rv2 = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;
1482+
maybe_verify_error = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;
14831483
}
1484-
if (rv2.has_value()) {
1485-
switch (rv2.value()) {
1484+
if (maybe_verify_error.has_value()) {
1485+
switch (maybe_verify_error.value()) {
14861486
case ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE:
14871487
strLoadError = _("The block database contains a block which appears to be from the future. "
14881488
"This may be due to your computer's date and time being set incorrectly. "

‎src/test/util/setup_common.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,28 +182,28 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
182182
// instead of unit tests, but for now we need these here.
183183
RegisterAllCoreRPCCommands(tableRPC);
184184

185-
auto rv = LoadChainstate(fReindex.load(),
186-
*Assert(m_node.chainman.get()),
187-
Assert(m_node.mempool.get()),
188-
fPruneMode,
189-
chainparams.GetConsensus(),
190-
m_args.GetBoolArg("-reindex-chainstate", false),
191-
m_cache_sizes.block_tree_db,
192-
m_cache_sizes.coins_db,
193-
m_cache_sizes.coins,
194-
true,
195-
true);
196-
assert(!rv.has_value());
197-
198-
auto maybe_verify_failure = VerifyLoadedChainstate(
185+
auto maybe_load_error = LoadChainstate(fReindex.load(),
186+
*Assert(m_node.chainman.get()),
187+
Assert(m_node.mempool.get()),
188+
fPruneMode,
189+
chainparams.GetConsensus(),
190+
m_args.GetBoolArg("-reindex-chainstate", false),
191+
m_cache_sizes.block_tree_db,
192+
m_cache_sizes.coins_db,
193+
m_cache_sizes.coins,
194+
true,
195+
true);
196+
assert(!maybe_load_error.has_value());
197+
198+
auto maybe_verify_error = VerifyLoadedChainstate(
199199
*Assert(m_node.chainman),
200200
fReindex.load(),
201201
m_args.GetBoolArg("-reindex-chainstate", false),
202202
chainparams.GetConsensus(),
203203
m_args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS),
204204
m_args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL),
205205
static_cast<int64_t(*)()>(GetTime));
206-
assert(!maybe_verify_failure.has_value());
206+
assert(!maybe_verify_error.has_value());
207207

208208
BlockValidationState state;
209209
if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) {

0 commit comments

Comments
 (0)