mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Remove pwalletdb parameter from CWallet::AddAccountingEntry
This commit is contained in:
parent
d2e678d7d2
commit
02e2a81536
@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
|
||||
ae.nTime = 1333333333;
|
||||
ae.strOtherAccount = "b";
|
||||
ae.strComment = "";
|
||||
pwalletMain->AddAccountingEntry(ae, walletdb);
|
||||
pwalletMain->AddAccountingEntry(ae);
|
||||
|
||||
wtx.mapValue["comment"] = "z";
|
||||
pwalletMain->AddToWallet(wtx);
|
||||
@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
|
||||
|
||||
ae.nTime = 1333333336;
|
||||
ae.strOtherAccount = "c";
|
||||
pwalletMain->AddAccountingEntry(ae, walletdb);
|
||||
pwalletMain->AddAccountingEntry(ae);
|
||||
|
||||
GetResults(walletdb, results);
|
||||
|
||||
@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
|
||||
ae.nTime = 1333333330;
|
||||
ae.strOtherAccount = "d";
|
||||
ae.nOrderPos = pwalletMain->IncOrderPosNext();
|
||||
pwalletMain->AddAccountingEntry(ae, walletdb);
|
||||
pwalletMain->AddAccountingEntry(ae);
|
||||
|
||||
GetResults(walletdb, results);
|
||||
|
||||
@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
|
||||
ae.nTime = 1333333334;
|
||||
ae.strOtherAccount = "e";
|
||||
ae.nOrderPos = -1;
|
||||
pwalletMain->AddAccountingEntry(ae, walletdb);
|
||||
pwalletMain->AddAccountingEntry(ae);
|
||||
|
||||
GetResults(walletdb, results);
|
||||
|
||||
|
@ -683,7 +683,7 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
|
||||
debit.nTime = nNow;
|
||||
debit.strOtherAccount = strTo;
|
||||
debit.strComment = strComment;
|
||||
AddAccountingEntry(debit, walletdb);
|
||||
AddAccountingEntry(debit, &walletdb);
|
||||
|
||||
// Credit
|
||||
CAccountingEntry credit;
|
||||
@ -693,7 +693,7 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
|
||||
credit.nTime = nNow;
|
||||
credit.strOtherAccount = strFrom;
|
||||
credit.strComment = strComment;
|
||||
AddAccountingEntry(credit, walletdb);
|
||||
AddAccountingEntry(credit, &walletdb);
|
||||
|
||||
if (!walletdb.TxnCommit())
|
||||
return false;
|
||||
@ -2512,9 +2512,16 @@ void CWallet::ListAccountCreditDebit(const std::string& strAccount, std::list<CA
|
||||
return walletdb.ListAccountCreditDebit(strAccount, entries);
|
||||
}
|
||||
|
||||
bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB & pwalletdb)
|
||||
bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry)
|
||||
{
|
||||
if (!pwalletdb.WriteAccountingEntry_Backend(acentry))
|
||||
CWalletDB walletdb(strWalletFile);
|
||||
|
||||
return AddAccountingEntry(acentry, &walletdb);
|
||||
}
|
||||
|
||||
bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwalletdb)
|
||||
{
|
||||
if (!pwalletdb->WriteAccountingEntry_Backend(acentry))
|
||||
return false;
|
||||
|
||||
laccentries.push_back(acentry);
|
||||
|
@ -777,7 +777,8 @@ public:
|
||||
bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman);
|
||||
|
||||
void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
|
||||
bool AddAccountingEntry(const CAccountingEntry&, CWalletDB & pwalletdb);
|
||||
bool AddAccountingEntry(const CAccountingEntry&);
|
||||
bool AddAccountingEntry(const CAccountingEntry&, CWalletDB *pwalletdb);
|
||||
|
||||
static CFeeRate minTxFee;
|
||||
static CFeeRate fallbackFee;
|
||||
|
Loading…
Reference in New Issue
Block a user