walletdb: move IsWalletLoaded to walletdb.cpp

achow101 · achow101 · commit 25a655794a0c · 2020-06-15T17:36:08.000-04:00
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -79,11 +79,6 @@ bool IsBDBWalletLoaded(const fs::path& wallet_path)
     return database && database->IsDatabaseLoaded(database_filename);
 }
 
-bool IsWalletLoaded(const fs::path& wallet_path)
-{
-    return IsBDBWalletLoaded(wallet_path);
-}
-
 fs::path WalletDataFilePath(const fs::path& wallet_path)
 {
     fs::path env_directory;
diff --git a/src/wallet/db.h b/src/wallet/db.h
@@ -88,7 +88,6 @@ class BerkeleyEnvironment
 
 /** Return whether a wallet database is currently loaded. */
 bool IsBDBWalletLoaded(const fs::path& wallet_path);
-bool IsWalletLoaded(const fs::path& wallet_path);
 
 /** Given a wallet directory path or legacy file path, return path to main data file in the wallet database. */
 fs::path WalletDataFilePath(const fs::path& wallet_path);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -1018,3 +1018,8 @@ bool WalletBatch::TxnAbort()
 {
     return m_batch.TxnAbort();
 }
+
+bool IsWalletLoaded(const fs::path& wallet_path)
+{
+    return IsBDBWalletLoaded(wallet_path);
+}
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -289,4 +289,7 @@ void MaybeCompactWalletDB();
 //! Unserialize a given Key-Value pair and load it into the wallet
 bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, std::string& strType, std::string& strErr);
 
+/** Return whether a wallet database is currently loaded. */
+bool IsWalletLoaded(const fs::path& wallet_path);
+
 #endif // BITCOIN_WALLET_WALLETDB_H

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,6 @@ bool IsBDBWalletLoaded(const fs::path& wallet_path)`
`79`	`79`	`return database && database->IsDatabaseLoaded(database_filename);`
`80`	`80`	`}`
`81`	`81`
`82`		`-bool IsWalletLoaded(const fs::path& wallet_path)`
`83`		`-{`
`84`		`- return IsBDBWalletLoaded(wallet_path);`
`85`		`-}`
`86`		`-`
`87`	`82`	`fs::path WalletDataFilePath(const fs::path& wallet_path)`
`88`	`83`	`{`
`89`	`84`	`fs::path env_directory;`
Original file line number	Diff line number	Diff line change
`@@ -1018,3 +1018,8 @@ bool WalletBatch::TxnAbort()`
`1018`	`1018`	`{`
`1019`	`1019`	`return m_batch.TxnAbort();`
`1020`	`1020`	`}`
	`1021`	`+`
	`1022`	`+bool IsWalletLoaded(const fs::path& wallet_path)`
	`1023`	`+{`
	`1024`	`+ return IsBDBWalletLoaded(wallet_path);`
	`1025`	`+}`