aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2022-03-23 14:38:14 -0400
committerAndrew Chow <achow101-github@achow101.com>2022-03-23 15:01:39 -0400
commit049003fe68a4183f6f20da16f58f10079d1e02df (patch)
tree87f29f6614fd8d85709539c4610197f530e7fe3a
parentf6c39c6adb6cbf9c87f04d3d667701905ef5c0a0 (diff)
downloadbitcoin-049003fe68a4183f6f20da16f58f10079d1e02df.tar.xz
coinselection: Remove COutput operators == and !=
These operators are used only by the tests in std::mismatch. As std::mismatch can take a binary predicate, we can use a lambda that achieves the same instead.
-rw-r--r--src/wallet/coinselection.h8
-rw-r--r--src/wallet/test/coinselector_tests.cpp5
2 files changed, 4 insertions, 9 deletions
diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h
index ff85dd5fe2..43c37cbad7 100644
--- a/src/wallet/coinselection.h
+++ b/src/wallet/coinselection.h
@@ -84,14 +84,6 @@ public:
bool operator<(const COutput& rhs) const {
return outpoint < rhs.outpoint;
}
-
- bool operator!=(const COutput& rhs) const {
- return outpoint != rhs.outpoint;
- }
-
- bool operator==(const COutput& rhs) const {
- return outpoint == rhs.outpoint;
- }
};
/** Parameters for one iteration of Coin Selection. */
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp
index bd5ed09ba4..51e35a86af 100644
--- a/src/wallet/test/coinselector_tests.cpp
+++ b/src/wallet/test/coinselector_tests.cpp
@@ -113,7 +113,10 @@ static bool EquivalentResult(const SelectionResult& a, const SelectionResult& b)
/** Check if this selection is equal to another one. Equal means same inputs (i.e same value and prevout) */
static bool EqualResult(const SelectionResult& a, const SelectionResult& b)
{
- std::pair<CoinSet::iterator, CoinSet::iterator> ret = std::mismatch(a.GetInputSet().begin(), a.GetInputSet().end(), b.GetInputSet().begin());
+ std::pair<CoinSet::iterator, CoinSet::iterator> ret = std::mismatch(a.GetInputSet().begin(), a.GetInputSet().end(), b.GetInputSet().begin(),
+ [](const COutput& a, const COutput& b) {
+ return a.outpoint == b.outpoint;
+ });
return ret.first == a.GetInputSet().end() && ret.second == b.GetInputSet().end();
}