mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#27605: refactor: Replace global find_value function with UniValue::find_value method

Browse Source 
fa266c4bbf Temporarily work around gcc-13 warning bug in interfaces_tests (MarcoFalke)
fa28850562 Fix clang-tidy performance-unnecessary-copy-initialization warnings (MarcoFalke)
faaa60a30e Remove unused find_value global function (MarcoFalke)
fa422aeec2 scripted-diff: Use UniValue::find_value method (MarcoFalke)
fa548ac872 Add UniValue::find_value method (MarcoFalke)

Pull request description:

  The global function has issues:

  * It causes gcc-13 warnings, see https://github.com/bitcoin/bitcoin/issues/26926
  * There is no rationale for it being a global function, when it acts like a member function
  * `performance-unnecessary-copy-initialization` clang-tidy isn't run on it

  Fix all issues by making it a member function.

ACKs for top commit:
  achow101:
    ACK fa266c4bbf
  hebasto:
    re-ACK fa266c4bbf

Tree-SHA512: 6c4e25da3122cd3b91c376bef73ea94fb3beb7bf8ef5cb3853c5128d95bfbacbcbfb16cc843eb7b1a7ebd350c2b6311f8085eeacf9aeeab3366987037d209e44
This commit is contained in:
Andrew Chow 2023-05-10 11:58:21 -04:00
commit e0a70c5b4f
No known key found for this signature in database
GPG Key ID: 17565732E08E5E41
19 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bitcoin-cli.cpp
View File

