From aad8d597890c3707ae96fdb2b9fadc270ca574dd Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 18 Aug 2021 13:54:08 -0400 Subject: node/chainstate: Reduce coupling of LogPrintf ...by moving the try/catch out of LoadChainstate I strongly recommend reviewing with the following git-diff flags: --color-moved=dimmed_zebra --color-moved-ws=allow-indentation-change --- src/node/chainstate.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/node/chainstate.cpp') diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index 36d10e99d9..99bf3d8e94 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -26,7 +26,7 @@ std::optional LoadChainstate(bool fReset, return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull(); }; - try { + { LOCK(cs_main); chainman.InitializeChainstate(mempool); chainman.m_total_coinstip_cache = nCoinCacheUsage; @@ -113,9 +113,6 @@ std::optional LoadChainstate(bool fReset, assert(chainstate->m_chain.Tip() != nullptr); } } - } catch (const std::exception& e) { - LogPrintf("%s\n", e.what()); - return ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED; } if (!fReset) { @@ -141,7 +138,7 @@ std::optional VerifyLoadedChainstate(ChainstateManage return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull(); }; - try { + { LOCK(cs_main); for (CChainState* chainstate : chainman.GetAll()) { @@ -165,9 +162,6 @@ std::optional VerifyLoadedChainstate(ChainstateManage } } } - } catch (const std::exception& e) { - LogPrintf("%s\n", e.what()); - return ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE; } return std::nullopt; -- cgit v1.2.3