Correct mistakes in #4377 and #4796 #5170

pull jtimon wants to merge 2 commits into bitcoin:master from jtimon:pow3 changing 6 files +20 −26

jtimon commented at 8:15 PM on October 29, 2014: contributor
1. In c2c02f3fa99385f5a5be722fda6f71522c93bdaa, UpdateTime() should have moved to miner.cpp directly instead of pow.o.
2. After #4796, pow.cpp doesn't depend on main.h but on chain.h.
3. In b343c1a1e34f851e70649ad1f49855a7d878f9ef, there was no need to conserve CBlockIndex::GetBlockWork() as facade.
I'm sorry and I want to fix it.
MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h) 22c4272bf4
CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex) 092b58d13d
jtimon cross-referenced this on Oct 29, 2014 from issue Continue proof of work encapsulation by jtimon
laanwj added the label Improvement on Oct 30, 2014
sipa commented at 7:02 PM on November 3, 2014: member

utACK
laanwj merged this on Nov 21, 2014
laanwj closed this on Nov 21, 2014
laanwj referenced this in commit f2ada138c2 on Nov 21, 2014
bitcoin locked this on Sep 8, 2021

Contributors

Labels