diff --git a/src/wallet/db.h b/src/wallet/db.h --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -444,15 +444,6 @@ return (ret == 0); } - bool ReadVersion(int &nVersion) { - nVersion = 0; - return Read(std::string("version"), nVersion); - } - - bool WriteVersion(int nVersion) { - return Write(std::string("version"), nVersion); - } - static bool Rewrite(BerkeleyDatabase &database, const char *pszSkip = nullptr); }; diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -612,7 +612,7 @@ if (fCreate && !Exists(std::string("version"))) { bool fTmp = fReadOnly; fReadOnly = false; - WriteVersion(CLIENT_VERSION); + Write(std::string("version"), CLIENT_VERSION); fReadOnly = fTmp; } } diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -262,11 +262,6 @@ bool TxnCommit(); //! Abort current transaction bool TxnAbort(); - //! Read wallet version - bool ReadVersion(int &nVersion); - //! Write wallet version - bool WriteVersion(int nVersion); - private: BerkeleyBatch m_batch; WalletDatabase &m_database; diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -507,7 +507,7 @@ // Last client version to open this wallet, was previously the file version // number int last_client = CLIENT_VERSION; - ReadVersion(last_client); + m_batch.Read(std::string("version"), last_client); int wallet_version = pwallet->GetVersion(); pwallet->WalletLogPrintf("Wallet File Version = %d\n", @@ -534,7 +534,7 @@ if (last_client < CLIENT_VERSION) { // Update - WriteVersion(CLIENT_VERSION); + m_batch.Write(std::string("version"), CLIENT_VERSION); } if (wss.fAnyUnordered) { @@ -797,11 +797,3 @@ bool WalletBatch::TxnAbort() { return m_batch.TxnAbort(); } - -bool WalletBatch::ReadVersion(int &nVersion) { - return m_batch.ReadVersion(nVersion); -} - -bool WalletBatch::WriteVersion(int nVersion) { - return m_batch.WriteVersion(nVersion); -}