validation: Remove global ::ActivateBestChain

Instead use CChainState::ActivateBestChain, which is what the global one
calls anyway.
This commit is contained in:
Carl Dong
2020-09-15 15:26:36 -04:00
parent 2a696472a1
commit 5f8cd7b3a5
5 changed files with 9 additions and 18 deletions

View File

@@ -1603,7 +1603,7 @@ static RPCHelpMan invalidateblock()
InvalidateBlock(state, Params(), pblockindex);
if (state.IsValid()) {
ActivateBestChain(state, Params());
::ChainstateActive().ActivateBestChain(state, Params());
}
if (!state.IsValid()) {
@@ -1643,7 +1643,7 @@ static RPCHelpMan reconsiderblock()
}
BlockValidationState state;
ActivateBestChain(state, Params());
::ChainstateActive().ActivateBestChain(state, Params());
if (!state.IsValid()) {
throw JSONRPCError(RPC_DATABASE_ERROR, state.ToString());