Skip to content

Correct mistakes in #4377 and #4796 #5170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
laanwj merged 2 commits into from
Nov 21, 2014
Merged

Correct mistakes in #4377 and #4796 #5170

laanwj merged 2 commits into from
Nov 21, 2014

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Oct 29, 2014

  1. In c2c02f3, UpdateTime() should have moved to miner.cpp directly instead of pow.o.
  2. After Move CBlockIndex, CChain and related code out of main #4796, pow.cpp doesn't depend on main.h but on chain.h.
  3. In b343c1a, there was no need to conserve CBlockIndex::GetBlockWork() as facade.

I'm sorry and I want to fix it.

@jtimon jtimon mentioned this pull request Oct 29, 2014
Closed
@sipa
Copy link
Member

sipa commented Nov 3, 2014

utACK

@laanwj laanwj merged commit 092b58d into bitcoin:master Nov 21, 2014
laanwj added a commit that referenced this pull request Nov 21, 2014
@laanwj
Merge pull request #5170
f2ada13 
092b58d CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex) (jtimon)
22c4272 MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h) (jtimon)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Refactoring

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jtimon @sipa @laanwj