wallet: bugfix, 'CoinsResult::Erase' is erasing only one output of the set

furszy · furszy · commit f930aefff969 · 2022-11-29T12:30:31.000-03:00
The loop break shouldn't have being there.
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -102,15 +102,13 @@ void CoinsResult::Clear() {
     coins.clear();
 }
 
-void CoinsResult::Erase(std::set<COutPoint>& preset_coins)
+void CoinsResult::Erase(const std::unordered_set<COutPoint, SaltedOutpointHasher>& coins_to_remove)
 {
-    for (auto& it : coins) {
-        auto& vec = it.second;
-        auto i = std::find_if(vec.begin(), vec.end(), [&](const COutput &c) { return preset_coins.count(c.outpoint);});
-        if (i != vec.end()) {
-            vec.erase(i);
-            break;
-        }
+    for (auto& [type, vec] : coins) {
+        auto remove_it = std::remove_if(vec.begin(), vec.end(), [&](const COutput& coin) {
+            return coins_to_remove.count(coin.outpoint) == 1;
+        });
+        vec.erase(remove_it, vec.end());
     }
 }
 
diff --git a/src/wallet/spend.h b/src/wallet/spend.h
@@ -47,7 +47,7 @@ struct CoinsResult {
      * i.e., methods can work with individual OutputType vectors or on the entire object */
     size_t Size() const;
     void Clear();
-    void Erase(std::set<COutPoint>& preset_coins);
+    void Erase(const std::unordered_set<COutPoint, SaltedOutpointHasher>& coins_to_remove);
     void Shuffle(FastRandomContext& rng_fast);
     void Add(OutputType type, const COutput& out);
 

Original file line number	Diff line number	Diff line change
`@@ -102,15 +102,13 @@ void CoinsResult::Clear() {`
`102`	`102`	`coins.clear();`
`103`	`103`	`}`
`104`	`104`
`105`		`-void CoinsResult::Erase(std::set<COutPoint>& preset_coins)`
	`105`	`+void CoinsResult::Erase(const std::unordered_set<COutPoint, SaltedOutpointHasher>& coins_to_remove)`
`106`	`106`	`{`
`107`		`- for (auto& it : coins) {`
`108`		`- auto& vec = it.second;`
`109`		`- auto i = std::find_if(vec.begin(), vec.end(), [&](const COutput &c) { return preset_coins.count(c.outpoint);});`
`110`		`- if (i != vec.end()) {`
`111`		`- vec.erase(i);`
`112`		`- break;`
`113`		`- }`
	`107`	`+ for (auto& [type, vec] : coins) {`
	`108`	`+ auto remove_it = std::remove_if(vec.begin(), vec.end(), [&](const COutput& coin) {`
	`109`	`+ return coins_to_remove.count(coin.outpoint) == 1;`
	`110`	`+ });`
	`111`	`+ vec.erase(remove_it, vec.end());`
`114`	`112`	`}`
`115`	`113`	`}`
`116`	`114`