inline non-member functions with body in fuzzing headers

This commit is contained in:
Patrick Strateman 2020-12-20 18:19:43 -05:00
parent f1dbf92ff0
commit d8b9cec25b
2 changed files with 7 additions and 7 deletions

View file

@ -15,7 +15,7 @@ using TypeInitialize = std::function<void()>;
void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init); void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init);
void FuzzFrameworkEmptyFun() {} inline void FuzzFrameworkEmptyFun() {}
#define FUZZ_TARGET(name) \ #define FUZZ_TARGET(name) \
FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun) FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun)

View file

@ -249,7 +249,7 @@ template <class T>
return result; return result;
} }
CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept inline CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
{ {
const Network network = fuzzed_data_provider.PickValueInArray({Network::NET_IPV4, Network::NET_IPV6, Network::NET_INTERNAL, Network::NET_ONION}); const Network network = fuzzed_data_provider.PickValueInArray({Network::NET_IPV4, Network::NET_IPV6, Network::NET_INTERNAL, Network::NET_ONION});
CNetAddr net_addr; CNetAddr net_addr;
@ -271,22 +271,22 @@ CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
return net_addr; return net_addr;
} }
CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept inline CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept
{ {
return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint8_t>()}; return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint8_t>()};
} }
CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept inline CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept
{ {
return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint16_t>()}; return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint16_t>()};
} }
CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept inline CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept
{ {
return {ConsumeService(fuzzed_data_provider), static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()), fuzzed_data_provider.ConsumeIntegral<uint32_t>()}; return {ConsumeService(fuzzed_data_provider), static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()), fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
} }
CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept inline CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept
{ {
const NodeId node_id = fuzzed_data_provider.ConsumeIntegral<NodeId>(); const NodeId node_id = fuzzed_data_provider.ConsumeIntegral<NodeId>();
const ServiceFlags local_services = static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()); const ServiceFlags local_services = static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
@ -302,7 +302,7 @@ CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept
return {node_id, local_services, my_starting_height, socket, address, keyed_net_group, local_host_nonce, addr_bind, addr_name, conn_type, inbound_onion}; return {node_id, local_services, my_starting_height, socket, address, keyed_net_group, local_host_nonce, addr_bind, addr_name, conn_type, inbound_onion};
} }
void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST) inline void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)
{ {
static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}}; static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}};
} }