Move CheckBlockIndex to validation.cpp

Mark Erhardt · Mark Erhardt · commit eec860857732 · 2019-11-11T18:02:31.000-05:00
The global fCheckBlockIndex is only used once and has no interaction.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1009,7 +1009,6 @@ bool AppInitParameterInteraction()
     if (ratio != 0) {
         mempool.setSanityCheck(1.0 / ratio);
     }
-    fCheckBlockIndex = gArgs.GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());
     fCheckpointsEnabled = gArgs.GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED);
 
     hashAssumeValid = uint256S(gArgs.GetArg("-assumevalid", chainparams.GetConsensus().defaultAssumeValid.GetHex()));
@@ -1133,6 +1132,8 @@ bool AppInitParameterInteraction()
 
     nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
+    ValidationParameterInteraction(chainparams);
+
     return true;
 }
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -68,6 +68,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
     fs::create_directories(m_path_root);
     gArgs.ForceSetArg("-datadir", m_path_root.string());
     ClearDatadirCache();
+    gArgs.ForceSetArg("-checkblockindex", "1");
     SelectParams(chainName);
     SeedInsecureRand();
     gArgs.ForceSetArg("-printtoconsole", "0");
@@ -79,7 +80,6 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    fCheckBlockIndex = true;
     static bool noui_connected = false;
     if (!noui_connected) {
         noui_connect();
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -180,6 +180,11 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
 
 std::unique_ptr<CBlockTreeDB> pblocktree;
 
+void ValidationParameterInteraction(const CChainParams& chainparams)
+{
+    fCheckBlockIndex = gArgs.GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());
+}
+
 // See definition for documentation
 static void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight);
 static void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight);
diff --git a/src/validation.h b/src/validation.h
@@ -152,7 +152,6 @@ extern std::atomic_bool fReindex;
  */
 extern bool g_parallel_script_checks;
 extern bool fRequireStandard;
-extern bool fCheckBlockIndex;
 extern bool fCheckpointsEnabled;
 extern size_t nCoinCacheUsage;
 /** A fee rate smaller than this is considered zero fee (for relaying, mining and transaction creation) */
@@ -293,6 +292,9 @@ int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::D
 /** Apply the effects of this transaction on the UTXO set represented by view */
 void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 
+/** Parse and validate parameters only used in validation.cpp */
+void ValidationParameterInteraction(const CChainParams& chainparams);
+
 /** Transaction validation functions */
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,6 @@ bool AppInitParameterInteraction()`
`1009`	`1009`	`if (ratio != 0) {`
`1010`	`1010`	`mempool.setSanityCheck(1.0 / ratio);`
`1011`	`1011`	`}`
`1012`		`- fCheckBlockIndex = gArgs.GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());`
`1013`	`1012`	`fCheckpointsEnabled = gArgs.GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED);`
`1014`	`1013`
`1015`	`1014`	`hashAssumeValid = uint256S(gArgs.GetArg("-assumevalid", chainparams.GetConsensus().defaultAssumeValid.GetHex()));`
`@@ -1133,6 +1132,8 @@ bool AppInitParameterInteraction()`
`1133`	`1132`
`1134`	`1133`	`nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);`
`1135`	`1134`
	`1135`	`+ ValidationParameterInteraction(chainparams);`
	`1136`	`+`
`1136`	`1137`	`return true;`
`1137`	`1138`	`}`
`1138`	`1139`