Globals: Pass Consensus::Params through CBlockTreeDB::LoadBlockIndexGuts() #9176

pull jtimon wants to merge 1 commits into bitcoin:master from jtimon:0.13-chainparams-loadblockindexguts changing 3 files +6 −6

jtimon commented at 6:45 AM on November 17, 2016: contributor

Part of #7829
jtimon cross-referenced this on Nov 17, 2016 from issue Globals: TODO: Experiment: Kill "Params()" by jtimon
jtimon force-pushed on Nov 17, 2016

in src/txdb.cpp:None in 2d194fa50d outdated

 198 | @@ -199,8 +199,8 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256
 199 |                  pindexNew->nStatus        = diskindex.nStatus;
 200 |                  pindexNew->nTx            = diskindex.nTx;
 201 |  
 202 | -                if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits, Params().GetConsensus()))
 203 | -                    return error("LoadBlockIndex(): CheckProofOfWork failed: %s", pindexNew->ToString());
 204 | +                if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits, consensusParams))
 205 | +                    return error("%s: CheckProofOfWork failed: %s", __func__, pindexNew->ToString());

mrbandrews commented at 7:23 PM on November 17, 2016:

Nit: if you're changing to use func, there's another opportunity to do so a few lines below so the style is consistent.

mrbandrews commented at 7:24 PM on November 17, 2016: contributor

Code review ACK
jtimon force-pushed on Nov 18, 2016
jtimon commented at 9:52 PM on November 18, 2016: contributor

Updated fixing @mrbandrews 's nit.
jtimon force-pushed on Dec 3, 2016
jtimon commented at 7:25 AM on December 3, 2016: contributor

Needed rebase after renaming main.o, see #9260 (although needed, the rebase was clean in this case)
jtimon cross-referenced this on Jan 24, 2017 from issue Docs: Update CONTRIBUTING.md by jnewbery
jtimon cross-referenced this on Apr 27, 2017 from issue Add a CChainState class to validation.cpp to take another step towards clarifying internal interfaces by TheBlueMatt
Globals: Pass Consensus::Params through CBlockTreeDB::LoadBlockIndexGuts() b324b28209
jtimon force-pushed on May 18, 2017
jtimon commented at 8:26 PM on May 18, 2017: contributor

Needed rebase
laanwj commented at 8:01 AM on June 25, 2017: member

utACK b324b28
laanwj merged this on Jun 25, 2017
laanwj closed this on Jun 25, 2017
laanwj referenced this in commit d609fd85ca on Jun 25, 2017
jtimon deleted the branch on Jun 26, 2017
jtimon cross-referenced this on Jun 26, 2017 from issue Testchains: Introduce custom chain whose constructor... by jtimon
PastaPastaPasta referenced this in commit 30b6457aa1 on Jul 6, 2019
PastaPastaPasta referenced this in commit 3421d8e7de on Jul 8, 2019
PastaPastaPasta referenced this in commit 3e1b4c2760 on Jul 9, 2019
PastaPastaPasta referenced this in commit 8677d7599b on Jul 11, 2019
barrystyle referenced this in commit 31c8a01b97 on Jan 22, 2020
bitcoin locked this on Sep 8, 2021

Contributors

jtimon

mrbandrews

laanwj

Linked (view graph)

#7829 Globals: TODO: Experiment: Kill "Params()"#8994 Testchains: Introduce custom chain whose constructor... #9260 Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp})#9542 Docs: Update CONTRIBUTING.md #10279 Add a CChainState class to validation.cpp to take another step towards clarifying internal interfaces