@ -871,7 +871,7 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
try { try {
response = CallRPC(rh, strMethod, args, rpcwallet); response = CallRPC(rh, strMethod, args, rpcwallet);
if (fWait) { if (fWait) {
const UniValue& error = find_value(response, "error"); const UniValue& error = response.find_value("error");
if (!error.isNull() && error["code"].getInt<int>() == RPC_IN_WARMUP) { if (!error.isNull() && error["code"].getInt<int>() == RPC_IN_WARMUP) {
throw CConnectionFailed("server in warmup"); throw CConnectionFailed("server in warmup");
} }
@ -899,8 +899,8 @@ static void ParseResult(const UniValue& result, std::string& strPrint)
static void ParseError(const UniValue& error, std::string& strPrint, int& nRet) static void ParseError(const UniValue& error, std::string& strPrint, int& nRet)
{ {
if (error.isObject()) { if (error.isObject()) {
const UniValue& err_code = find_value(error, "code"); const UniValue& err_code = error.find_value("code");
const UniValue& err_msg = find_value(error, "message"); const UniValue& err_msg = error.find_value("message");
if (!err_code.isNull()) { if (!err_code.isNull()) {
strPrint = "error code: " + err_code.getValStr() + "\n"; strPrint = "error code: " + err_code.getValStr() + "\n";
} }
@ -926,15 +926,15 @@ static void GetWalletBalances(UniValue& result)
{ {
DefaultRequestHandler rh; DefaultRequestHandler rh;
const UniValue listwallets = ConnectAndCallRPC(&rh, "listwallets", /* args=*/{}); const UniValue listwallets = ConnectAndCallRPC(&rh, "listwallets", /* args=*/{});
if (!find_value(listwallets, "error").isNull()) return; if (!listwallets.find_value("error").isNull()) return;
const UniValue& wallets = find_value(listwallets, "result"); const UniValue& wallets = listwallets.find_value("result");
if (wallets.size() <= 1) return; if (wallets.size() <= 1) return;
UniValue balances(UniValue::VOBJ); UniValue balances(UniValue::VOBJ);
for (const UniValue& wallet : wallets.getValues()) { for (const UniValue& wallet : wallets.getValues()) {
const std::string& wallet_name = wallet.get_str(); const std::string& wallet_name = wallet.get_str();
const UniValue getbalances = ConnectAndCallRPC(&rh, "getbalances", /* args=*/{}, wallet_name); const UniValue getbalances = ConnectAndCallRPC(&rh, "getbalances", /* args=*/{}, wallet_name);
const UniValue& balance = find_value(getbalances, "result")["mine"]["trusted"]; const UniValue& balance = getbalances.find_value("result")["mine"]["trusted"];
balances.pushKV(wallet_name, balance); balances.pushKV(wallet_name, balance);
} }
result.pushKV("balances", balances); result.pushKV("balances", balances);
@ -970,7 +970,7 @@ static void GetProgressBar(double progress, std::string& progress_bar)
*/ */
static void ParseGetInfoResult(UniValue& result) static void ParseGetInfoResult(UniValue& result)
{ {
if (!find_value(result, "error").isNull()) return; if (!result.find_value("error").isNull()) return;
std::string RESET, GREEN, BLUE, YELLOW, MAGENTA, CYAN; std::string RESET, GREEN, BLUE, YELLOW, MAGENTA, CYAN;
bool should_colorize = false; bool should_colorize = false;
@ -1182,9 +1182,9 @@ static int CommandLineRPC(int argc, char *argv[])
rh.reset(new NetinfoRequestHandler()); rh.reset(new NetinfoRequestHandler());
} else if (gArgs.GetBoolArg("-generate", false)) { } else if (gArgs.GetBoolArg("-generate", false)) {
const UniValue getnewaddress{GetNewAddress()}; const UniValue getnewaddress{GetNewAddress()};
const UniValue& error{find_value(getnewaddress, "error")}; const UniValue& error{getnewaddress.find_value("error")};
if (error.isNull()) { if (error.isNull()) {
SetGenerateToAddressArgs(find_value(getnewaddress, "result").get_str(), args); SetGenerateToAddressArgs(getnewaddress.find_value("result").get_str(), args);
rh.reset(new GenerateToAddressRequestHandler()); rh.reset(new GenerateToAddressRequestHandler());
} else { } else {
ParseError(error, strPrint, nRet); ParseError(error, strPrint, nRet);
@ -1206,8 +1206,8 @@ static int CommandLineRPC(int argc, char *argv[])
const UniValue reply = ConnectAndCallRPC(rh.get(), method, args, wallet_name); const UniValue reply = ConnectAndCallRPC(rh.get(), method, args, wallet_name);
// Parse reply // Parse reply
UniValue result = find_value(reply, "result"); UniValue result = reply.find_value("result");
const UniValue& error = find_value(reply, "error"); const UniValue& error = reply.find_value("error");
if (error.isNull()) { if (error.isNull()) {
if (gArgs.GetBoolArg("-getinfo", false)) { if (gArgs.GetBoolArg("-getinfo", false)) {
if (!gArgs.IsArgSet("-rpcwallet")) { if (!gArgs.IsArgSet("-rpcwallet")) {

16
src/external_signer.cpp
View File

@ -30,7 +30,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
} }
for (const UniValue& signer : result.getValues()) { for (const UniValue& signer : result.getValues()) {
// Check for error // Check for error
const UniValue& error = find_value(signer, "error"); const UniValue& error = signer.find_value("error");
if (!error.isNull()) { if (!error.isNull()) {
if (!error.isStr()) { if (!error.isStr()) {
throw std::runtime_error(strprintf("'%s' error", command)); throw std::runtime_error(strprintf("'%s' error", command));
@ -38,11 +38,11 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
throw std::runtime_error(strprintf("'%s' error: %s", command, error.getValStr())); throw std::runtime_error(strprintf("'%s' error: %s", command, error.getValStr()));
} }
// Check if fingerprint is present // Check if fingerprint is present
const UniValue& fingerprint = find_value(signer, "fingerprint"); const UniValue& fingerprint = signer.find_value("fingerprint");
if (fingerprint.isNull()) { if (fingerprint.isNull()) {
throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command)); throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
} }
const std::string fingerprintStr = fingerprint.get_str(); const std::string& fingerprintStr{fingerprint.get_str()};
// Skip duplicate signer // Skip duplicate signer
bool duplicate = false; bool duplicate = false;
for (const ExternalSigner& signer : signers) { for (const ExternalSigner& signer : signers) {
@ -50,7 +50,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
} }
if (duplicate) break; if (duplicate) break;
std::string name; std::string name;
const UniValue& model_field = find_value(signer, "model"); const UniValue& model_field = signer.find_value("model");
if (model_field.isStr() && model_field.getValStr() != "") { if (model_field.isStr() && model_field.getValStr() != "") {
name += model_field.getValStr(); name += model_field.getValStr();
} }
@ -97,19 +97,19 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
const UniValue signer_result = RunCommandParseJSON(command, stdinStr); const UniValue signer_result = RunCommandParseJSON(command, stdinStr);
if (find_value(signer_result, "error").isStr()) { if (signer_result.find_value("error").isStr()) {
error = find_value(signer_result, "error").get_str(); error = signer_result.find_value("error").get_str();
return false; return false;
} }
if (!find_value(signer_result, "psbt").isStr()) { if (!signer_result.find_value("psbt").isStr()) {
error = "Unexpected result from signer"; error = "Unexpected result from signer";
return false; return false;
} }
PartiallySignedTransaction signer_psbtx; PartiallySignedTransaction signer_psbtx;
std::string signer_psbt_error; std::string signer_psbt_error;
if (!DecodeBase64PSBT(signer_psbtx, find_value(signer_result, "psbt").get_str(), signer_psbt_error)) { if (!DecodeBase64PSBT(signer_psbtx, signer_result.find_value("psbt").get_str(), signer_psbt_error)) {
error = strprintf("TX decode failed %s", signer_psbt_error); error = strprintf("TX decode failed %s", signer_psbt_error);
return false; return false;
} }

4
src/httprpc.cpp
View File

@ -76,7 +76,7 @@ static void JSONErrorReply(HTTPRequest* req, const UniValue& objError, const Uni
{ {
// Send error reply from json-rpc error object // Send error reply from json-rpc error object
int nStatus = HTTP_INTERNAL_SERVER_ERROR; int nStatus = HTTP_INTERNAL_SERVER_ERROR;
int code = find_value(objError, "code").getInt<int>(); int code = objError.find_value("code").getInt<int>();
if (code == RPC_INVALID_REQUEST) if (code == RPC_INVALID_REQUEST)
nStatus = HTTP_BAD_REQUEST; nStatus = HTTP_BAD_REQUEST;
@ -213,7 +213,7 @@ static bool HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
} else { } else {
const UniValue& request = valRequest[reqIdx].get_obj(); const UniValue& request = valRequest[reqIdx].get_obj();
// Parse method // Parse method
std::string strMethod = find_value(request, "method").get_str(); std::string strMethod = request.find_value("method").get_str();
if (!g_rpc_whitelist[jreq.authUser].count(strMethod)) { if (!g_rpc_whitelist[jreq.authUser].count(strMethod)) {
LogPrintf("RPC User %s not allowed to call method %s\n", jreq.authUser, strMethod); LogPrintf("RPC User %s not allowed to call method %s\n", jreq.authUser, strMethod);
req->WriteReply(HTTP_FORBIDDEN); req->WriteReply(HTTP_FORBIDDEN);

6
src/qt/rpcconsole.cpp
View File

@ -249,7 +249,7 @@ bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strRes
subelement = lastResult[parsed.value()]; subelement = lastResult[parsed.value()];
} }
else if (lastResult.isObject()) else if (lastResult.isObject())
subelement = find_value(lastResult, curarg); subelement = lastResult.find_value(curarg);
else else
throw std::runtime_error("Invalid result query"); //no array or object: abort throw std::runtime_error("Invalid result query"); //no array or object: abort
lastResult = subelement; lastResult = subelement;
@ -448,8 +448,8 @@ void RPCExecutor::request(const QString &command, const WalletModel* wallet_mode
{ {
try // Nice formatting for standard-format error try // Nice formatting for standard-format error
{ {
int code = find_value(objError, "code").getInt<int>(); int code = objError.find_value("code").getInt<int>();
std::string message = find_value(objError, "message").get_str(); std::string message = objError.find_value("message").get_str();
Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")"); Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")");
} }
catch (const std::runtime_error&) // raised when converting to invalid type, i.e. missing code or message catch (const std::runtime_error&) // raised when converting to invalid type, i.e. missing code or message

2
src/rpc/mempool.cpp
View File

@ -638,7 +638,7 @@ static RPCHelpMan gettxspendingprevout()
}, /*fAllowNull=*/false, /*fStrict=*/true); }, /*fAllowNull=*/false, /*fStrict=*/true);
const uint256 txid(ParseHashO(o, "txid")); const uint256 txid(ParseHashO(o, "txid"));
const int nOutput{find_value(o, "vout").getInt<int>()}; const int nOutput{o.find_value("vout").getInt<int>()};
if (nOutput < 0) { if (nOutput < 0) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
} }

8
src/rpc/mining.cpp
View File

@ -612,7 +612,7 @@ static RPCHelpMan getblocktemplate()
if (!request.params[0].isNull()) if (!request.params[0].isNull())
{ {
const UniValue& oparam = request.params[0].get_obj(); const UniValue& oparam = request.params[0].get_obj();
const UniValue& modeval = find_value(oparam, "mode"); const UniValue& modeval = oparam.find_value("mode");
if (modeval.isStr()) if (modeval.isStr())
strMode = modeval.get_str(); strMode = modeval.get_str();
else if (modeval.isNull()) else if (modeval.isNull())
@ -621,11 +621,11 @@ static RPCHelpMan getblocktemplate()
} }
else else
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
lpval = find_value(oparam, "longpollid"); lpval = oparam.find_value("longpollid");
if (strMode == "proposal") if (strMode == "proposal")
{ {
const UniValue& dataval = find_value(oparam, "data"); const UniValue& dataval = oparam.find_value("data");
if (!dataval.isStr()) if (!dataval.isStr())
throw JSONRPCError(RPC_TYPE_ERROR, "Missing data String key for proposal"); throw JSONRPCError(RPC_TYPE_ERROR, "Missing data String key for proposal");
@ -652,7 +652,7 @@ static RPCHelpMan getblocktemplate()
return BIP22ValidationResult(state); return BIP22ValidationResult(state);
} }
const UniValue& aClientRules = find_value(oparam, "rules"); const UniValue& aClientRules = oparam.find_value("rules");
if (aClientRules.isArray()) { if (aClientRules.isArray()) {
for (unsigned int i = 0; i < aClientRules.size(); ++i) { for (unsigned int i = 0; i < aClientRules.size(); ++i) {
const UniValue& v = aClientRules[i]; const UniValue& v = aClientRules[i];

12
src/rpc/rawtransaction_util.cpp
View File

@ -36,7 +36,7 @@ void AddInputs(CMutableTransaction& rawTx, const UniValue& inputs_in, std::optio
uint256 txid = ParseHashO(o, "txid"); uint256 txid = ParseHashO(o, "txid");
const UniValue& vout_v = find_value(o, "vout"); const UniValue& vout_v = o.find_value("vout");
if (!vout_v.isNum()) if (!vout_v.isNum())
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key");
int nOutput = vout_v.getInt<int>(); int nOutput = vout_v.getInt<int>();
@ -54,7 +54,7 @@ void AddInputs(CMutableTransaction& rawTx, const UniValue& inputs_in, std::optio
} }
// set the sequence number if passed in the parameters object // set the sequence number if passed in the parameters object
const UniValue& sequenceObj = find_value(o, "sequence"); const UniValue& sequenceObj = o.find_value("sequence");
if (sequenceObj.isNum()) { if (sequenceObj.isNum()) {
int64_t seqNr64 = sequenceObj.getInt<int64_t>(); int64_t seqNr64 = sequenceObj.getInt<int64_t>();
if (seqNr64 < 0 || seqNr64 > CTxIn::SEQUENCE_FINAL) { if (seqNr64 < 0 || seqNr64 > CTxIn::SEQUENCE_FINAL) {
@ -187,7 +187,7 @@ void ParsePrevouts(const UniValue& prevTxsUnival, FillableSigningProvider* keyst
uint256 txid = ParseHashO(prevOut, "txid"); uint256 txid = ParseHashO(prevOut, "txid");
int nOut = find_value(prevOut, "vout").getInt<int>(); int nOut = prevOut.find_value("vout").getInt<int>();
if (nOut < 0) { if (nOut < 0) {
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "vout cannot be negative"); throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "vout cannot be negative");
} }
@ -208,7 +208,7 @@ void ParsePrevouts(const UniValue& prevTxsUnival, FillableSigningProvider* keyst
newcoin.out.scriptPubKey = scriptPubKey; newcoin.out.scriptPubKey = scriptPubKey;
newcoin.out.nValue = MAX_MONEY; newcoin.out.nValue = MAX_MONEY;
if (prevOut.exists("amount")) { if (prevOut.exists("amount")) {
newcoin.out.nValue = AmountFromValue(find_value(prevOut, "amount")); newcoin.out.nValue = AmountFromValue(prevOut.find_value("amount"));
} }
newcoin.nHeight = 1; newcoin.nHeight = 1;
coins[out] = std::move(newcoin); coins[out] = std::move(newcoin);
@ -223,8 +223,8 @@ void ParsePrevouts(const UniValue& prevTxsUnival, FillableSigningProvider* keyst
{"redeemScript", UniValueType(UniValue::VSTR)}, {"redeemScript", UniValueType(UniValue::VSTR)},
{"witnessScript", UniValueType(UniValue::VSTR)}, {"witnessScript", UniValueType(UniValue::VSTR)},
}, true); }, true);
UniValue rs = find_value(prevOut, "redeemScript"); const UniValue& rs{prevOut.find_value("redeemScript")};
UniValue ws = find_value(prevOut, "witnessScript"); const UniValue& ws{prevOut.find_value("witnessScript")};
if (rs.isNull() && ws.isNull()) { if (rs.isNull() && ws.isNull()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Missing redeemScript/witnessScript"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Missing redeemScript/witnessScript");
} }

6
src/rpc/request.cpp
View File

@ -165,10 +165,10 @@ void JSONRPCRequest::parse(const UniValue& valRequest)
const UniValue& request = valRequest.get_obj(); const UniValue& request = valRequest.get_obj();
// Parse id now so errors from here on will have the id // Parse id now so errors from here on will have the id
id = find_value(request, "id"); id = request.find_value("id");
// Parse method // Parse method
UniValue valMethod = find_value(request, "method"); const UniValue& valMethod{request.find_value("method")};
if (valMethod.isNull()) if (valMethod.isNull())
throw JSONRPCError(RPC_INVALID_REQUEST, "Missing method"); throw JSONRPCError(RPC_INVALID_REQUEST, "Missing method");
if (!valMethod.isStr()) if (!valMethod.isStr())
@ -181,7 +181,7 @@ void JSONRPCRequest::parse(const UniValue& valRequest)
LogPrint(BCLog::RPC, "ThreadRPCServer method=%s user=%s\n", SanitizeString(strMethod), this->authUser); LogPrint(BCLog::RPC, "ThreadRPCServer method=%s user=%s\n", SanitizeString(strMethod), this->authUser);
// Parse params // Parse params
UniValue valParams = find_value(request, "params"); const UniValue& valParams{request.find_value("params")};
if (valParams.isArray() || valParams.isObject()) if (valParams.isArray() || valParams.isObject())
params = valParams; params = valParams;
else if (valParams.isNull()) else if (valParams.isNull())

10
src/rpc/util.cpp
View File

@ -37,7 +37,7 @@ void RPCTypeCheckObj(const UniValue& o,
bool fStrict) bool fStrict)
{ {
for (const auto& t : typesExpected) { for (const auto& t : typesExpected) {
const UniValue& v = find_value(o, t.first); const UniValue& v = o.find_value(t.first);
if (!fAllowNull && v.isNull()) if (!fAllowNull && v.isNull())
throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first)); throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first));
@ -81,7 +81,7 @@ uint256 ParseHashV(const UniValue& v, std::string strName)
} }
uint256 ParseHashO(const UniValue& o, std::string strKey) uint256 ParseHashO(const UniValue& o, std::string strKey)
{ {
return ParseHashV(find_value(o, strKey), strKey); return ParseHashV(o.find_value(strKey), strKey);
} }
std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName) std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName)
{ {
@ -94,7 +94,7 @@ std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName)
} }
std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey) std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey)
{ {
return ParseHexV(find_value(o, strKey), strKey); return ParseHexV(o.find_value(strKey), strKey);
} }
namespace { namespace {
@ -1133,10 +1133,10 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
if (scanobject.isStr()) { if (scanobject.isStr()) {
desc_str = scanobject.get_str(); desc_str = scanobject.get_str();
} else if (scanobject.isObject()) { } else if (scanobject.isObject()) {
UniValue desc_uni = find_value(scanobject, "desc"); const UniValue& desc_uni{scanobject.find_value("desc")};
if (desc_uni.isNull()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Descriptor needs to be provided in scan object"); if (desc_uni.isNull()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Descriptor needs to be provided in scan object");
desc_str = desc_uni.get_str(); desc_str = desc_uni.get_str();
UniValue range_uni = find_value(scanobject, "range"); const UniValue& range_uni{scanobject.find_value("range")};
if (!range_uni.isNull()) { if (!range_uni.isNull()) {
range = ParseDescriptorRange(range_uni); range = ParseDescriptorRange(range_uni);
} }

2
src/test/fuzz/rpc.cpp
View File

@ -364,7 +364,7 @@ FUZZ_TARGET_INIT(rpc, initialize_rpc)
try { try {
rpc_testing_setup->CallRPC(rpc_command, arguments); rpc_testing_setup->CallRPC(rpc_command, arguments);
} catch (const UniValue& json_rpc_error) { } catch (const UniValue& json_rpc_error) {
const std::string error_msg{find_value(json_rpc_error, "message").get_str()}; const std::string error_msg{json_rpc_error.find_value("message").get_str()};
// Once c++20 is allowed, starts_with can be used. // Once c++20 is allowed, starts_with can be used.
// if (error_msg.starts_with("Internal bug detected")) { // if (error_msg.starts_with("Internal bug detected")) {
if (0 == error_msg.rfind("Internal bug detected", 0)) { if (0 == error_msg.rfind("Internal bug detected", 0)) {

2
src/test/interfaces_tests.cpp
View File

@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(findAncestorByHash)
BOOST_AUTO_TEST_CASE(findCommonAncestor) BOOST_AUTO_TEST_CASE(findCommonAncestor)
{ {
auto& chain = m_node.chain; auto& chain = m_node.chain;
const CChain& active = WITH_LOCK(Assert(m_node.chainman)->GetMutex(), return Assert(m_node.chainman)->ActiveChain()); const CChain& active{*WITH_LOCK(Assert(m_node.chainman)->GetMutex(), return &Assert(m_node.chainman)->ActiveChain())};
auto* orig_tip = active.Tip(); auto* orig_tip = active.Tip();
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
BlockValidationState state; BlockValidationState state;

14
src/test/key_io_tests.cpp
View File

@ -37,11 +37,11 @@ BOOST_AUTO_TEST_CASE(key_io_valid_parse)
std::string exp_base58string = test[0].get_str(); std::string exp_base58string = test[0].get_str();
const std::vector<std::byte> exp_payload{ParseHex<std::byte>(test[1].get_str())}; const std::vector<std::byte> exp_payload{ParseHex<std::byte>(test[1].get_str())};
const UniValue &metadata = test[2].get_obj(); const UniValue &metadata = test[2].get_obj();
bool isPrivkey = find_value(metadata, "isPrivkey").get_bool(); bool isPrivkey = metadata.find_value("isPrivkey").get_bool();
SelectParams(ChainTypeFromString(find_value(metadata, "chain").get_str()).value()); SelectParams(ChainTypeFromString(metadata.find_value("chain").get_str()).value());
bool try_case_flip = find_value(metadata, "tryCaseFlip").isNull() ? false : find_value(metadata, "tryCaseFlip").get_bool(); bool try_case_flip = metadata.find_value("tryCaseFlip").isNull() ? false : metadata.find_value("tryCaseFlip").get_bool();
if (isPrivkey) { if (isPrivkey) {
bool isCompressed = find_value(metadata, "isCompressed").get_bool(); bool isCompressed = metadata.find_value("isCompressed").get_bool();
// Must be valid private key // Must be valid private key
privkey = DecodeSecret(exp_base58string); privkey = DecodeSecret(exp_base58string);
BOOST_CHECK_MESSAGE(privkey.IsValid(), "!IsValid:" + strTest); BOOST_CHECK_MESSAGE(privkey.IsValid(), "!IsValid:" + strTest);
@ -96,10 +96,10 @@ BOOST_AUTO_TEST_CASE(key_io_valid_gen)
std::string exp_base58string = test[0].get_str(); std::string exp_base58string = test[0].get_str();
std::vector<unsigned char> exp_payload = ParseHex(test[1].get_str()); std::vector<unsigned char> exp_payload = ParseHex(test[1].get_str());
const UniValue &metadata = test[2].get_obj(); const UniValue &metadata = test[2].get_obj();
bool isPrivkey = find_value(metadata, "isPrivkey").get_bool(); bool isPrivkey = metadata.find_value("isPrivkey").get_bool();
SelectParams(ChainTypeFromString(find_value(metadata, "chain").get_str()).value()); SelectParams(ChainTypeFromString(metadata.find_value("chain").get_str()).value());
if (isPrivkey) { if (isPrivkey) {
bool isCompressed = find_value(metadata, "isCompressed").get_bool(); bool isCompressed = metadata.find_value("isCompressed").get_bool();
CKey key; CKey key;
key.Set(exp_payload.begin(), exp_payload.end(), isCompressed); key.Set(exp_payload.begin(), exp_payload.end(), isCompressed);
assert(key.IsValid()); assert(key.IsValid());

42
src/test/rpc_tests.cpp
View File

@ -75,7 +75,7 @@ UniValue RPCTestingSetup::CallRPC(std::string args)
return result; return result;
} }
catch (const UniValue& objError) { catch (const UniValue& objError) {
throw std::runtime_error(find_value(objError, "message").get_str()); throw std::runtime_error(objError.find_value("message").get_str());
} }
} }
@ -130,9 +130,9 @@ BOOST_AUTO_TEST_CASE(rpc_rawparams)
BOOST_CHECK_THROW(CallRPC("decoderawtransaction DEADBEEF"), std::runtime_error); BOOST_CHECK_THROW(CallRPC("decoderawtransaction DEADBEEF"), std::runtime_error);
std::string rawtx = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000"; std::string rawtx = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx)); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx));
BOOST_CHECK_EQUAL(find_value(r.get_obj(), "size").getInt<int>(), 193); BOOST_CHECK_EQUAL(r.get_obj().find_value("size").getInt<int>(), 193);
BOOST_CHECK_EQUAL(find_value(r.get_obj(), "version").getInt<int>(), 1); BOOST_CHECK_EQUAL(r.get_obj().find_value("version").getInt<int>(), 1);
BOOST_CHECK_EQUAL(find_value(r.get_obj(), "locktime").getInt<int>(), 0); BOOST_CHECK_EQUAL(r.get_obj().find_value("locktime").getInt<int>(), 0);
BOOST_CHECK_THROW(CallRPC(std::string("decoderawtransaction ")+rawtx+" extra"), std::runtime_error); BOOST_CHECK_THROW(CallRPC(std::string("decoderawtransaction ")+rawtx+" extra"), std::runtime_error);
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false")); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false"));
BOOST_CHECK_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false extra"), std::runtime_error); BOOST_CHECK_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false extra"), std::runtime_error);
@ -149,20 +149,20 @@ BOOST_AUTO_TEST_CASE(rpc_togglenetwork)
UniValue r; UniValue r;
r = CallRPC("getnetworkinfo"); r = CallRPC("getnetworkinfo");
bool netState = find_value(r.get_obj(), "networkactive").get_bool(); bool netState = r.get_obj().find_value("networkactive").get_bool();
BOOST_CHECK_EQUAL(netState, true); BOOST_CHECK_EQUAL(netState, true);
BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive false")); BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive false"));
r = CallRPC("getnetworkinfo"); r = CallRPC("getnetworkinfo");
int numConnection = find_value(r.get_obj(), "connections").getInt<int>(); int numConnection = r.get_obj().find_value("connections").getInt<int>();
BOOST_CHECK_EQUAL(numConnection, 0); BOOST_CHECK_EQUAL(numConnection, 0);
netState = find_value(r.get_obj(), "networkactive").get_bool(); netState = r.get_obj().find_value("networkactive").get_bool();
BOOST_CHECK_EQUAL(netState, false); BOOST_CHECK_EQUAL(netState, false);
BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive true")); BOOST_CHECK_NO_THROW(CallRPC("setnetworkactive true"));
r = CallRPC("getnetworkinfo"); r = CallRPC("getnetworkinfo");
netState = find_value(r.get_obj(), "networkactive").get_bool(); netState = r.get_obj().find_value("networkactive").get_bool();
BOOST_CHECK_EQUAL(netState, true); BOOST_CHECK_EQUAL(netState, true);
} }
@ -180,9 +180,9 @@ BOOST_AUTO_TEST_CASE(rpc_rawsign)
std::string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\""; std::string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\"";
std::string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\""; std::string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\"";
r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" [] "+prevout); r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" [] "+prevout);
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == false); BOOST_CHECK(r.get_obj().find_value("complete").get_bool() == false);
r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" ["+privkey1+","+privkey2+"] "+prevout); r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" ["+privkey1+","+privkey2+"] "+prevout);
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == true); BOOST_CHECK(r.get_obj().find_value("complete").get_bool() == true);
} }
BOOST_AUTO_TEST_CASE(rpc_createraw_op_return) BOOST_AUTO_TEST_CASE(rpc_createraw_op_return)
@ -325,7 +325,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
UniValue ar = r.get_array(); UniValue ar = r.get_array();
UniValue o1 = ar[0].get_obj(); UniValue o1 = ar[0].get_obj();
UniValue adr = find_value(o1, "address"); UniValue adr = o1.find_value("address");
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/32"); BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/32");
BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0 remove"))); BOOST_CHECK_NO_THROW(CallRPC(std::string("setban 127.0.0.0 remove")));
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
@ -336,8 +336,8 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
ar = r.get_array(); ar = r.get_array();
o1 = ar[0].get_obj(); o1 = ar[0].get_obj();
adr = find_value(o1, "address"); adr = o1.find_value("address");
int64_t banned_until{find_value(o1, "banned_until").getInt<int64_t>()}; int64_t banned_until{o1.find_value("banned_until").getInt<int64_t>()};
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24"); BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
BOOST_CHECK_EQUAL(banned_until, 9907731200); // absolute time check BOOST_CHECK_EQUAL(banned_until, 9907731200); // absolute time check
@ -351,11 +351,11 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
ar = r.get_array(); ar = r.get_array();
o1 = ar[0].get_obj(); o1 = ar[0].get_obj();
adr = find_value(o1, "address"); adr = o1.find_value("address");
banned_until = find_value(o1, "banned_until").getInt<int64_t>(); banned_until = o1.find_value("banned_until").getInt<int64_t>();
const int64_t ban_created{find_value(o1, "ban_created").getInt<int64_t>()}; const int64_t ban_created{o1.find_value("ban_created").getInt<int64_t>()};
const int64_t ban_duration{find_value(o1, "ban_duration").getInt<int64_t>()}; const int64_t ban_duration{o1.find_value("ban_duration").getInt<int64_t>()};
const int64_t time_remaining{find_value(o1, "time_remaining").getInt<int64_t>()}; const int64_t time_remaining{o1.find_value("time_remaining").getInt<int64_t>()};
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24"); BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
BOOST_CHECK_EQUAL(banned_until, time_remaining_expected + now.count()); BOOST_CHECK_EQUAL(banned_until, time_remaining_expected + now.count());
BOOST_CHECK_EQUAL(ban_duration, banned_until - ban_created); BOOST_CHECK_EQUAL(ban_duration, banned_until - ban_created);
@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
ar = r.get_array(); ar = r.get_array();
o1 = ar[0].get_obj(); o1 = ar[0].get_obj();
adr = find_value(o1, "address"); adr = o1.find_value("address");
BOOST_CHECK_EQUAL(adr.get_str(), "fe80::202:b3ff:fe1e:8329/128"); BOOST_CHECK_EQUAL(adr.get_str(), "fe80::202:b3ff:fe1e:8329/128");
BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned"))); BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
@ -393,7 +393,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
ar = r.get_array(); ar = r.get_array();
o1 = ar[0].get_obj(); o1 = ar[0].get_obj();
adr = find_value(o1, "address"); adr = o1.find_value("address");
BOOST_CHECK_EQUAL(adr.get_str(), "2001:db8::/30"); BOOST_CHECK_EQUAL(adr.get_str(), "2001:db8::/30");
BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned"))); BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
@ -401,7 +401,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned"))); BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
ar = r.get_array(); ar = r.get_array();
o1 = ar[0].get_obj(); o1 = ar[0].get_obj();
adr = find_value(o1, "address"); adr = o1.find_value("address");
BOOST_CHECK_EQUAL(adr.get_str(), "2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128"); BOOST_CHECK_EQUAL(adr.get_str(), "2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128");
} }

4
src/test/system_tests.cpp
View File

@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(run_command)
const UniValue result = RunCommandParseJSON("echo \"{\"success\": true}\""); const UniValue result = RunCommandParseJSON("echo \"{\"success\": true}\"");
#endif #endif
BOOST_CHECK(result.isObject()); BOOST_CHECK(result.isObject());
const UniValue& success = find_value(result, "success"); const UniValue& success = result.find_value("success");
BOOST_CHECK(!success.isNull()); BOOST_CHECK(!success.isNull());
BOOST_CHECK_EQUAL(success.get_bool(), true); BOOST_CHECK_EQUAL(success.get_bool(), true);
} }
@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(run_command)
{ {
const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}"); const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}");
BOOST_CHECK(result.isObject()); BOOST_CHECK(result.isObject());
const UniValue& success = find_value(result, "success"); const UniValue& success = result.find_value("success");
BOOST_CHECK(!success.isNull()); BOOST_CHECK(!success.isNull());
BOOST_CHECK_EQUAL(success.get_bool(), true); BOOST_CHECK_EQUAL(success.get_bool(), true);
} }

4
src/univalue/include/univalue.h
View File

@ -123,7 +123,7 @@ public:
const UniValue& get_array() const; const UniValue& get_array() const;
enum VType type() const { return getType(); } enum VType type() const { return getType(); }
friend const UniValue& find_value( const UniValue& obj, const std::string& name); const UniValue& find_value(std::string_view key) const;
}; };
template <class It> template <class It>
@ -201,6 +201,4 @@ static inline bool json_isspace(int ch)
extern const UniValue NullUniValue; extern const UniValue NullUniValue;
const UniValue& find_value( const UniValue& obj, const std::string& name);
#endif // BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_H #endif // BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_H

