diff options
| author | fanquake <fanquake@gmail.com> | 2020-01-29 20:02:35 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-01-29 20:16:00 +0800 |
| commit | e061b8dc8fba9831db1f674bc1965244d3c11c19 (patch) | |
| tree | 0b09a99d6c097a0e81897dbb395587177530ea54 /src | |
| parent | 1326092e6cef8c58353c1d6438870c9a35266fd1 (diff) | |
| parent | e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a (diff) | |
| download | bitcoin-e061b8dc8fba9831db1f674bc1965244d3c11c19.tar.xz | |
Merge #17971: refactor: Remove redundant conditional
e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a refactor: Remove redundant conditional (Bushstar)
Pull request description:
Conditional check against fMaster is now redundant as it is already checked as true. This originally made sense as the outer conditional was:
https://github.com/bitcoin/bitcoin/blob/f9cae832e6f56c6abe89b3bf05d1f176c2a7c913/src/checkqueue.h#L86
Removal of fQuit happened in the commit below.
https://github.com/bitcoin/bitcoin/commit/30ded3e3d888f75b6fa8b2e55a3883f799e00775#diff-88316c9aa9514c038c9304297e672da5
ACKs for top commit:
theStack:
ACK https://github.com/bitcoin/bitcoin/commit/e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
hebasto:
ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a, I have reviewed the code, and it looks OK, I agree it can be merged.
promag:
ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a.
emilengler:
re-ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
practicalswift:
ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
Empact:
ACK https://github.com/bitcoin/bitcoin/pull/17971/commits/e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
Tree-SHA512: 136ea1d02e3d65100a8758730617ccede7864e08e8404e42e65d45d4bf95a3bfea2ab9895c6e8833abd654557d3efbba02b25297a2a5eefc36a11e97bbe9134f
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkqueue.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/checkqueue.h b/src/checkqueue.h index 978e23a7c4..9dab5a09ac 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -90,8 +90,7 @@ private: nTotal--; bool fRet = fAllOk; // reset the status for new work later - if (fMaster) - fAllOk = true; + fAllOk = true; // return the current status return fRet; } |