aboutsummaryrefslogtreecommitdiff
path: root/src/txmempool.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-06-27 08:49:44 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-06-27 11:12:34 +0200
commit78783531b7cc90c6f405dd9c62807be835d4c74f (patch)
tree32541dfda7113742cc54340eda7e859ab62869ce /src/txmempool.cpp
parent234ffc677ee58591b139695bf92bbd6f504ee91a (diff)
parent21180ff73436e198b6828c312ddfd0a1195447b2 (diff)
downloadbitcoin-78783531b7cc90c6f405dd9c62807be835d4c74f.tar.xz
Merge #10581: Simplify return values of GetCoin/HaveCoin(InCache)
21180ff Simplify return values of GetCoin/HaveCoin(InCache) (Pieter Wuille) Tree-SHA512: eae0aa64fa1308191100cdc7cdc790c825f33b066c200a18b5895d7d5806cee1cc4caba1766ef3379a7cf93dde4bbae2bc9be92947935f5741f5c126d3ee991b
Diffstat (limited to 'src/txmempool.cpp')
-rw-r--r--src/txmempool.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 8deb703d2e..dcfc5ffde0 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -903,11 +903,7 @@ bool CCoinsViewMemPool::GetCoin(const COutPoint &outpoint, Coin &coin) const {
return false;
}
}
- return (base->GetCoin(outpoint, coin) && !coin.IsSpent());
-}
-
-bool CCoinsViewMemPool::HaveCoin(const COutPoint &outpoint) const {
- return mempool.exists(outpoint) || base->HaveCoin(outpoint);
+ return base->GetCoin(outpoint, coin);
}
size_t CTxMemPool::DynamicMemoryUsage() const {