[refactor] swap if/else order

ajtowns · sdaftuar · commit 99d96897b2eb · 2019-02-08T14:16:44.000-05:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2546,11 +2546,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 // Never relay transactions that we would assign a non-zero DoS
                 // score for, as we expect peers to do the same with us in that
                 // case.
-                if (!state.IsInvalid() || !MayResultInDisconnect(state, false)) {
+                if (state.IsInvalid() && MayResultInDisconnect(state, false)) {
+                    LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->GetId(), FormatStateMessage(state));
+                } else {
                     LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->GetId());
                     RelayTransaction(tx, connman);
-                } else {
-                    LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->GetId(), FormatStateMessage(state));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2546,11 +2546,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr`
`2546`	`2546`	`// Never relay transactions that we would assign a non-zero DoS`
`2547`	`2547`	`// score for, as we expect peers to do the same with us in that`
`2548`	`2548`	`// case.`
`2549`		`- if (!state.IsInvalid() \|\| !MayResultInDisconnect(state, false)) {`
	`2549`	`+ if (state.IsInvalid() && MayResultInDisconnect(state, false)) {`
	`2550`	`+ LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->GetId(), FormatStateMessage(state));`
	`2551`	`+ } else {`
`2550`	`2552`	`LogPrintf("Force relaying tx %s from whitelisted peer=%d\n", tx.GetHash().ToString(), pfrom->GetId());`
`2551`	`2553`	`RelayTransaction(tx, connman);`
`2552`		`- } else {`
`2553`		`- LogPrintf("Not relaying invalid transaction %s from whitelisted peer=%d (%s)\n", tx.GetHash().ToString(), pfrom->GetId(), FormatStateMessage(state));`
`2554`	`2554`	`}`
`2555`	`2555`	`}`
`2556`	`2556`	`}`