Merge #10164: Wallet: reduce excess logic InMempool()

laanwj · laanwj · commit e183ea2047b3 · 2017-04-10T15:27:34.000+02:00
3491476 Wallet: reduce excess logic InMemPool() (Kewde) Tree-SHA512: 554ea2827cfd482281fae0ba3d0a7989dbfeace98a35462732ea08bf3cc94c9564a9ea8ca2fa9905b963367d0b56a490ef0d83ceb6731c8f06187de98b6a7f23
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1761,10 +1761,7 @@ CAmount CWalletTx::GetChange() const
 bool CWalletTx::InMempool() const
 {
     LOCK(mempool.cs);
-    if (mempool.exists(GetHash())) {
-        return true;
-    }
-    return false;
+    return mempool.exists(GetHash());
 }
 
 bool CWalletTx::IsTrusted() const

Original file line number	Diff line number	Diff line change
`@@ -1761,10 +1761,7 @@ CAmount CWalletTx::GetChange() const`
`1761`	`1761`	`bool CWalletTx::InMempool() const`
`1762`	`1762`	`{`
`1763`	`1763`	`LOCK(mempool.cs);`
`1764`		`- if (mempool.exists(GetHash())) {`
`1765`		`- return true;`
`1766`		`- }`
`1767`		`- return false;`
	`1764`	`+ return mempool.exists(GetHash());`
`1768`	`1765`	`}`
`1769`	`1766`
`1770`	`1767`	`bool CWalletTx::IsTrusted() const`