From 65fb8807ac402d1e924fd85969b5837c192bf59f Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Thu, 16 Jul 2020 13:19:37 -0400
Subject: Combine BerkeleyEnvironment::Verify into BerkeleyDatabase::Verify

---
 src/wallet/bdb.cpp | 17 ++++++-----------
 src/wallet/bdb.h   |  2 --
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/wallet')

diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
index 1953be2d54..3c9d25e5a8 100644
--- a/src/wallet/bdb.cpp
+++ b/src/wallet/bdb.cpp
@@ -232,16 +232,6 @@ BerkeleyEnvironment::BerkeleyEnvironment()
     fMockDb = true;
 }
 
-bool BerkeleyEnvironment::Verify(const std::string& strFile)
-{
-    LOCK(cs_db);
-    assert(mapFileUseCount.count(strFile) == 0);
-
-    Db db(dbenv.get(), 0);
-    int result = db.verify(strFile.c_str(), nullptr, nullptr, 0);
-    return result == 0;
-}
-
 BerkeleyBatch::SafeDbt::SafeDbt()
 {
     m_dbt.set_flags(DB_DBT_MALLOC);
@@ -295,7 +285,12 @@ bool BerkeleyDatabase::Verify(bilingual_str& errorStr)
 
     if (fs::exists(file_path))
     {
-        if (!env->Verify(strFile)) {
+        LOCK(cs_db);
+        assert(env->mapFileUseCount.count(strFile) == 0);
+
+        Db db(env->dbenv.get(), 0);
+        int result = db.verify(strFile.c_str(), nullptr, nullptr, 0);
+        if (result != 0) {
             errorStr = strprintf(_("%s corrupt. Try using the wallet tool bitcoin-wallet to salvage or restoring a backup."), file_path);
             return false;
         }
diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h
index ef3b81d4d6..3068a75c5d 100644
--- a/src/wallet/bdb.h
+++ b/src/wallet/bdb.h
@@ -67,8 +67,6 @@ public:
     bool IsDatabaseLoaded(const std::string& db_filename) const { return m_databases.find(db_filename) != m_databases.end(); }
     fs::path Directory() const { return strPath; }
 
-    bool Verify(const std::string& strFile);
-
     bool Open(bilingual_str& error);
     void Close();
     void Flush(bool fShutdown);
-- 
cgit v1.2.3