Add CWallet::ReorderTransactions and use in accounting_tests.cpp

(cherry picked from commit d2e678d)
mailmahee · Aug 10, 2021 · a113057 · a113057
1 parent 9dc4e4b
commit a113057
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
@@ -21,7 +21,7 @@ GetResults(CWalletDB& walletdb, std::map<CAmount, CAccountingEntry>& results)
     std::list<CAccountingEntry> aes;
 
     results.clear();
-    BOOST_CHECK(walletdb.ReorderTransactions(pwalletMain) == DB_LOAD_OK);
+    BOOST_CHECK(pwalletMain->ReorderTransactions() == DB_LOAD_OK);
     pwalletMain->ListAccountCreditDebit("", aes);
     for (CAccountingEntry& ae : aes)
     {

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1405,6 +1405,12 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
     return true;
 }
 
+DBErrors CWallet::ReorderTransactions()
+{
+    CWalletDB walletdb(strWalletFile);
+    return walletdb.ReorderTransactions(this);
+}
+
 int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb)
 {
     AssertLockHeld(cs_wallet); // nOrderPosNext

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1166,6 +1166,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * @warning Returned pointers are *only* valid within the scope of passed acentries
      */
     TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = "");
+    DBErrors ReorderTransactions();
 
     void MarkDirty();
     bool UpdateNullifierNoteMap();