style-only: Remove redundant scope in *Chainstate

src/node/chainstate.cpp

@@ -58,152 +58,150 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
         return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull();
     };
 
-    {
-        LOCK(cs_main);
-
-        int64_t nEvoDbCache{64 * 1024 * 1024}; // TODO
-        evodb.reset();
-        evodb = std::make_unique<CEvoDB>(nEvoDbCache, false, fReset || fReindexChainState);
-
-        mnhf_manager.reset();
-        mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
-
-        chainman.InitializeChainstate(mempool, *evodb, chain_helper, clhandler, isman);
-        chainman.m_total_coinstip_cache = nCoinCacheUsage;
-        chainman.m_total_coinsdb_cache = nCoinDBCache;
-
-        auto& pblocktree{chainman.m_blockman.m_block_tree_db};
-        // new CBlockTreeDB tries to delete the existing file, which
-        // fails if it's still open from the previous loop. Close it first:
-        pblocktree.reset();
-        pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
-
-        DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
-                            dmnman, evodb, mnhf_manager, qsnapman, llmq_ctx, mempool, fReset, fReindexChainState,
-                            consensus_params);
-
-        if (fReset) {
-            pblocktree->WriteReindexing(true);
-            //If we're reindexing in prune mode, wipe away unusable block files and all undo data files
-            if (fPruneMode)
-                CleanupBlockRevFiles();
-        }
+    LOCK(cs_main);
+
+    int64_t nEvoDbCache{64 * 1024 * 1024}; // TODO
+    evodb.reset();
+    evodb = std::make_unique<CEvoDB>(nEvoDbCache, false, fReset || fReindexChainState);
+
+    mnhf_manager.reset();
+    mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
+
+    chainman.InitializeChainstate(mempool, *evodb, chain_helper, clhandler, isman);
+    chainman.m_total_coinstip_cache = nCoinCacheUsage;
+    chainman.m_total_coinsdb_cache = nCoinDBCache;
+
+    auto& pblocktree{chainman.m_blockman.m_block_tree_db};
+    // new CBlockTreeDB tries to delete the existing file, which
+    // fails if it's still open from the previous loop. Close it first:
+    pblocktree.reset();
+    pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
+
+    DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
+                        dmnman, evodb, mnhf_manager, qsnapman, llmq_ctx, mempool, fReset, fReindexChainState,
+                        consensus_params);
+
+    if (fReset) {
+        pblocktree->WriteReindexing(true);
+        //If we're reindexing in prune mode, wipe away unusable block files and all undo data files
+        if (fPruneMode)
+            CleanupBlockRevFiles();
+    }
+
+    if (shutdown_requested && shutdown_requested()) return ChainstateLoadingError::SHUTDOWN_PROBED;
 
+    // LoadBlockIndex will load m_have_pruned if we've ever removed a
+    // block file from disk.
+    // Note that it also sets fReindex based on the disk flag!
+    // From here on out fReindex and fReset mean something different!
+    if (!chainman.LoadBlockIndex()) {
         if (shutdown_requested && shutdown_requested()) return ChainstateLoadingError::SHUTDOWN_PROBED;
+        return ChainstateLoadingError::ERROR_LOADING_BLOCK_DB;
+    }
 
-        // LoadBlockIndex will load m_have_pruned if we've ever removed a
-        // block file from disk.
-        // Note that it also sets fReindex based on the disk flag!
-        // From here on out fReindex and fReset mean something different!
-        if (!chainman.LoadBlockIndex()) {
-            if (shutdown_requested && shutdown_requested()) return ChainstateLoadingError::SHUTDOWN_PROBED;
-            return ChainstateLoadingError::ERROR_LOADING_BLOCK_DB;
-        }
+    // TODO: Remove this when pruning is fixed.
+    // See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
+    if (is_governance_enabled && !is_txindex_enabled && network_id != CBaseChainParams::REGTEST) {
+        return ChainstateLoadingError::ERROR_TXINDEX_DISABLED_WHEN_GOV_ENABLED;
+    }
 
-        // TODO: Remove this when pruning is fixed.
-        // See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
-        if (is_governance_enabled && !is_txindex_enabled && network_id != CBaseChainParams::REGTEST) {
-            return ChainstateLoadingError::ERROR_TXINDEX_DISABLED_WHEN_GOV_ENABLED;
-        }
+    if (!chainman.BlockIndex().empty() &&
+            !chainman.m_blockman.LookupBlockIndex(consensus_params.hashGenesisBlock)) {
+        return ChainstateLoadingError::ERROR_BAD_GENESIS_BLOCK;
+    }
 
