zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify some vector initialization 

Also simplify some calls to use `tl::make_unexpected`.
This commit is contained in:
Greg Pfeil 2023-04-12 14:20:37 -06:00
parent 8d6dabd46a
commit 0fca843a5b
No known key found for this signature in database
GPG Key ID: 1193ACD196ED61F2
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rpc/client.cpp
View File

@ -218,17 +218,14 @@ RPCConvertValues(const std::string &method, const std::vector<std::string> &strA
{
UniValue params(UniValue::VARR);
auto paramsToConvert = ParamsToConvertFor(method);
std::vector<bool> requiredParams{}, optionalParams{};
if (paramsToConvert.has_value()) {
std::tie(requiredParams, optionalParams) = paramsToConvert.value();
} else {
return tl::expected<UniValue, ConversionFailure>(tl::unexpect, UnknownRPCMethod());
if (!paramsToConvert.has_value()) {
return tl::make_unexpected(UnknownRPCMethod());
}
const auto [requiredParams, optionalParams] = paramsToConvert.value();
if (strArgs.size() < requiredParams.size()
|| requiredParams.size() + optionalParams.size() < strArgs.size()) {
return tl::expected<UniValue, ConversionFailure>(
tl::unexpect,
return tl::make_unexpected(
WrongNumberOfArguments(requiredParams.size(), optionalParams.size(), strArgs.size()));
}
@ -249,9 +246,7 @@ RPCConvertValues(const std::string &method, const std::vector<std::string> &strA
if (parsedArg.has_value()) {
params.push_back(parsedArg.value());
} else {
return tl::expected<UniValue, ConversionFailure>(
tl::unexpect,
UnparseableArgument(strVal));
return tl::make_unexpected(UnparseableArgument(strVal));
}
}
}