diff options
| author | Matt Corallo <git@bluematt.me> | 2017-08-01 17:02:10 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-08-01 17:02:10 -0400 |
| commit | e7539f864984740b80efc44e1a8970f4353ff066 (patch) | |
| tree | 5528c6baf4a2a9e588abb4d45f527bc8f81fec35 | |
| parent | 13ab353829bfcf928a0dd88cc9841e6515eea111 (diff) | |
Fix some broken init-time prints/constants
| -rw-r--r-- | src/init.cpp | 5 | ||||
| -rw-r--r-- | src/test/test_bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/validation.cpp | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index ae84e49cd8..ca62d3e7cc 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1440,8 +1440,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) } // 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. - // This is called again in ThreadImport in the reindex completes. + // 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)) { strLoadError = _("Error initializing block database"); break; diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 545e56983c..e2e0a9668f 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -75,7 +75,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha pcoinsdbview = new CCoinsViewDB(1 << 23, true); pcoinsTip = new CCoinsViewCache(pcoinsdbview); if (!LoadGenesisBlock(chainparams)) { - throw std::runtime_error("InitBlockIndex failed."); + throw std::runtime_error("LoadGenesisBlock failed."); } { CValidationState state; diff --git a/src/validation.cpp b/src/validation.cpp index babf6f1522..405ff356f5 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3916,7 +3916,6 @@ bool LoadGenesisBlock(const CChainParams& chainparams) if (mapBlockIndex.count(chainparams.GenesisBlock().GetHash())) return true; - // Only add the genesis block if not reindexing (in which case we reuse the one already on disk) try { CBlock &block = const_cast<CBlock&>(chainparams.GenesisBlock()); // Start new block file |