-
Notifications
You must be signed in to change notification settings - Fork 38.7k
Removed redundant parameter from mempool.PrioritiseTransaction #9801
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
Conversation
jonasschnelli
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense. Thanks.
utACK 8e88a445dc9de71657282a461cb6b679c9079ebd
|
ACK 8e88a44 |
|
utACK 8e88a44
|
src/txmempool.cpp
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps while you're at it you could make this const uint256& hash?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done deal, thanks.
(squashed and rebased)
src/txmempool.h
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The redundant parameter is not removed, as mentioned in the commit message.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can run make check locally as a quick sanity check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, something got screwed with the rebase, re-uploaded now. Thanks.
(Also made the `const uint256 hash` parameter a `const uint256& hash` as suggested by @sdaftuar)
|
ACK eaea2bb |
|
utACK eaea2bb |
…action eaea2bb Removed redundant parameter from mempool.PrioritiseTransaction (gubatron)
…seTransaction eaea2bb Removed redundant parameter from mempool.PrioritiseTransaction (gubatron)
* Merge bitcoin#9815: Trivial: use EXIT_ codes instead of magic numbers a87d02a use EXIT_ codes instead of magic numbers (Marko Bencun) * Merge bitcoin#9801: Removed redundant parameter from mempool.PrioritiseTransaction eaea2bb Removed redundant parameter from mempool.PrioritiseTransaction (gubatron) * remove extra parameter (see 3a3745bb) in dash specific code * Merge bitcoin#9819: Remove harmless read of unusued priority estimates bc8fd12 Remove harmless read of unusued priority estimates (Alex Morcos) * Merge bitcoin#9766: Add --exclude option to rpc-tests.py c578408 Add exclude option to rpc-tests.py (John Newbery) * Merge bitcoin#9577: Fix docstrings in qa tests 3f95a80 Fix docstrings in qa tests (John Newbery) * Merge bitcoin#9823: qa: Set correct path for binaries in rpc tests 3333ad0 qa: Set correct path for binaries in rpc tests (MarcoFalke) * Merge bitcoin#9833: Trivial: fix comments referencing AppInit2 ef9f495 Trivial: fix comments referencing AppInit2 (Marko Bencun) * Merge bitcoin#9612: [trivial] Rephrase the definition of difficulty. dc222f8 Trivial: Rephrase the definition of difficulty in the code. (Karl-Johan Alm) * Merge bitcoin#9847: Extra test vector for BIP32 30aedcb BIP32 extra test vector (Pieter Wuille) * Merge bitcoin#9839: [qa] Make import-rescan.py watchonly check reliable 864890a [qa] Make import-rescan.py watchonly check reliable (Russell Yanofsky) Tree-SHA512: ea0e2b1d4fc8f35174c3d575fb751b428daf6ad3aa944fad4e3ddcc9195e4f17051473acabc54203b1d27cca64cf911b737ab92e986c40ef384410652e2dbea1 * Change back file params
The string parameter is used only for logging.
The only place where the
stringform of the hash isn't recalculated is atsrc/rpc/mining.cppwhere it's obtained from the arguments, however, in this case theuint256hash is then parsed from the givenstring.In every other use of the function, the
stringrepresentation is always calculated from theuint256 hashobject (either withToString()or withGetHash()), so no real benefit on having this redundant parameter.This also makes the API more consistent with other methods that only receive the
uint256hash parameter.