diff options
| author | John Newbery <john@johnnewbery.com> | 2018-04-18 14:17:09 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2018-05-16 11:59:58 -0400 |
| commit | 876eb64680968c8fe2a28d1ecfd88a08d8967ead (patch) | |
| tree | db3bbc04d2c7b5d3c992bc4fb02090a61623a78f /src/wallet/wallet.h | |
| parent | e0e90db07b4e798dd1625bd23c2e9bd96fc6ff49 (diff) | |
| download | bitcoin-876eb64680968c8fe2a28d1ecfd88a08d8967ead.tar.xz | |
[wallet] Pass error message back from CWallet::Verify()
Pass an error message back from CWallet::Verify(), and call
InitError/InitWarning from WalletInit::Verify().
This means that we can call CWallet::Verify() independently from
WalletInit and not have InitErrors printed to stdout. It also means that
the error can be reported to the user if dynamic wallet load fails.
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 200248bcf5..fecc2178e4 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1119,7 +1119,7 @@ public: bool MarkReplaced(const uint256& originalHash, const uint256& newHash); //! Verify wallet naming and perform salvage on the wallet if required - static bool Verify(std::string wallet_file, bool salvage_wallet); + static bool Verify(std::string wallet_file, bool salvage_wallet, std::string& error_string, std::string& warning_string); /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */ static CWallet* CreateWalletFromFile(const std::string& name, const fs::path& path); |