From 7bf6dfbb484adfda3b8df26ee3e2ebda239dd263 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Tue, 4 Aug 2020 21:16:48 -0400
Subject: wallet: Remove path checking code from bitcoin-wallet tool

This commit does not change behavior except for error messages which now
include more complete information.
---
 src/wallet/salvage.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/wallet/salvage.cpp')

diff --git a/src/wallet/salvage.cpp b/src/wallet/salvage.cpp
index 96fba21339..225b975067 100644
--- a/src/wallet/salvage.cpp
+++ b/src/wallet/salvage.cpp
@@ -23,6 +23,13 @@ static bool KeyFilter(const std::string& type)
 
 bool RecoverDatabaseFile(const fs::path& file_path, bilingual_str& error, std::vector<bilingual_str>& warnings)
 {
+    DatabaseOptions options;
+    DatabaseStatus status;
+    options.require_existing = true;
+    options.verify = false;
+    std::unique_ptr<WalletDatabase> database = MakeDatabase(file_path, options, status, error);
+    if (!database) return false;
+
     std::string filename;
     std::shared_ptr<BerkeleyEnvironment> env = GetWalletEnv(file_path, filename);
 
-- 
cgit v1.2.3