mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-22 12:23:34 -05:00

cfbc8a623b
refactor: rpc: hide and rename ParseNonRFCJSONValue() (stickies-v)6c8bde6d54
test: move coverage on ParseNonRFCJSONValue() to UniValue::read() (stickies-v) Pull request description: Follow-up to https://github.com/bitcoin/bitcoin/pull/26612#issuecomment-1453623741. As per https://github.com/bitcoin/bitcoin/pull/26506#pullrequestreview-1211984059, `ParseNonRFCJSONValue()` is no longer necessary and we can use `UniValue::read()` directly: > IIRC before that PR UniValue::read could only parse JSON object and array values, but now it will parse string/number/boolean/null values as well. laanwj pointed this out in https://github.com/bitcoin/bitcoin/issues/9028#issuecomment-257885368 The implementation of `ParseNonRFCJSONValue()` was already [simplified in #26612](https://github.com/bitcoin/bitcoin/pull/26612/files#diff-84c7a7f36362b9724c31e5dec9879b2f81eae0d0addbc9c0933c3558c577de65R259-R263) and [test coverage updated](https://github.com/bitcoin/bitcoin/pull/26612/files#diff-fc0f86b6c3bb23b0e983bcf79d7546d1c9eaa15d6e4d8a7b03b5b85955f585abR292-R312) to ensure behaviour didn't change. To avoid code duplication, we keep the function to throw on invalid input data but rename it to `Parse()` and remove it from the header. The existing test coverage we had on `ParseNonRFCJSONValue()` is moved over to `UniValue::read()`. ACKs for top commit: ryanofsky: Code review ACKcfbc8a623b
. Only change since last review is adding a new test Tree-SHA512: 89be959d2353af7ace0c1348ba1600b9ac1d3c7b3cf7f0b59f6e005b7fb9d695ce3e8720e1be3cf77fe7e318a4017c880df108928e7179ec50447583d13bc781
101 lines
2.7 KiB
C++
101 lines
2.7 KiB
C++
// Copyright (c) 2009-2022 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <chainparams.h>
|
|
#include <core_io.h>
|
|
#include <rpc/client.h>
|
|
#include <rpc/util.h>
|
|
#include <test/fuzz/fuzz.h>
|
|
#include <util/chaintype.h>
|
|
|
|
#include <limits>
|
|
#include <string>
|
|
|
|
void initialize_parse_univalue()
|
|
{
|
|
SelectParams(ChainType::REGTEST);
|
|
}
|
|
|
|
FUZZ_TARGET_INIT(parse_univalue, initialize_parse_univalue)
|
|
{
|
|
const std::string random_string(buffer.begin(), buffer.end());
|
|
bool valid = true;
|
|
const UniValue univalue = [&] {
|
|
UniValue uv;
|
|
if (!uv.read(random_string)) valid = false;
|
|
return valid ? uv : UniValue{};
|
|
}();
|
|
if (!valid) {
|
|
return;
|
|
}
|
|
try {
|
|
(void)ParseHashO(univalue, "A");
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHashO(univalue, random_string);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHashV(univalue, "A");
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHashV(univalue, random_string);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHexO(univalue, "A");
|
|
} catch (const UniValue&) {
|
|
}
|
|
try {
|
|
(void)ParseHexO(univalue, random_string);
|
|
} catch (const UniValue&) {
|
|
}
|
|
try {
|
|
(void)ParseHexUV(univalue, "A");
|
|
(void)ParseHexUV(univalue, random_string);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHexV(univalue, "A");
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseHexV(univalue, random_string);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseSighashString(univalue);
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)AmountFromValue(univalue);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
FlatSigningProvider provider;
|
|
(void)EvalDescriptorStringOrObject(univalue, provider);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseConfirmTarget(univalue, std::numeric_limits<unsigned int>::max());
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
try {
|
|
(void)ParseDescriptorRange(univalue);
|
|
} catch (const UniValue&) {
|
|
} catch (const std::runtime_error&) {
|
|
}
|
|
}
|