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

sipa · sipa · commit e4fcbf797ed3 · 2017-07-12T18:25:35.000-07:00
1e3a320 Simplify "!foo || (foo && bar)" as "!foo || bar" (practicalswift) Tree-SHA512: d5ce6d7a9f3741e7abe8542b840268aa683e276aac7587041d32385a4c1273e20c236bec7590e27540dde72defb3f879d4695822bb7bfdb092cc20d9aefa64c1
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)
     {

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ static void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)`
`1141`	`1141`	`// or a chain that is entirely longer than ours and invalid (note that this should be detected by both)`
`1142`	`1142`	`// We define it this way because it allows us to only store the highest fork tip (+ base) which meets`
`1143`	`1143`	`// the 7-block condition and from this always have the most-likely-to-cause-warning fork`
`1144`		`- if (pfork && (!pindexBestForkTip \|\| (pindexBestForkTip && pindexNewForkTip->nHeight > pindexBestForkTip->nHeight)) &&`
	`1144`	`+ if (pfork && (!pindexBestForkTip \|\| pindexNewForkTip->nHeight > pindexBestForkTip->nHeight) &&`
`1145`	`1145`	`pindexNewForkTip->nChainWork - pfork->nChainWork > (GetBlockProof(pfork) 7) &&`
`1146`	`1146`	`chainActive.Height() - pindexNewForkTip->nHeight < 72)`
`1147`	`1147`	`{`