Move init logistics message for BAD_GENESIS_BLOCK to init.cpp

Summary: Partial backport of [[bitcoin/bitcoin#23280 | core#23280]]: bitcoin/bitcoin@975235c Depends on D12567. Test Plan: Read the comment. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D12568
Bitcoin-ABC · Nov 22, 2022 · 6df3904 · 6df3904
1 parent aa1cc47
commit 6df3904
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -2481,6 +2481,9 @@ bool AppInitMain(Config &config, RPCServer &rpcServer,
                     strLoadError = _("Error loading block database");
                     break;
                 case ChainstateLoadingError::ERROR_BAD_GENESIS_BLOCK:
+                    // If the loaded chain has a wrong genesis, bail out
+                    // immediately (we're likely using a testnet datadir, or
+                    // the other way around).
                     return InitError(_("Incorrect or no genesis block found. "
                                        "Wrong datadir for network?"));
                 case ChainstateLoadingError::ERROR_PRUNED_NEEDS_REINDEX:

diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -76,8 +76,6 @@ LoadChainstate(bool fReset, ChainstateManager &chainman, CTxMemPool *mempool,
                 return ChainstateLoadingError::ERROR_LOADING_BLOCK_DB;
             }
 
-            // If the loaded chain has a wrong genesis, bail out immediately
-            // (we're likely using a testnet datadir, or the other way around).
             if (!chainman.BlockIndex().empty() &&
                 !chainman.m_blockman.LookupBlockIndex(
                     chainparams.GetConsensus().hashGenesisBlock)) {