-        if (!chainman.BlockIndex().empty() &&
-                !chainman.m_blockman.LookupBlockIndex(consensus_params.hashGenesisBlock)) {
-            return ChainstateLoadingError::ERROR_BAD_GENESIS_BLOCK;
-        }
+    if (!consensus_params.hashDevnetGenesisBlock.IsNull() && !chainman.BlockIndex().empty() &&
+            !chainman.m_blockman.LookupBlockIndex(consensus_params.hashDevnetGenesisBlock)) {
+        return ChainstateLoadingError::ERROR_BAD_DEVNET_GENESIS_BLOCK;
+    }
 
-        if (!consensus_params.hashDevnetGenesisBlock.IsNull() && !chainman.BlockIndex().empty() &&
-                !chainman.m_blockman.LookupBlockIndex(consensus_params.hashDevnetGenesisBlock)) {
-            return ChainstateLoadingError::ERROR_BAD_DEVNET_GENESIS_BLOCK;
+    if (!fReset && !fReindexChainState) {
+        // Check for changed -addressindex state
+        if (!fAddressIndex && fAddressIndex != is_addrindex_enabled) {
+            return ChainstateLoadingError::ERROR_ADDRIDX_NEEDS_REINDEX;
         }
 
-        if (!fReset && !fReindexChainState) {
-            // Check for changed -addressindex state
-            if (!fAddressIndex && fAddressIndex != is_addrindex_enabled) {
-                return ChainstateLoadingError::ERROR_ADDRIDX_NEEDS_REINDEX;
-            }
-
-            // Check for changed -timestampindex state
-            if (!fTimestampIndex && fTimestampIndex != is_timeindex_enabled) {
-                return ChainstateLoadingError::ERROR_TIMEIDX_NEEDS_REINDEX;
-            }
+        // Check for changed -timestampindex state
+        if (!fTimestampIndex && fTimestampIndex != is_timeindex_enabled) {
+            return ChainstateLoadingError::ERROR_TIMEIDX_NEEDS_REINDEX;
+        }
 
-            // Check for changed -spentindex state
-            if (!fSpentIndex && fSpentIndex != is_spentindex_enabled) {
-                return ChainstateLoadingError::ERROR_SPENTIDX_NEEDS_REINDEX;
-            }
+        // Check for changed -spentindex state
+        if (!fSpentIndex && fSpentIndex != is_spentindex_enabled) {
+            return ChainstateLoadingError::ERROR_SPENTIDX_NEEDS_REINDEX;
         }
+    }
 
-        chainman.InitAdditionalIndexes();
+    chainman.InitAdditionalIndexes();
 
-        LogPrintf("%s: address index %s\n", __func__, fAddressIndex ? "enabled" : "disabled");
-        LogPrintf("%s: timestamp index %s\n", __func__, fTimestampIndex ? "enabled" : "disabled");
-        LogPrintf("%s: spent index %s\n", __func__, fSpentIndex ? "enabled" : "disabled");
+    LogPrintf("%s: address index %s\n", __func__, fAddressIndex ? "enabled" : "disabled");
+    LogPrintf("%s: timestamp index %s\n", __func__, fTimestampIndex ? "enabled" : "disabled");
+    LogPrintf("%s: spent index %s\n", __func__, fSpentIndex ? "enabled" : "disabled");
 
-        // Check for changed -prune state.  What we are concerned about is a user who has pruned blocks
-        // in the past, but is now trying to run unpruned.
-        if (chainman.m_blockman.m_have_pruned && !fPruneMode) {
-            return ChainstateLoadingError::ERROR_PRUNED_NEEDS_REINDEX;
-        }
+    // Check for changed -prune state.  What we are concerned about is a user who has pruned blocks
+    // in the past, but is now trying to run unpruned.
+    if (chainman.m_blockman.m_have_pruned && !fPruneMode) {
+        return ChainstateLoadingError::ERROR_PRUNED_NEEDS_REINDEX;
+    }
 
-        // At this point blocktree args are consistent with what's on disk.
-        // If we're not mid-reindex (based on disk + args), add a genesis block on disk
-        // (otherwise we use the one already on disk).
-        // This is called again in ThreadImport after the reindex completes.
-        if (!fReindex && !chainman.ActiveChainstate().LoadGenesisBlock()) {
-            return ChainstateLoadingError::ERROR_LOAD_GENESIS_BLOCK_FAILED;
-        }
+    // At this point blocktree args are consistent with what's on disk.
+    // If we're not mid-reindex (based on disk + args), add a genesis block on disk
+    // (otherwise we use the one already on disk).
+    // This is called again in ThreadImport after the reindex completes.
+    if (!fReindex && !chainman.ActiveChainstate().LoadGenesisBlock()) {
+        return ChainstateLoadingError::ERROR_LOAD_GENESIS_BLOCK_FAILED;
+    }
 
-        // At this point we're either in reindex or we've loaded a useful
-        // block tree into BlockIndex()!
+    // At this point we're either in reindex or we've loaded a useful
+    // block tree into BlockIndex()!
 
-        for (CChainState* chainstate : chainman.GetAll()) {
-            chainstate->InitCoinsDB(
-                /* cache_size_bytes */ nCoinDBCache,
-                /* in_memory */ coins_db_in_memory,
-                /* should_wipe */ fReset || fReindexChainState);
+    for (CChainState* chainstate : chainman.GetAll()) {
+        chainstate->InitCoinsDB(
+            /* cache_size_bytes */ nCoinDBCache,
+            /* in_memory */ coins_db_in_memory,
+            /* should_wipe */ fReset || fReindexChainState);
 
-            if (coins_error_cb) {
-                chainstate->CoinsErrorCatcher().AddReadErrCallback(coins_error_cb);
-            }
+        if (coins_error_cb) {
+            chainstate->CoinsErrorCatcher().AddReadErrCallback(coins_error_cb);
+        }
 
-            // If necessary, upgrade from older database format.
-            // This is a no-op if we cleared the coinsviewdb with -reindex or -reindex-chainstate
-            if (!chainstate->CoinsDB().Upgrade()) {
-                return ChainstateLoadingError::ERROR_CHAINSTATE_UPGRADE_FAILED;
-            }
+        // If necessary, upgrade from older database format.
+        // This is a no-op if we cleared the coinsviewdb with -reindex or -reindex-chainstate
+        if (!chainstate->CoinsDB().Upgrade()) {
+            return ChainstateLoadingError::ERROR_CHAINSTATE_UPGRADE_FAILED;
+        }
 
-            // ReplayBlocks is a no-op if we cleared the coinsviewdb with -reindex or -reindex-chainstate
-            if (!chainstate->ReplayBlocks()) {
-                return ChainstateLoadingError::ERROR_REPLAYBLOCKS_FAILED;
-            }
+        // ReplayBlocks is a no-op if we cleared the coinsviewdb with -reindex or -reindex-chainstate
+        if (!chainstate->ReplayBlocks()) {
+            return ChainstateLoadingError::ERROR_REPLAYBLOCKS_FAILED;
+        }
 
-            // The on-disk coinsdb is now in a good state, create the cache
-            chainstate->InitCoinsCache(nCoinCacheUsage);
-            assert(chainstate->CanFlushToDisk());
+        // The on-disk coinsdb is now in a good state, create the cache
+        chainstate->InitCoinsCache(nCoinCacheUsage);
+        assert(chainstate->CanFlushToDisk());
 
-            // flush evodb
-            // TODO: CEvoDB instance should probably be a part of CChainState
-            // (for multiple chainstates to actually work in parallel)
-            // and not a global
-            if (&chainman.ActiveChainstate() == chainstate && !evodb->CommitRootTransaction()) {
-                return ChainstateLoadingError::ERROR_COMMITING_EVO_DB;
-            }
+        // flush evodb
+        // TODO: CEvoDB instance should probably be a part of CChainState
+        // (for multiple chainstates to actually work in parallel)
+        // and not a global
+        if (&chainman.ActiveChainstate() == chainstate && !evodb->CommitRootTransaction()) {
+            return ChainstateLoadingError::ERROR_COMMITING_EVO_DB;
+        }
 
-            if (!is_coinsview_empty(chainstate)) {
-                // LoadChainTip initializes the chain based on CoinsTip()'s best block
-                if (!chainstate->LoadChainTip()) {
-                    return ChainstateLoadingError::ERROR_LOADCHAINTIP_FAILED;
-                }
-                assert(chainstate->m_chain.Tip() != nullptr);
+        if (!is_coinsview_empty(chainstate)) {
+            // LoadChainTip initializes the chain based on CoinsTip()'s best block
+            if (!chainstate->LoadChainTip()) {
+                return ChainstateLoadingError::ERROR_LOADCHAINTIP_FAILED;
             }
+            assert(chainstate->m_chain.Tip() != nullptr);
         }
+    }
 
-        if (!dmnman->MigrateDBIfNeeded() || !dmnman->MigrateDBIfNeeded2()) {
-            return ChainstateLoadingError::ERROR_UPGRADING_EVO_DB;
-        }
-        if (!mnhf_manager->ForceSignalDBUpdate()) {
-            return ChainstateLoadingError::ERROR_UPGRADING_SIGNALS_DB;
-        }
+    if (!dmnman->MigrateDBIfNeeded() || !dmnman->MigrateDBIfNeeded2()) {
+        return ChainstateLoadingError::ERROR_UPGRADING_EVO_DB;
+    }
+    if (!mnhf_manager->ForceSignalDBUpdate()) {
+        return ChainstateLoadingError::ERROR_UPGRADING_SIGNALS_DB;
     }
 
     return std::nullopt;
@@ -286,48 +284,46 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
         return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull();
     };
 
-    {
-        LOCK(cs_main);
-
-        for (CChainState* chainstate : chainman.GetAll()) {
-            if (!is_coinsview_empty(chainstate)) {
-                const CBlockIndex* tip = chainstate->m_chain.Tip();
-                if (tip && tip->nTime > get_unix_time_seconds() + 2 * 60 * 60) {
-                    return ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE;
-                }
-                const bool v19active{DeploymentActiveAfter(tip, consensus_params, Consensus::DEPLOYMENT_V19)};
-                if (v19active) {
-                    bls::bls_legacy_scheme.store(false);
-                    LogPrintf("%s: bls_legacy_scheme=%d\n", __func__, bls::bls_legacy_scheme.load());
-                }
-
-                if (!CVerifyDB().VerifyDB(
-                        *chainstate, consensus_params, chainstate->CoinsDB(),
-                        evodb,
-                        check_level,
-                        check_blocks)) {
-                    return ChainstateLoadVerifyError::ERROR_CORRUPTED_BLOCK_DB;
-                }
-
-                // VerifyDB() disconnects blocks which might result in us switching back to legacy.
-                // Make sure we use the right scheme.
-                if (v19active && bls::bls_legacy_scheme.load()) {
-                    bls::bls_legacy_scheme.store(false);
-                    LogPrintf("%s: bls_legacy_scheme=%d\n", __func__, bls::bls_legacy_scheme.load());
-                }
-
-                if (check_level >= 3) {
-                    chainstate->ResetBlockFailureFlags(nullptr);
-                }
-
-            } else {
-                // TODO: CEvoDB instance should probably be a part of CChainState
-                // (for multiple chainstates to actually work in parallel)
-                // and not a global
-                if (&chainman.ActiveChainstate() == chainstate && !evodb.IsEmpty()) {
-                    // EvoDB processed some blocks earlier but we have no blocks anymore, something is wrong
-                    return ChainstateLoadVerifyError::ERROR_EVO_DB_SANITY_FAILED;
-                }
+    LOCK(cs_main);
+
+    for (CChainState* chainstate : chainman.GetAll()) {
+        if (!is_coinsview_empty(chainstate)) {
+            const CBlockIndex* tip = chainstate->m_chain.Tip();
+            if (tip && tip->nTime > get_unix_time_seconds() + 2 * 60 * 60) {
+                return ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE;
+            }
+            const bool v19active{DeploymentActiveAfter(tip, consensus_params, Consensus::DEPLOYMENT_V19)};
+            if (v19active) {
+                bls::bls_legacy_scheme.store(false);
+                LogPrintf("%s: bls_legacy_scheme=%d\n", __func__, bls::bls_legacy_scheme.load());
+            }
+
+            if (!CVerifyDB().VerifyDB(
+                    *chainstate, consensus_params, chainstate->CoinsDB(),
+                    evodb,
+                    check_level,
+                    check_blocks)) {
+                return ChainstateLoadVerifyError::ERROR_CORRUPTED_BLOCK_DB;
+            }
+
+            // VerifyDB() disconnects blocks which might result in us switching back to legacy.
+            // Make sure we use the right scheme.
+            if (v19active && bls::bls_legacy_scheme.load()) {
+                bls::bls_legacy_scheme.store(false);
+                LogPrintf("%s: bls_legacy_scheme=%d\n", __func__, bls::bls_legacy_scheme.load());
+            }
+
+            if (check_level >= 3) {
+                chainstate->ResetBlockFailureFlags(nullptr);
+            }
+
+        } else {
+            // TODO: CEvoDB instance should probably be a part of CChainState
+            // (for multiple chainstates to actually work in parallel)
+            // and not a global
+            if (&chainman.ActiveChainstate() == chainstate && !evodb.IsEmpty()) {
+                // EvoDB processed some blocks earlier but we have no blocks anymore, something is wrong
+                return ChainstateLoadVerifyError::ERROR_EVO_DB_SANITY_FAILED;
             }
         }
     }