inline non-member functions with body in fuzzing headers

pstratem · pstratem · commit d8b9cec25b1d · 2020-12-20T18:19:43.000-05:00
diff --git a/src/test/fuzz/fuzz.h b/src/test/fuzz/fuzz.h
@@ -15,7 +15,7 @@ using TypeInitialize = std::function<void()>;
 
 void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init);
 
-void FuzzFrameworkEmptyFun() {}
+inline void FuzzFrameworkEmptyFun() {}
 
 #define FUZZ_TARGET(name) \
     FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun)
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
@@ -249,7 +249,7 @@ template <class T>
     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});
     CNetAddr net_addr;
@@ -271,22 +271,22 @@ CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
     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>()};
 }
 
-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>()};
 }
 
-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>()};
 }
 
-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 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};
 }
 
-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"}};
 }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ template <class T>`
`249`	`249`	`return result;`
`250`	`250`	`}`
`251`	`251`
`252`		`-CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept`
	`252`	`+inline CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`253`	`253`	`{`
`254`	`254`	`const Network network = fuzzed_data_provider.PickValueInArray({Network::NET_IPV4, Network::NET_IPV6, Network::NET_INTERNAL, Network::NET_ONION});`
`255`	`255`	`CNetAddr net_addr;`
`@@ -271,22 +271,22 @@ CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`271`	`271`	`return net_addr;`
`272`	`272`	`}`
`273`	`273`
`274`		`-CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept`
	`274`	`+inline CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`275`	`275`	`{`
`276`	`276`	`return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint8_t>()};`
`277`	`277`	`}`
`278`	`278`
`279`		`-CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept`
	`279`	`+inline CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`280`	`280`	`{`
`281`	`281`	`return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint16_t>()};`
`282`	`282`	`}`
`283`	`283`
`284`		`-CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept`
	`284`	`+inline CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`285`	`285`	`{`
`286`	`286`	`return {ConsumeService(fuzzed_data_provider), static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()), fuzzed_data_provider.ConsumeIntegral<uint32_t>()};`
`287`	`287`	`}`
`288`	`288`
`289`		`-CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept`
	`289`	`+inline CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`290`	`290`	`{`
`291`	`291`	`const NodeId node_id = fuzzed_data_provider.ConsumeIntegral<NodeId>();`
`292`	`292`	`const ServiceFlags local_services = static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>());`
`@@ -302,7 +302,7 @@ CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept`
`302`	`302`	`return {node_id, local_services, my_starting_height, socket, address, keyed_net_group, local_host_nonce, addr_bind, addr_name, conn_type, inbound_onion};`
`303`	`303`	`}`
`304`	`304`
`305`		`-void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)`
	`305`	`+inline void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)`
`306`	`306`	`{`
`307`	`307`	`static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}};`
`308`	`308`	`}`