Skip to content

Commit e9efb64

Browse files
author
MarcoFalke
committed
Merge #20733: inline non-member functions with body in fuzzing headers
d8b9cec inline non-member functions with body in fuzzing headers (Patrick Strateman) Pull request description: Resolves the issue noted [here](bitcoin/bitcoin#20560 (comment)) ACKs for top commit: MarcoFalke: ACK d8b9cec Tree-SHA512: fb34707e2d2c5b664d4160e0e4b56e3df9fb2c9045da6ddea7139e0b4982262c4e085812a8543a6221febc9cd0815423b8287fec66baae3236e5f3339cc9df8c
2 parents f1dbf92 + d8b9cec commit e9efb64

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/test/fuzz/fuzz.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ using TypeInitialize = std::function<void()>;
1515

1616
void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init);
1717

18-
void FuzzFrameworkEmptyFun() {}
18+
inline void FuzzFrameworkEmptyFun() {}
1919

2020
#define FUZZ_TARGET(name) \
2121
FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun)

src/test/fuzz/util.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ template <class T>
249249
return result;
250250
}
251251

252-
CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
252+
inline CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
253253
{
254254
const Network network = fuzzed_data_provider.PickValueInArray({Network::NET_IPV4, Network::NET_IPV6, Network::NET_INTERNAL, Network::NET_ONION});
255255
CNetAddr net_addr;
@@ -271,22 +271,22 @@ CNetAddr ConsumeNetAddr(FuzzedDataProvider& fuzzed_data_provider) noexcept
271271
return net_addr;
272272
}
273273

274-
CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept
274+
inline CSubNet ConsumeSubNet(FuzzedDataProvider& fuzzed_data_provider) noexcept
275275
{
276276
return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint8_t>()};
277277
}
278278

279-
CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept
279+
inline CService ConsumeService(FuzzedDataProvider& fuzzed_data_provider) noexcept
280280
{
281281
return {ConsumeNetAddr(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<uint16_t>()};
282282
}
283283

284-
CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept
284+
inline CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept
285285
{
286286
return {ConsumeService(fuzzed_data_provider), static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()), fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
287287
}
288288

289-
CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept
289+
inline CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept
290290
{
291291
const NodeId node_id = fuzzed_data_provider.ConsumeIntegral<NodeId>();
292292
const ServiceFlags local_services = static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
@@ -302,7 +302,7 @@ CNode ConsumeNode(FuzzedDataProvider& fuzzed_data_provider) noexcept
302302
return {node_id, local_services, my_starting_height, socket, address, keyed_net_group, local_host_nonce, addr_bind, addr_name, conn_type, inbound_onion};
303303
}
304304

305-
void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)
305+
inline void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)
306306
{
307307
static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}};
308308
}

0 commit comments

Comments
 (0)