Merge #10421: [qt] Remove excess logic: Prefer "return foo;" to "if (foo) { return true; } else { return false; }"

laanwj · laanwj · commit 433c57aa6f30 · 2017-05-23T18:46:27.000+02:00
e49b868 [qt] Remove excess logic (practicalswift) Tree-SHA512: ffcdc94843ea5ddd05ab5acec1f047def8d910da8f53c5019ec49199828d7c370efaedc801537b8e1f44e87f694d19d04b70c240416d2eddfaff9cd4abe3ca07
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -702,9 +702,7 @@ bool WalletModel::transactionSignalsRBF(uint256 hash) const
 {
     LOCK2(cs_main, wallet->cs_wallet);
     const CWalletTx *wtx = wallet->GetWalletTx(hash);
-    if (wtx && SignalsOptInRBF(*wtx))
-        return true;
-    return false;
+    return wtx && SignalsOptInRBF(*wtx);
 }
 
 bool WalletModel::bumpFee(uint256 hash)

Original file line number	Diff line number	Diff line change
`@@ -702,9 +702,7 @@ bool WalletModel::transactionSignalsRBF(uint256 hash) const`
`702`	`702`	`{`
`703`	`703`	`LOCK2(cs_main, wallet->cs_wallet);`
`704`	`704`	`const CWalletTx *wtx = wallet->GetWalletTx(hash);`
`705`		`- if (wtx && SignalsOptInRBF(*wtx))`
`706`		`- return true;`
`707`		`- return false;`
	`705`	`+ return wtx && SignalsOptInRBF(*wtx);`
`708`	`706`	`}`
`709`	`707`
`710`	`708`	`bool WalletModel::bumpFee(uint256 hash)`