Explicitly pass Consensus::Params to functions:
-CheckBlockIndex -DisconnectTip -GetTransaction -InvalidateBlock -ProcessGetData -ReadBlockFromDisk
Without counting the following consensus functions (which is done in #6591):
-CheckBlockHeader -CheckBlock -ContextualCheckBlockHeader -ContextualCheckBlock
These are all the functions that use Consensus::Params but not CChainParams.
Asking a dumb but sincere question: why?
These parameters are global and constant to main, the module being modified. This change appears to add parameters for little apparent gain.
Is this an intermediate step to the code being moved to libconsensus?
Well, these are actually the methods that are not required for libconsensus but still use Consensus::Params. This is part of a bigger process of making CChainParams being explicitly passed as a const reference instead of using the Params() function all around. Basically that function is a way to hide a global that @theuni and I want to take out of chainparams.
Passing it explicitly as a parameter is also good for testing. Eventually we should be able to remove this line: https://github.com/bitcoin/bitcoin/blob/master/src/test/test_bitcoin.cpp#L36
#5970 is closed but contains this and more of the same, to get a better view of what all this is about. Some of the changes there are no longer necessary because other PRs have kindly incorporated it when they were changing the function’s parameters already.
2266@@ -2264,6 +2267,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
2267 * that is already loaded (to avoid loading it again from disk).
2268 */
2269 bool ActivateBestChain(CValidationState &state, const CBlock *pblock) {
2270+ const CChainParams& chainparams = Params();
2271 CBlockIndex *pindexNewTip = NULL;
2272 CBlockIndex *pindexMostWork = NULL;
2273 const CChainParams& chainParams = Params();
2063@@ -2063,13 +2064,14 @@ static int64_t nTimePostConnect = 0;
2064 * corresponding to pindexNew, to bypass loading it again from disk.
2065 */
2066 bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, const CBlock *pblock) {
2067+ const CChainParams& chainparams = Params();
chainparams over chainParams? camelCase is used consistently for most other variables.
-CheckBlockIndex
-DisconnectTip
-GetTransaction
-InvalidateBlock
-ProcessGetData
-ReadBlockFromDisk