11
src/univalue/lib/univalue.cpp
View File

@ -230,12 +230,13 @@ const char *uvTypeName(UniValue::VType t)
return nullptr; return nullptr;
} }
const UniValue& find_value(const UniValue& obj, const std::string& name) const UniValue& UniValue::find_value(std::string_view key) const
{ {
for (unsigned int i = 0; i < obj.keys.size(); i++) for (unsigned int i = 0; i < keys.size(); ++i) {
if (obj.keys[i] == name) if (keys[i] == key) {
return obj.values.at(i); return values.at(i);
}
}
return NullUniValue; return NullUniValue;
} }

2
src/wallet/rpc/coins.cpp
View File

@ -320,7 +320,7 @@ RPCHelpMan lockunspent()
}); });
const uint256 txid(ParseHashO(o, "txid")); const uint256 txid(ParseHashO(o, "txid"));
const int nOutput = find_value(o, "vout").getInt<int>(); const int nOutput = o.find_value("vout").getInt<int>();
if (nOutput < 0) { if (nOutput < 0) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
} }

4
src/wallet/rpc/spend.cpp
View File

@ -673,7 +673,7 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
for (const UniValue& input : options["input_weights"].get_array().getValues()) { for (const UniValue& input : options["input_weights"].get_array().getValues()) {
uint256 txid = ParseHashO(input, "txid"); uint256 txid = ParseHashO(input, "txid");
const UniValue& vout_v = find_value(input, "vout"); const UniValue& vout_v = input.find_value("vout");
if (!vout_v.isNum()) { if (!vout_v.isNum()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key");
} }
@ -682,7 +682,7 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
} }
const UniValue& weight_v = find_value(input, "weight"); const UniValue& weight_v = input.find_value("weight");
if (!weight_v.isNum()) { if (!weight_v.isNum()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing weight key"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing weight key");
} }

2
src/wallet/wallet.cpp
View File

@ -3589,7 +3589,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
if (!signer_res.isObject()) throw std::runtime_error(std::string(__func__) + ": Unexpected result"); if (!signer_res.isObject()) throw std::runtime_error(std::string(__func__) + ": Unexpected result");
for (bool internal : {false, true}) { for (bool internal : {false, true}) {
const UniValue& descriptor_vals = find_value(signer_res, internal ? "internal" : "receive"); const UniValue& descriptor_vals = signer_res.find_value(internal ? "internal" : "receive");
if (!descriptor_vals.isArray()) throw std::runtime_error(std::string(__func__) + ": Unexpected result"); if (!descriptor_vals.isArray()) throw std::runtime_error(std::string(__func__) + ": Unexpected result");
for (const UniValue& desc_val : descriptor_vals.get_array().getValues()) { for (const UniValue& desc_val : descriptor_vals.get_array().getValues()) {
const std::string& desc_str = desc_val.getValStr(); const std::string& desc_str = desc_val.getValStr();