Change getWalletTxs to return a set instead of a vector

achow101 · achow101 · commit 3b8b47b77a3d · 2022-04-10T15:38:48.000-04:00
For some reason, the primary consumer of getWalletTxs requires the
transactions to be in hash order when it is processing them. std::map
will iterate in hash order so the transactions end up in that order when
placed into the vector. To ensure this order when mapWallet is no longer
ordered, the vector is replaced with a set which will maintain the hash
order.
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
@@ -183,7 +183,7 @@ class Wallet
     virtual WalletTx getWalletTx(const uint256& txid) = 0;
 
     //! Get list of all wallet transactions.
-    virtual std::vector<WalletTx> getWalletTxs() = 0;
+    virtual std::set<WalletTx> getWalletTxs() = 0;
 
     //! Try to get updated status for a particular transaction, if possible without blocking.
     virtual bool tryGetTxStatus(const uint256& txid,
@@ -395,6 +395,8 @@ struct WalletTx
     int64_t time;
     std::map<std::string, std::string> value_map;
     bool is_coinbase;
+
+    bool operator<(const WalletTx& a) const { return tx->GetHash() < a.tx->GetHash(); }
 };
 
 //! Updated transaction status.
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
@@ -318,13 +318,12 @@ class WalletImpl : public Wallet
         }
         return {};
     }
-    std::vector<WalletTx> getWalletTxs() override
+    std::set<WalletTx> getWalletTxs() override
     {
         LOCK(m_wallet->cs_wallet);
-        std::vector<WalletTx> result;
-        result.reserve(m_wallet->mapWallet.size());
+        std::set<WalletTx> result;
         for (const auto& entry : m_wallet->mapWallet) {
-            result.emplace_back(MakeWalletTx(*m_wallet, entry.second));
+            result.emplace(MakeWalletTx(*m_wallet, entry.second));
         }
         return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -318,13 +318,12 @@ class WalletImpl : public Wallet`
`318`	`318`	`}`
`319`	`319`	`return {};`
`320`	`320`	`}`
`321`		`- std::vector<WalletTx> getWalletTxs() override`
	`321`	`+ std::set<WalletTx> getWalletTxs() override`
`322`	`322`	`{`
`323`	`323`	`LOCK(m_wallet->cs_wallet);`
`324`		`- std::vector<WalletTx> result;`
`325`		`- result.reserve(m_wallet->mapWallet.size());`
	`324`	`+ std::set<WalletTx> result;`
`326`	`325`	`for (const auto& entry : m_wallet->mapWallet) {`
`327`		`- result.emplace_back(MakeWalletTx(*m_wallet, entry.second));`
	`326`	`+ result.emplace(MakeWalletTx(*m_wallet, entry.second));`
`328`	`327`	`}`
`329`	`328`	`return result;`
`330`	`329`	`}`