diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2020-10-30 16:41:23 -0400 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2020-12-04 11:03:28 -0400 |
| commit | d70dc89e78ee6355e0bc37cc36cfc04ef7a86885 (patch) | |
| tree | fa60ad271a09f30c970d56472d25307ebc948716 /src/wallet/sqlite.cpp | |
| parent | 6a7a63644cd2fc56538d323cc0d5c1d7945247fd (diff) | |
| download | bitcoin-d70dc89e78ee6355e0bc37cc36cfc04ef7a86885.tar.xz | |
refactor: Consolidate redundant wallet database path and exists functions
No change in behavior. Just remove a little bit of code, reduce macro usage,
remove duplicative functions, and make BDB and SQLite implementations more
consistent with each other.
Diffstat (limited to 'src/wallet/sqlite.cpp')
| -rw-r--r-- | src/wallet/sqlite.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp index 69d96dd27c..0fb3b1d3c4 100644 --- a/src/wallet/sqlite.cpp +++ b/src/wallet/sqlite.cpp @@ -17,7 +17,6 @@ #include <sqlite3.h> #include <stdint.h> -static const char* const DATABASE_FILENAME = "wallet.dat"; static constexpr int32_t WALLET_SCHEMA_VERSION = 0; static Mutex g_sqlite_mutex; @@ -568,17 +567,11 @@ bool SQLiteBatch::TxnAbort() return res == SQLITE_OK; } -bool ExistsSQLiteDatabase(const fs::path& path) -{ - const fs::path file = path / DATABASE_FILENAME; - return fs::symlink_status(file).type() == fs::regular_file && IsSQLiteFile(file); -} - std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error) { - const fs::path file = path / DATABASE_FILENAME; try { - auto db = MakeUnique<SQLiteDatabase>(path, file); + fs::path data_file = SQLiteDataFile(path); + auto db = MakeUnique<SQLiteDatabase>(data_file.parent_path(), data_file); if (options.verify && !db->Verify(error)) { status = DatabaseStatus::FAILED_VERIFY; return nullptr; |