diff options
author | fanquake <fanquake@gmail.com> | 2021-08-04 13:38:36 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-08-04 19:20:32 +0800 |
commit | 32fa49a18497a9b8c72e36a72ae96e7b23930223 (patch) | |
tree | 5cb3394183c123b5e0db66a7694c6afa99a8565e /src/wallet/wallet.cpp | |
parent | 3308c61091b6b7cb22569f3abadea6d001295c90 (diff) | |
download | bitcoin-32fa49a18497a9b8c72e36a72ae96e7b23930223.tar.xz |
make ParseOutputType return a std::optional<OutputType>
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 9a61ca698d..741540f724 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2586,19 +2586,21 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain* chain, const std::st } if (!gArgs.GetArg("-addresstype", "").empty()) { - if (!ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) { + std::optional<OutputType> parsed = ParseOutputType(gArgs.GetArg("-addresstype", "")); + if (!parsed) { error = strprintf(_("Unknown address type '%s'"), gArgs.GetArg("-addresstype", "")); return nullptr; } + walletInstance->m_default_address_type = parsed.value(); } if (!gArgs.GetArg("-changetype", "").empty()) { - OutputType out_type; - if (!ParseOutputType(gArgs.GetArg("-changetype", ""), out_type)) { + std::optional<OutputType> parsed = ParseOutputType(gArgs.GetArg("-changetype", "")); + if (!parsed) { error = strprintf(_("Unknown change type '%s'"), gArgs.GetArg("-changetype", "")); return nullptr; } - walletInstance->m_default_change_type = out_type; + walletInstance->m_default_change_type = parsed.value(); } if (gArgs.IsArgSet("-mintxfee")) { |