From 35e60e790f2cd602d1bdd0be835d27f0ba37efa9 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Wed, 13 Mar 2019 00:44:52 -0400
Subject: Remove ReadVersion and WriteVersion

The "version" record that these functions read and write are not
used anywhere in the code except for one place. There is no reason
to expose these functions publicly. Furthermore, this avoids potential
confusion as developers may mistake these functions for actually
reading and writing the wallet version when they do not.
---
 src/wallet/db.cpp       |  2 +-
 src/wallet/db.h         | 11 -----------
 src/wallet/walletdb.cpp | 14 ++------------
 src/wallet/walletdb.h   |  4 ----
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 99d880daa0..41c157c5c0 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -587,7 +587,7 @@ BerkeleyBatch::BerkeleyBatch(BerkeleyDatabase& database, const char* pszMode, bo
             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/db.h b/src/wallet/db.h
index 9df965305a..671bb7e6c3 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -396,17 +396,6 @@ public:
         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);
-    }
-
     bool static Rewrite(BerkeleyDatabase& database, const char* pszSkip = nullptr);
 };
 
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 2db18bec2b..9e992b266c 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -507,7 +507,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 
     // 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", wallet_version > 0 ? wallet_version : last_client);
@@ -527,7 +527,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
         return DBErrors::NEED_REWRITE;
 
     if (last_client < CLIENT_VERSION) // Update
-        WriteVersion(CLIENT_VERSION);
+        m_batch.Write(std::string("version"), CLIENT_VERSION);
 
     if (wss.fAnyUnordered)
         result = pwallet->ReorderTransactions();
@@ -770,13 +770,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);
-}
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 0532a55ff5..90163528af 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -241,10 +241,6 @@ public:
     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;
-- 
cgit v1.2.3