highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-25 19:31:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

walletdb: move IsWalletLoaded to walletdb.cpp

Browse Source
This commit is contained in:
Andrew Chow 2020-06-15 16:10:08 -04:00
parent f6fc5f3849
commit 25a655794a
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/db.cpp
View File

@ -79,11 +79,6 @@ bool IsBDBWalletLoaded(const fs::path& wallet_path)
return database && database->IsDatabaseLoaded(database_filename); 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 WalletDataFilePath(const fs::path& wallet_path)
{ {
fs::path env_directory; fs::path env_directory;

1
src/wallet/db.h
View File

@ -88,7 +88,6 @@ public:
/** Return whether a wallet database is currently loaded. */ /** Return whether a wallet database is currently loaded. */
bool IsBDBWalletLoaded(const fs::path& wallet_path); 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. */ /** 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); fs::path WalletDataFilePath(const fs::path& wallet_path);

5
src/wallet/walletdb.cpp
View File

@ -1018,3 +1018,8 @@ bool WalletBatch::TxnAbort()
{ {
return m_batch.TxnAbort(); return m_batch.TxnAbort();
} }
bool IsWalletLoaded(const fs::path& wallet_path)
{
return IsBDBWalletLoaded(wallet_path);
}

3
src/wallet/walletdb.h
View File

@ -289,4 +289,7 @@ void MaybeCompactWalletDB();
//! Unserialize a given Key-Value pair and load it into the wallet //! 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); 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 #endif // BITCOIN_WALLET_WALLETDB_H