refactor: move RewindBlockIndex to CChainState

jamesob · jamesob · commit e7bc059491d5 · 2020-01-27T15:13:59.000-05:00
This is in preparation for multiple chainstate initialization in init.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1568,7 +1568,7 @@ bool AppInitMain(NodeContext& node)
                 // It both disconnects blocks based on ::ChainActive(), and drops block data in
                 // BlockIndex() based on lack of available witness data.
                 uiInterface.InitMessage(_("Rewinding blocks...").translated);
-                if (!RewindBlockIndex(chainparams)) {
+                if (!::ChainstateActive().RewindBlockIndex(chainparams)) {
                     strLoadError = _("Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain").translated;
                     break;
                 }
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4532,26 +4532,15 @@ bool CChainState::RewindBlockIndex(const CChainParams& params)
             PruneBlockIndexCandidates();
 
             CheckBlockIndex(params.GetConsensus());
-        }
-    }
-
-    return true;
-}
-
-bool RewindBlockIndex(const CChainParams& params) {
-    if (!::ChainstateActive().RewindBlockIndex(params)) {
-        return false;
-    }
 
-    LOCK(cs_main);
-    if (::ChainActive().Tip() != nullptr) {
-        // FlushStateToDisk can possibly read ::ChainActive(). Be conservative
-        // and skip it here, we're about to -reindex-chainstate anyway, so
-        // it'll get called a bunch real soon.
-        BlockValidationState state;
-        if (!::ChainstateActive().FlushStateToDisk(params, state, FlushStateMode::ALWAYS)) {
-            LogPrintf("RewindBlockIndex: unable to flush state to disk (%s)\n", FormatStateMessage(state));
-            return false;
+            // FlushStateToDisk can possibly read ::ChainActive(). Be conservative
+            // and skip it here, we're about to -reindex-chainstate anyway, so
+            // it'll get called a bunch real soon.
+            BlockValidationState state;
+            if (!FlushStateToDisk(params, state, FlushStateMode::ALWAYS)) {
+                LogPrintf("RewindBlockIndex: unable to flush state to disk (%s)\n", FormatStateMessage(state));
+                return false;
+            }
         }
     }
 
diff --git a/src/validation.h b/src/validation.h
@@ -379,9 +379,6 @@ bool TestBlockValidity(BlockValidationState& state, const CChainParams& chainpar
  *  Note that transaction witness validation rules are always enforced when P2SH is enforced. */
 bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params);
 
-/** When there are blocks in the active chain with missing data, rewind the chainstate and remove them from the block index */
-bool RewindBlockIndex(const CChainParams& params) LOCKS_EXCLUDED(cs_main);
-
 /** Compute at which vout of the block's coinbase transaction the witness commitment occurs, or -1 if not found */
 int GetWitnessCommitmentIndex(const CBlock& block);
 

Original file line number	Diff line number	Diff line change
`@@ -1568,7 +1568,7 @@ bool AppInitMain(NodeContext& node)`
`1568`	`1568`	`// It both disconnects blocks based on ::ChainActive(), and drops block data in`
`1569`	`1569`	`// BlockIndex() based on lack of available witness data.`
`1570`	`1570`	`uiInterface.InitMessage(_("Rewinding blocks...").translated);`
`1571`		`- if (!RewindBlockIndex(chainparams)) {`
	`1571`	`+ if (!::ChainstateActive().RewindBlockIndex(chainparams)) {`
`1572`	`1572`	`strLoadError = _("Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain").translated;`
`1573`	`1573`	`break;`
`1574`	`1574`	`}`