diff options
| author | w0xlt <94266259+w0xlt@users.noreply.github.com> | 2021-12-14 20:10:21 -0300 |
|---|---|---|
| committer | w0xlt <94266259+w0xlt@users.noreply.github.com> | 2021-12-15 18:41:40 -0300 |
| commit | abbb7eccef3fc1c36f34756458d2792f6661e29f (patch) | |
| tree | 11d952213f1d1d8e63e472ed68d358a598be7fa4 /src/wallet/rpc/util.cpp | |
| parent | 4807f73f48f4ff1084fcf7aee94e5b14592bfda8 (diff) | |
| download | bitcoin-abbb7eccef3fc1c36f34756458d2792f6661e29f.tar.xz | |
refactor: Move restorewallet() RPC logic to the wallet section
It also simplifies restorewallet() and loadwallet() RPC error handling.
Diffstat (limited to 'src/wallet/rpc/util.cpp')
| -rw-r--r-- | src/wallet/rpc/util.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/wallet/rpc/util.cpp b/src/wallet/rpc/util.cpp index e2126b7236..9a40a67ee5 100644 --- a/src/wallet/rpc/util.cpp +++ b/src/wallet/rpc/util.cpp @@ -122,16 +122,8 @@ std::string LabelFromValue(const UniValue& value) return label; } -std::tuple<std::shared_ptr<CWallet>, std::vector<bilingual_str>> LoadWalletHelper(WalletContext& context, UniValue load_on_start_param, const std::string wallet_name) +void HandleWalletError(const std::shared_ptr<CWallet> wallet, DatabaseStatus& status, bilingual_str& error) { - DatabaseOptions options; - DatabaseStatus status; - options.require_existing = true; - bilingual_str error; - std::vector<bilingual_str> warnings; - std::optional<bool> load_on_start = load_on_start_param.isNull() ? std::nullopt : std::optional<bool>(load_on_start_param.get_bool()); - std::shared_ptr<CWallet> const wallet = LoadWallet(context, wallet_name, load_on_start, options, status, error, warnings); - if (!wallet) { // Map bad format to not found, since bad format is returned when the // wallet directory exists, but doesn't contain a data file. @@ -144,11 +136,15 @@ std::tuple<std::shared_ptr<CWallet>, std::vector<bilingual_str>> LoadWalletHelpe case DatabaseStatus::FAILED_ALREADY_LOADED: code = RPC_WALLET_ALREADY_LOADED; break; + case DatabaseStatus::FAILED_ALREADY_EXISTS: + code = RPC_WALLET_ALREADY_EXISTS; + break; + case DatabaseStatus::FAILED_INVALID_BACKUP_FILE: + code = RPC_INVALID_PARAMETER; + break; default: // RPC_WALLET_ERROR is returned for all other cases. break; } throw JSONRPCError(code, error.original); } - - return { wallet, warnings }; -} +}
\ No newline at end of file |