Skip to content

Simplify and rename CheckWork to ProcessBlockFound#4603

Merged
laanwj merged 1 commit intobitcoin:masterfrom
jtimon:miner
Aug 12, 2014
Merged

Simplify and rename CheckWork to ProcessBlockFound#4603
laanwj merged 1 commit intobitcoin:masterfrom
jtimon:miner

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Jul 29, 2014

6 lines less with no functional difference.

sipa
sipa reviewed Jul 29, 2014
View reviewed changes
src/miner.cpp Outdated
Copy link
Member

@sipa sipa Jul 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will print "proof-of-work found" for attempts that do not match the target.

Copy link
Member

@sipa sipa Jul 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, it seems we checked the hash vs target twice (and a third time inside ProcessBlock!), and you're removing one. Good.

@gavinandresen
Copy link
Contributor

gavinandresen commented Jul 29, 2014

ACK. nit: I'd delete the useless comment: //// debug print

@jtimon
Copy link
Contributor Author

jtimon commented Jul 30, 2014

Done, now it's 7 lines less.

@BitcoinPullTester
Copy link

BitcoinPullTester commented Jul 30, 2014

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4603_f0c2915f66ade456c9d7847ea64fef09e1a12975/ for binaries and test log.
This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/
Contact BlueMatt on freenode if something looks broken.

@jgarzik
Copy link
Contributor

jgarzik commented Jul 30, 2014

ut ACK

@jtimon
Copy link
Contributor Author

jtimon commented Aug 12, 2014

Ping @laanwj removing code here too.

@laanwj laanwj merged commit f0c2915 into bitcoin:master Aug 12, 2014
laanwj added a commit that referenced this pull request Aug 12, 2014
@laanwj
Merge pull request #4603
a38a98c 
f0c2915 Simplify and rename CheckWork to ProcessBlockFound (jtimon)
@jtimon jtimon deleted the miner branch August 12, 2014 21:31
@jtimon jtimon mentioned this pull request Aug 30, 2014
Closed
@paveljanik paveljanik mentioned this pull request Dec 28, 2014
Closed
jonasschnelli added a commit to jonasschnelli/bitcoin that referenced this pull request Dec 29, 2014
@jonasschnelli
CheckWork was renamed to ProcessBlockFound in bitcoin#4603
2a72e92 
- there is no use outside miner.cpp
@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.

6 participants

@jtimon @gavinandresen @BitcoinPullTester @jgarzik @sipa @laanwj