diff --git a/src/miner.cpp b/src/miner.cpp --- a/src/miner.cpp +++ b/src/miner.cpp @@ -224,7 +224,7 @@ } CValidationState state; - if (!TestBlockValidity(*config, state, *pblock, pindexPrev, + if (!TestBlockValidity(state, config->GetChainParams(), *pblock, pindexPrev, BlockValidationOptions(*config) .withCheckPoW(false) .withCheckMerkleRoot(false))) { diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -490,7 +490,7 @@ return "inconclusive-not-best-prevblk"; } CValidationState state; - TestBlockValidity(config, state, block, pindexPrev, + TestBlockValidity(state, config.GetChainParams(), block, pindexPrev, BlockValidationOptions(config) .withCheckPoW(false) .withCheckMerkleRoot(true)); diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -606,7 +606,7 @@ * Check a block is completely valid from start to finish (only works on top of * our current best block, with cs_main held) */ -bool TestBlockValidity(const Config &config, CValidationState &state, +bool TestBlockValidity(CValidationState &state, const CChainParams ¶ms, const CBlock &block, CBlockIndex *pindexPrev, BlockValidationOptions validationOptions); diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4125,7 +4125,7 @@ return true; } -bool TestBlockValidity(const Config &config, CValidationState &state, +bool TestBlockValidity(CValidationState &state, const CChainParams ¶ms, const CBlock &block, CBlockIndex *pindexPrev, BlockValidationOptions validationOptions) { AssertLockHeld(cs_main); @@ -4138,27 +4138,25 @@ indexDummy.phashBlock = &block_hash; // NOTE: CheckBlockHeader is called by CheckBlock - if (!ContextualCheckBlockHeader(config.GetChainParams(), block, state, - pindexPrev, GetAdjustedTime())) { + if (!ContextualCheckBlockHeader(params, block, state, pindexPrev, + GetAdjustedTime())) { return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state)); } - if (!CheckBlock(block, state, config.GetChainParams().GetConsensus(), - validationOptions)) { + if (!CheckBlock(block, state, params.GetConsensus(), validationOptions)) { return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state)); } - if (!ContextualCheckBlock( - block, state, config.GetChainParams().GetConsensus(), pindexPrev)) { + if (!ContextualCheckBlock(block, state, params.GetConsensus(), + pindexPrev)) { return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state)); } - if (!g_chainstate.ConnectBlock(block, state, &indexDummy, viewNew, - config.GetChainParams(), validationOptions, - true)) { + if (!g_chainstate.ConnectBlock(block, state, &indexDummy, viewNew, params, + validationOptions, true)) { return false; }