diff options
| author | Carl Dong <contact@carldong.me> | 2021-12-23 16:40:03 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-12-23 17:28:30 -0500 |
| commit | 3401630417d994b53ff3a89db2ea759ab1ec6f0f (patch) | |
| tree | a21bde9080b6df20a941caf924c01247729aa287 /src/test/util | |
| parent | 1dd582782d3c182aa952f23ec577f6a0a8672e7b (diff) | |
style-only: Rename *Chainstate return values
Diffstat (limited to 'src/test/util')
| -rw-r--r-- | src/test/util/setup_common.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index eb23e8725f..38b07b35ba 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -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. RegisterAllCoreRPCCommands(tableRPC); - auto rv = LoadChainstate(fReindex.load(), - *Assert(m_node.chainman.get()), - Assert(m_node.mempool.get()), - fPruneMode, - chainparams.GetConsensus(), - m_args.GetBoolArg("-reindex-chainstate", false), - m_cache_sizes.block_tree_db, - m_cache_sizes.coins_db, - m_cache_sizes.coins, - true, - true); - assert(!rv.has_value()); - - auto maybe_verify_failure = VerifyLoadedChainstate( + auto maybe_load_error = LoadChainstate(fReindex.load(), + *Assert(m_node.chainman.get()), + Assert(m_node.mempool.get()), + fPruneMode, + chainparams.GetConsensus(), + m_args.GetBoolArg("-reindex-chainstate", false), + m_cache_sizes.block_tree_db, + m_cache_sizes.coins_db, + m_cache_sizes.coins, + true, + true); + assert(!maybe_load_error.has_value()); + + auto maybe_verify_error = VerifyLoadedChainstate( *Assert(m_node.chainman), fReindex.load(), 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("-checklevel", DEFAULT_CHECKLEVEL), static_cast<int64_t(*)()>(GetTime)); - assert(!maybe_verify_failure.has_value()); + assert(!maybe_verify_error.has_value()); BlockValidationState state; if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) { |