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

laanwj · PastaPastaPasta · commit dccd6970bf04 · 2019-05-19T20:43:01.000-05:00
3491476 Wallet: reduce excess logic InMemPool() (Kewde) Tree-SHA512: 554ea2827cfd482281fae0ba3d0a7989dbfeace98a35462732ea08bf3cc94c9564a9ea8ca2fa9905b963367d0b56a490ef0d83ceb6731c8f06187de98b6a7f23
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2186,10 +2186,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
`@@ -2186,10 +2186,7 @@ CAmount CWalletTx::GetChange() const`
`2186`	`2186`	`bool CWalletTx::InMempool() const`
`2187`	`2187`	`{`
`2188`	`2188`	`LOCK(mempool.cs);`
`2189`		`- if (mempool.exists(GetHash())) {`
`2190`		`- return true;`
`2191`		`- }`
`2192`		`- return false;`
	`2189`	`+ return mempool.exists(GetHash());`
`2193`	`2190`	`}`
`2194`	`2191`
`2195`	`2192`	`bool CWalletTx::IsTrusted() const`