validation: Remove global ::LoadGenesisBlock

dongcarl · dongcarl · commit 4927c9e6991b · 2021-02-22T11:48:39.000-05:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -717,7 +717,7 @@ static void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImp
         fReindex = false;
         LogPrintf("Reindexing finished\n");
         // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
-        LoadGenesisBlock(chainparams);
+        ::ChainstateActive().LoadGenesisBlock(chainparams);
     }
 
     // -loadblock=
@@ -1630,7 +1630,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
                 // 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 && !LoadGenesisBlock(chainparams)) {
+                if (!fReindex && !::ChainstateActive().LoadGenesisBlock(chainparams)) {
                     strLoadError = _("Error initializing block database");
                     break;
                 }
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -179,7 +179,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     assert(!::ChainstateActive().CanFlushToDisk());
     ::ChainstateActive().InitCoinsCache(1 << 23);
     assert(::ChainstateActive().CanFlushToDisk());
-    if (!LoadGenesisBlock(chainparams)) {
+    if (!::ChainstateActive().LoadGenesisBlock(chainparams)) {
         throw std::runtime_error("LoadGenesisBlock failed.");
     }
 
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4642,11 +4642,6 @@ bool CChainState::LoadGenesisBlock(const CChainParams& chainparams)
     return true;
 }
 
-bool LoadGenesisBlock(const CChainParams& chainparams)
-{
-    return ::ChainstateActive().LoadGenesisBlock(chainparams);
-}
-
 void CChainState::LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, FlatFilePos* dbp)
 {
     // Map of disk positions for blocks with unknown parent (only used for reindex)

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const`
`179`	`179`	`assert(!::ChainstateActive().CanFlushToDisk());`
`180`	`180`	`::ChainstateActive().InitCoinsCache(1 << 23);`
`181`	`181`	`assert(::ChainstateActive().CanFlushToDisk());`
`182`		`- if (!LoadGenesisBlock(chainparams)) {`
	`182`	`+ if (!::ChainstateActive().LoadGenesisBlock(chainparams)) {`
`183`	`183`	`throw std::runtime_error("LoadGenesisBlock failed.");`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -4642,11 +4642,6 @@ bool CChainState::LoadGenesisBlock(const CChainParams& chainparams)`
`4642`	`4642`	`return true;`
`4643`	`4643`	`}`
`4644`	`4644`
`4645`		`-bool LoadGenesisBlock(const CChainParams& chainparams)`
`4646`		`-{`
`4647`		`- return ::ChainstateActive().LoadGenesisBlock(chainparams);`
`4648`		`-}`
`4649`		`-`
`4650`	`4645`	`void CChainState::LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, FlatFilePos* dbp)`
`4651`	`4646`	`{`
`4652`	`4647`	`// Map of disk positions for blocks with unknown parent (only used for reindex)`