Skip to content

Commit e061b8d

Browse files
committed
Merge #17971: refactor: Remove redundant conditional
e80317b 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. bitcoin/bitcoin@30ded3e#diff-88316c9aa9514c038c9304297e672da5 ACKs for top commit: theStack: ACK bitcoin/bitcoin@e80317b hebasto: ACK e80317b, I have reviewed the code, and it looks OK, I agree it can be merged. promag: ACK e80317b. emilengler: re-ACK e80317b practicalswift: ACK e80317b Empact: ACK bitcoin/bitcoin@e80317b Tree-SHA512: 136ea1d02e3d65100a8758730617ccede7864e08e8404e42e65d45d4bf95a3bfea2ab9895c6e8833abd654557d3efbba02b25297a2a5eefc36a11e97bbe9134f
2 parents 1326092 + e80317b commit e061b8d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/checkqueue.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class CCheckQueue
9090
nTotal--;
9191
bool fRet = fAllOk;
9292
// reset the status for new work later
93-
if (fMaster)
94-
fAllOk = true;
93+
fAllOk = true;
9594
// return the current status
9695
return fRet;
9796
}

0 commit comments

Comments
 (0)