diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2020-08-04 19:33:37 -0400 |
---|---|---|
committer | Russell Yanofsky <russ@yanofsky.org> | 2020-09-03 12:24:32 -0400 |
commit | 3c815cfe54087fd139169161d2fd175e99840e6a (patch) | |
tree | 9845581f644144cb90197b46f94f61bf18ccde50 /src/wallet/load.cpp | |
parent | 0d94e6062547f288a75921d2433458a44a5f2297 (diff) | |
download | bitcoin-3c815cfe54087fd139169161d2fd175e99840e6a.tar.xz |
wallet: Remove Verify and IsLoaded methods
Checks are now consolidated in MakeBerkeleyDatabase function instead of
happening in higher level code.
This commit does not change behavior except for error messages which now
include more complete information.
Diffstat (limited to 'src/wallet/load.cpp')
-rw-r--r-- | src/wallet/load.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp index dde29842ec..84dc5adf66 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -52,11 +52,11 @@ bool VerifyWallets(interfaces::Chain& chain, const std::vector<std::string>& wal return false; } + DatabaseOptions options; + DatabaseStatus status; + options.verify = true; bilingual_str error_string; - std::vector<bilingual_str> warnings; - bool verify_success = CWallet::Verify(chain, wallet_file, error_string, warnings); - if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n"))); - if (!verify_success) { + if (!MakeWalletDatabase(wallet_file, options, status, error_string)) { chain.initError(error_string); return false; } |