diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -994,7 +994,7 @@ void InvalidChainFound(CBlockIndex *pindexNew) EXCLUSIVE_LOCKS_REQUIRED(cs_main); CBlockIndex *FindMostWorkChain() EXCLUSIVE_LOCKS_REQUIRED(cs_main); - bool MarkBlockAsFinal(const Config &config, BlockValidationState &state, + bool MarkBlockAsFinal(BlockValidationState &state, const CBlockIndex *pindex) EXCLUSIVE_LOCKS_REQUIRED(cs_main); void ReceivedBlockTransactions(const CBlock &block, CBlockIndex *pindexNew, diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2419,8 +2419,7 @@ } }; -bool CChainState::MarkBlockAsFinal(const Config &config, - BlockValidationState &state, +bool CChainState::MarkBlockAsFinal(BlockValidationState &state, const CBlockIndex *pindex) { AssertLockHeld(cs_main); if (pindex->nStatus.isInvalid()) { @@ -2451,8 +2450,7 @@ return true; } -static const CBlockIndex *FindBlockToFinalize(const Config &config, - CBlockIndex *pindexNew) +static const CBlockIndex *FindBlockToFinalize(CBlockIndex *pindexNew) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { AssertLockHeld(cs_main); @@ -2556,10 +2554,8 @@ } // Update the finalized block. - const CBlockIndex *pindexToFinalize = - FindBlockToFinalize(config, pindexNew); - if (pindexToFinalize && - !MarkBlockAsFinal(config, state, pindexToFinalize)) { + const CBlockIndex *pindexToFinalize = FindBlockToFinalize(pindexNew); + if (pindexToFinalize && !MarkBlockAsFinal(state, pindexToFinalize)) { return error("ConnectTip(): MarkBlockAsFinal %s failed (%s)", pindexNew->GetBlockHash().ToString(), state.ToString()); @@ -3373,7 +3369,7 @@ CBlockIndex *pindexToInvalidate = nullptr; { LOCK(cs_main); - if (!MarkBlockAsFinal(config, state, pindex)) { + if (!MarkBlockAsFinal(state, pindex)) { // state is set by MarkBlockAsFinal. return false; }