Merge 57982f419e into merged_master (Bitcoin PR bitcoin/bitcoin#23654)

This commit is contained in:
James Dorfman 2023-06-02 05:15:27 +00:00
commit 043d780db2

View file

@ -41,13 +41,17 @@ struct RPCFuzzTestingSetup : public TestingSetup {
{
}
UniValue CallRPC(const std::string& rpc_method, const std::vector<std::string>& arguments)
void CallRPC(const std::string& rpc_method, const std::vector<std::string>& arguments)
{
JSONRPCRequest request;
request.context = &m_node;
request.strMethod = rpc_method;
request.params = RPCConvertValues(rpc_method, arguments);
return tableRPC.execute(request);
try {
request.params = RPCConvertValues(rpc_method, arguments);
} catch (const std::runtime_error&) {
return;
}
tableRPC.execute(request);
}
std::vector<std::string> GetRPCCommands() const
@ -375,7 +379,11 @@ FUZZ_TARGET_INIT(rpc, initialize_rpc)
}
try {
rpc_testing_setup->CallRPC(rpc_command, arguments);
} catch (const UniValue&) {
} catch (const std::runtime_error&) {
} catch (const UniValue& json_rpc_error) {
const std::string error_msg{find_value(json_rpc_error, "message").get_str()};
if (error_msg.find("Internal bug detected") != std::string::npos) {
// Only allow the intentional internal bug
assert(error_msg.find("trigger_internal_bug") != std::string::npos);
}
}
}