From 6a7a63644cd2fc56538d323cc0d5c1d7945247fd Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Fri, 30 Oct 2020 16:28:44 -0400 Subject: [PATCH] refactor: Drop call to GetWalletEnv in wallet salvage code No observable change in behavior. This just avoids a redundant environment lookup. Motivation is to be able to simplify the GetWalletEnv implementation in an upcoming commit. --- src/wallet/salvage.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wallet/salvage.cpp b/src/wallet/salvage.cpp index da5ca7858f2..09a9ec68cd0 100644 --- a/src/wallet/salvage.cpp +++ b/src/wallet/salvage.cpp @@ -32,8 +32,9 @@ bool RecoverDatabaseFile(const fs::path& file_path, bilingual_str& error, std::v std::unique_ptr database = MakeDatabase(file_path, options, status, error); if (!database) return false; - std::string filename; - std::shared_ptr env = GetWalletEnv(file_path, filename); + BerkeleyDatabase& berkeley_database = static_cast(*database); + std::string filename = berkeley_database.Filename(); + std::shared_ptr env = berkeley_database.env; if (!env->Open(error)) { return false;