Simplify "!foo || (foo && bar)" as "!foo || bar"

bitcoin · 1e3a3200afd74b22fdbb5d9425722b0c031e7453 · practicalswift committed Jul 9, 2017 · Jul 9, 2017 · 1e3a320
1 parent 1d4805c
commit 1e3a3200afd74b22fdbb5d9425722b0c031e7453
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/validation.cpp
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1141,7 +1141,7 @@ static void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)
     // or a chain that is entirely longer than ours and invalid (note that this should be detected by both)
     // We define it this way because it allows us to only store the highest fork tip (+ base) which meets
     // the 7-block condition and from this always have the most-likely-to-cause-warning fork
-    if (pfork && (!pindexBestForkTip || (pindexBestForkTip && pindexNewForkTip->nHeight > pindexBestForkTip->nHeight)) &&
+    if (pfork && (!pindexBestForkTip || pindexNewForkTip->nHeight > pindexBestForkTip->nHeight) &&
             pindexNewForkTip->nChainWork - pfork->nChainWork > (GetBlockProof(*pfork) * 7) &&
             chainActive.Height() - pindexNewForkTip->nHeight < 72)
     {