wallet: Create IsDatabaseLoaded function

ken2812221 · ken2812221 · commit 591203149f17 · 2018-11-08T11:54:37.000+08:00
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -80,8 +80,7 @@ bool IsWalletLoaded(const fs::path& wallet_path)
     LOCK(cs_db);
     auto env = g_dbenvs.find(env_directory.string());
     if (env == g_dbenvs.end()) return false;
-    auto db = env->second.m_databases.find(database_filename);
-    return db != env->second.m_databases.end();
+    return env->second.IsDatabaseLoaded(database_filename);
 }
 
 BerkeleyEnvironment* GetWalletEnv(const fs::path& wallet_path, std::string& database_filename)
diff --git a/src/wallet/db.h b/src/wallet/db.h
@@ -56,6 +56,7 @@ class BerkeleyEnvironment
     void MakeMock();
     bool IsMock() const { return fMockDb; }
     bool IsInitialized() const { return fDbEnvInit; }
+    bool IsDatabaseLoaded(const std::string& db_filename) const { return m_databases.find(db_filename) != m_databases.end(); }
     fs::path Directory() const { return strPath; }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,7 @@ bool IsWalletLoaded(const fs::path& wallet_path)`
`80`	`80`	`LOCK(cs_db);`
`81`	`81`	`auto env = g_dbenvs.find(env_directory.string());`
`82`	`82`	`if (env == g_dbenvs.end()) return false;`
`83`		`- auto db = env->second.m_databases.find(database_filename);`
`84`		`- return db != env->second.m_databases.end();`
	`83`	`+ return env->second.IsDatabaseLoaded(database_filename);`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`BerkeleyEnvironment* GetWalletEnv(const fs::path& wallet_path, std::string& database_filename)`