From 93f84d0417e8e1c590b405bde6e153b413bd43f2 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 16 Sep 2014 15:18:33 +0200 Subject: [PATCH] cleanup class private and public areas in walletdb - only code movement --- src/walletdb.cpp | 4 +--- src/walletdb.h | 17 +++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 03161250d..a84f44db0 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -242,9 +242,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, listclose(); } - -DBErrors -CWalletDB::ReorderTransactions(CWallet* pwallet) +DBErrors CWalletDB::ReorderTransactions(CWallet* pwallet) { LOCK(pwallet->cs_wallet); // Old wallets didn't have any defined order for transactions diff --git a/src/walletdb.h b/src/walletdb.h index 475d4fb96..2c5b608f3 100644 --- a/src/walletdb.h +++ b/src/walletdb.h @@ -78,10 +78,7 @@ public: CWalletDB(const std::string& strFilename, const char* pszMode = "r+") : CDB(strFilename, pszMode) { } -private: - CWalletDB(const CWalletDB&); - void operator=(const CWalletDB&); -public: + bool WriteName(const std::string& strAddress, const std::string& strName); bool EraseName(const std::string& strAddress); @@ -119,19 +116,23 @@ public: bool WriteDestData(const std::string &address, const std::string &key, const std::string &value); /// Erase destination data tuple from wallet database bool EraseDestData(const std::string &address, const std::string &key); -private: - bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry); -public: + bool WriteAccountingEntry(const CAccountingEntry& acentry); int64_t GetAccountCreditDebit(const std::string& strAccount); void ListAccountCreditDebit(const std::string& strAccount, std::list& acentries); - DBErrors ReorderTransactions(CWallet*); + DBErrors ReorderTransactions(CWallet* pwallet); DBErrors LoadWallet(CWallet* pwallet); DBErrors FindWalletTx(CWallet* pwallet, std::vector& vTxHash, std::vector& vWtx); DBErrors ZapWalletTx(CWallet* pwallet, std::vector& vWtx); static bool Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys); static bool Recover(CDBEnv& dbenv, std::string filename); + +private: + CWalletDB(const CWalletDB&); + void operator=(const CWalletDB&); + + bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry); }; bool BackupWallet(const CWallet& wallet, const std::string& strDest);