Skip to content
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.

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

doc: correct GetDifficulty doc after #13288 #14135

Merged
merged 1 commit into from Sep 4, 2018

Conversation

Projects
None yet
3 participants
@fanquake
Copy link
Member

commented Sep 3, 2018

chain is no longer passed to GetDifficulty, and we just return 1.0 if no blockindex.

@fanquake fanquake added the Docs label Sep 3, 2018

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2018

Note to reviewers: This pull request conflicts with the following ones:
  • #12151 (rpc: Remove cs_main lock from blockToJSON and blockheaderToJSON by promag)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@laanwj laanwj merged commit 68bfc0b into bitcoin:master Sep 4, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Sep 4, 2018

Merge #14135: doc: correct GetDifficulty doc after #13288
68bfc0b doc: correct GetDifficulty doc after #13288 (fanquake)

Pull request description:

  `chain` is no longer passed to GetDifficulty, and we just return `1.0` if no `blockindex`.

Tree-SHA512: 701375d732f343200c4abfaf9039d5c12b10abff97b022e84564f81b26b5ba552f1eb0c0d0fd5370b29b53319eafcf39773a36e1c2dd04ee77e61c18c7b183fa

@fanquake fanquake deleted the fanquake:get-difficulty-doc branch Sep 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.