refactor: use `Hash` helpers for double-SHA256 calculations #27010

pull theStack wants to merge 1 commits into bitcoin:master from theStack:202301-refactor-use_double_sha256_helper changing 5 files +8 −23

theStack commented at 6:51 PM on January 31, 2023: contributor

We have two helper templates Hash(const T& in1) and Hash(const T& in1, const T& in2) available for calculating the double-SHA256 hash of one object or two concatenated objects, respectively:

https://github.com/bitcoin/bitcoin/blob/b5868f4b1f884e8d6612f34ca4005fe3a992053d/src/hash.h#L74-L89

This PR uses them in order to increase readability and simplify the code. As in #15294 (which inspired this PR, doing the same for RIPEMD160), the helper is not utilized in validation.cpp and script/interpreter.cpp to avoid touching consensus-relevant code.
refactor: use `Hash` helper for double-SHA256 calculations 87f11ef47f
DrahtBot commented at 6:51 PM on January 31, 2023: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK john-moffett, stickies-v, MarcoFalke

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #26390 (index: Compare deserialized block hash with the block hash from the blockindex by kcalvinalvin)
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.
DrahtBot added the label Refactoring on Jan 31, 2023
john-moffett approved
john-moffett commented at 8:49 PM on January 31, 2023: contributor

ACK 87f11ef47fea31d51bcc3f5df68f78fb28e3d8dd

It does make it far more readable. I looked and couldn't find any other suitable places to use the helpers.
stickies-v approved
stickies-v commented at 9:51 PM on January 31, 2023: contributor

ACK 87f11ef47fea31d51bcc3f5df68f78fb28e3d8dd

Avoid duplication, easier to read, can't see behaviour change.
maflcko approved