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

sipa · PastaPastaPasta · commit 09854d66133d · 2019-07-17T19:01:41.000-05:00
1e3a320 Simplify "!foo || (foo && bar)" as "!foo || bar" (practicalswift) Tree-SHA512: d5ce6d7a9f3741e7abe8542b840268aa683e276aac7587041d32385a4c1273e20c236bec7590e27540dde72defb3f879d4695822bb7bfdb092cc20d9aefa64c1
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1314,7 +1314,7 @@ static void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)
     // hash rate operating on the fork.
     // 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)
     {

Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,7 @@ static void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)`
`1314`	`1314`	`// hash rate operating on the fork.`
`1315`	`1315`	`// We define it this way because it allows us to only store the highest fork tip (+ base) which meets`
`1316`	`1316`	`// the 7-block condition and from this always have the most-likely-to-cause-warning fork`
`1317`		`- if (pfork && (!pindexBestForkTip \|\| (pindexBestForkTip && pindexNewForkTip->nHeight > pindexBestForkTip->nHeight)) &&`
	`1317`	`+ if (pfork && (!pindexBestForkTip \|\| pindexNewForkTip->nHeight > pindexBestForkTip->nHeight) &&`
`1318`	`1318`	`pindexNewForkTip->nChainWork - pfork->nChainWork > (GetBlockProof(pfork) 7) &&`
`1319`	`1319`	`chainActive.Height() - pindexNewForkTip->nHeight < 72)`
`1320`	`1320`	`{`