Merge #10780: Simplify "!foo || (foo && bar)" as "!foo || bar"

1e3a320 Simplify "!foo || (foo && bar)" as "!foo || bar" (practicalswift) Tree-SHA512: d5ce6d7a9f3741e7abe8542b840268aa683e276aac7587041d32385a4c1273e20c236bec7590e27540dde72defb3f879d4695822bb7bfdb092cc20d9aefa64c1
bitcoin · e4fcbf797ed3b472d352ac3794ec82f581209c50 · sipa committed Jul 13, 2017

This commit was signed with a verified signature.

sipa Pieter Wuille

GPG key ID: A636E97631F767E0 Learn about signing commits · Jul 13, 2017 · e4fcbf7
2 parents 479afa0 + 1e3a320
commit e4fcbf797ed3b472d352ac3794ec82f581209c50
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)
     {