wallet: unify GetUnspentCredit with GetCredit

furszy · furszy · commit 1bf9dc4d32ff · 2020-08-14T16:03:23.000-03:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1297,37 +1297,24 @@ CAmount CWalletTx::GetUnspentCredit(const isminefilter& filter) const
     if (GetBlocksToMaturity() > 0)
         return 0;
 
-    CAmount credit = 0;
-    if (filter & ISMINE_SPENDABLE) {
-        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE, false, true);
-    }
-    if (filter & ISMINE_WATCH_ONLY) {
-        credit += GetCachableAmount(CREDIT, ISMINE_WATCH_ONLY, false, true);
-    }
-    if (filter & ISMINE_COLD) {
-        credit += GetCachableAmount(CREDIT, ISMINE_COLD, false, true);
-    }
-    if (filter & ISMINE_SPENDABLE_DELEGATED) {
-        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE_DELEGATED, false, true);
-    }
-    return credit;
+    return GetCredit(filter, false, true);
 }
 
-CAmount CWalletTx::GetCredit(const isminefilter& filter) const
+CAmount CWalletTx::GetCredit(const isminefilter& filter, bool recalculate, bool fUnspent) const
 {
     CAmount credit = 0;
     if (filter & ISMINE_SPENDABLE) {
         // GetBalance can assume transactions in mapWallet won't change
-        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE);
+        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE, recalculate, fUnspent);
     }
     if (filter & ISMINE_WATCH_ONLY) {
-        credit += GetCachableAmount(CREDIT, ISMINE_WATCH_ONLY);
+        credit += GetCachableAmount(CREDIT, ISMINE_WATCH_ONLY, recalculate, fUnspent);
     }
     if (filter & ISMINE_COLD) {
-        credit += GetCachableAmount(CREDIT, ISMINE_COLD);
+        credit += GetCachableAmount(CREDIT, ISMINE_COLD, recalculate, fUnspent);
     }
     if (filter & ISMINE_SPENDABLE_DELEGATED) {
-        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE_DELEGATED);
+        credit += GetCachableAmount(CREDIT, ISMINE_SPENDABLE_DELEGATED, recalculate, fUnspent);
     }
     return credit;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -917,7 +917,7 @@ class CWalletTx : public CMerkleTx
 
     //! filter decides which addresses will count towards the debit
     CAmount GetDebit(const isminefilter& filter) const;
-    CAmount GetCredit(const isminefilter& filter) const;
+    CAmount GetCredit(const isminefilter& filter, bool recalculate = false, bool fUnspent = false) const;
     CAmount GetUnspentCredit(const isminefilter& filter) const;
     CAmount GetImmatureCredit(bool fUseCache = true, const isminefilter& filter = ISMINE_SPENDABLE_ALL) const;
     CAmount GetAvailableCredit(bool fUseCache = true) const;
