refactor: Move GetDifficulty out of rpc/server.h#10095
Merged
laanwj merged 3 commits intobitcoin:masterfrom Mar 31, 2017
Merged
refactor: Move GetDifficulty out of rpc/server.h#10095laanwj merged 3 commits intobitcoin:masterfrom
rpc/server.h#10095laanwj merged 3 commits intobitcoin:masterfrom
Conversation
It has no business in `rpcserver.h`. Define it in the interface header
of the implementation unit `rpcblockchain` where it is defined.
Also modernize the signature to:
double GetDifficulty(const CBlockIndex* blockindex = nullptr);
(remove `extern`, replace `NULL` with `nullptr`)
Contributor
|
Tested ACK e6dcfee Can |
Contributor
|
utACK e6dcfee |
Member
Author
|
@jnewbery Done |
Member
Author
|
I see rest.cpp also uses a few functions from this file: Going to add them to the header as well. |
laanwj
force-pushed
the
2017_03_getdifficulty_header
branch
from
de4b7ac to
c7e9aa7
Compare
Contributor
|
Looks good to me. Tested ACK c7e9aa7c1a92adba141958e5f86d267f34cc9508 |
dcousens
approved these changes
Mar 27, 2017
Contributor
|
ScriptPubKeyToJSON and TxToJSON are defined in https://github.com/bitcoin/bitcoin/blob/master/src/rpc/rawtransaction.cpp#L37 not rpc/blockchain.cpp. Either move the declaration or the definition for both to be in the same .h and .cpp utACK c7e9aa7c1a92adba141958e5f86d267f34cc9508 modulo nit. |
Member
Author
|
@jtimon Good catch. I'll move them to their own header. |
Contributor
|
Or just refactor them out entirely since they're duplicate code: #8824 |
Member
Author
|
Yes makes sense I'll just remove them from the header and ignore them for
this PR.
…On Mar 28, 2017 7:32 PM, "John Newbery" ***@***.***> wrote:
Or just refactor them out entirely since they're duplicate code: #8824
<#8824>
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#10095 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAHutvB4r9J2Zyy0H9ZM1oTxiQvWUJbEks5rqUQogaJpZM4MqMwJ>
.
|
laanwj
force-pushed
the
2017_03_getdifficulty_header
branch
from
c7e9aa7 to
f885b67
Compare
Member
Author
|
Done, now those two lines remain in |
laanwj
added a commit
that referenced
this pull request
Mar 31, 2017
f885b67 refactor: Make rest.cpp dependency on `*toJSON` in `blockchain.cpp` explicit (Wladimir J. van der Laan) 8d8f28d refactor: Move RPCNotifyBlockChange out of `rpc/server.h` (Wladimir J. van der Laan) e6dcfee refactor: Move GetDifficulty out of `rpc/server.h` (Wladimir J. van der Laan) Tree-SHA512: fc2656611d18442f2fddba5ac1554d958151f6785c2039afdfc36735d7e71592d9686ff6cc7b2ad95180071d7514470e62c52d697c5a1e88f851bddaf5942edb
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
May 20, 2019
f885b67 refactor: Make rest.cpp dependency on `*toJSON` in `blockchain.cpp` explicit (Wladimir J. van der Laan) 8d8f28d refactor: Move RPCNotifyBlockChange out of `rpc/server.h` (Wladimir J. van der Laan) e6dcfee refactor: Move GetDifficulty out of `rpc/server.h` (Wladimir J. van der Laan) Tree-SHA512: fc2656611d18442f2fddba5ac1554d958151f6785c2039afdfc36735d7e71592d9686ff6cc7b2ad95180071d7514470e62c52d697c5a1e88f851bddaf5942edb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GetDifficultyhas no business inrpcserver.h. Define it in the interface header of the implementation unitrpcblockchainwhere it is defined.Also modernize the signature to:
(remove
extern, replaceNULLwithnullptr)