Merge #10559: Change semantics of HaveCoinInCache to match HaveCoin

laanwj · laanwj · commit 234ffc677ee5 · 2017-06-26T17:11:15.000+02:00
5257698 Change semantics of HaveCoinInCache to match HaveCoin (Alex Morcos) Tree-SHA512: 397e9ba28646b81fffa53e55064735d4d242aaffdf8484506825f785b0e414f334e4c5cd1e4e1dd9a4b6d1f6954c7ecad15429934a1c4e8d39f596cbd9f5dd80
diff --git a/src/coins.cpp b/src/coins.cpp
@@ -125,7 +125,7 @@ bool CCoinsViewCache::HaveCoin(const COutPoint &outpoint) const {
 
 bool CCoinsViewCache::HaveCoinInCache(const COutPoint &outpoint) const {
     CCoinsMap::const_iterator it = cacheCoins.find(outpoint);
-    return it != cacheCoins.end();
+    return (it != cacheCoins.end() && !it->second.coin.IsSpent());
 }
 
 uint256 CCoinsViewCache::GetBestBlock() const {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ bool CCoinsViewCache::HaveCoin(const COutPoint &outpoint) const {`
`125`	`125`
`126`	`126`	`bool CCoinsViewCache::HaveCoinInCache(const COutPoint &outpoint) const {`
`127`	`127`	`CCoinsMap::const_iterator it = cacheCoins.find(outpoint);`
`128`		`- return it != cacheCoins.end();`
	`128`	`+ return (it != cacheCoins.end() && !it->second.coin.IsSpent());`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`uint256 CCoinsViewCache::GetBestBlock() const {`