Skip to content

Commit fa6dfaa

Browse files
author
MarcoFalke
committed
scripted-diff: Use new FUZZ_TARGET macro everywhere
-BEGIN VERIFY SCRIPT- ren() { sed --regexp-extended -i "s|$1|$2|g" $(git grep -l --extended-regexp "$1"); } # Replace FUZZ_TARGET_INIT ren 'FUZZ_TARGET_INIT\((.+), (.+)\)' 'FUZZ_TARGET(\1, .init = \2)' # Delete unused FUZZ_TARGET_INIT sed -i -e '37,39d' src/test/fuzz/fuzz.h -END VERIFY SCRIPT-
1 parent fa36ad8 commit fa6dfaa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+54
-57
lines changed

src/test/fuzz/addrman.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void initialize_addrman()
4646
return NetGroupManager(asmap);
4747
}
4848

49-
FUZZ_TARGET_INIT(data_stream_addr_man, initialize_addrman)
49+
FUZZ_TARGET(data_stream_addr_man, .init = initialize_addrman)
5050
{
5151
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
5252
CDataStream data_stream = ConsumeDataStream(fuzzed_data_provider);
@@ -233,7 +233,7 @@ class AddrManDeterministic : public AddrMan
233233
}
234234
};
235235

236-
FUZZ_TARGET_INIT(addrman, initialize_addrman)
236+
FUZZ_TARGET(addrman, .init = initialize_addrman)
237237
{
238238
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
239239
SetMockTime(ConsumeTime(fuzzed_data_provider));
@@ -311,7 +311,7 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman)
311311
}
312312

313313
// Check that serialize followed by unserialize produces the same addrman.
314-
FUZZ_TARGET_INIT(addrman_serdeser, initialize_addrman)
314+
FUZZ_TARGET(addrman_serdeser, .init = initialize_addrman)
315315
{
316316
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
317317
SetMockTime(ConsumeTime(fuzzed_data_provider));

src/test/fuzz/banman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static bool operator==(const CBanEntry& lhs, const CBanEntry& rhs)
4040
lhs.nBanUntil == rhs.nBanUntil;
4141
}
4242

43-
FUZZ_TARGET_INIT(banman, initialize_banman)
43+
FUZZ_TARGET(banman, .init = initialize_banman)
4444
{
4545
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
4646
SetMockTime(ConsumeTime(fuzzed_data_provider));

src/test/fuzz/bitdeque.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void InitRandData()
3131

3232
} // namespace
3333

34-
FUZZ_TARGET_INIT(bitdeque, InitRandData)
34+
FUZZ_TARGET(bitdeque, .init = InitRandData)
3535
{
3636
FuzzedDataProvider provider(buffer.data(), buffer.size());
3737
FastRandomContext ctx(true);

src/test/fuzz/block.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void initialize_block()
2323
SelectParams(ChainType::REGTEST);
2424
}
2525

26-
FUZZ_TARGET_INIT(block, initialize_block)
26+
FUZZ_TARGET(block, .init = initialize_block)
2727
{
2828
CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION);
2929
CBlock block;

src/test/fuzz/coins_view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void initialize_coins_view()
4141
g_setup = testing_setup.get();
4242
}
4343

44-
FUZZ_TARGET_INIT(coins_view, initialize_coins_view)
44+
FUZZ_TARGET(coins_view, .init = initialize_coins_view)
4545
{
4646
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
4747
CCoinsView backend_coins_view;

src/test/fuzz/connman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void initialize_connman()
2828
g_setup = testing_setup.get();
2929
}
3030

31-
FUZZ_TARGET_INIT(connman, initialize_connman)
31+
FUZZ_TARGET(connman, .init = initialize_connman)
3232
{
3333
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
3434
SetMockTime(ConsumeTime(fuzzed_data_provider));

src/test/fuzz/descriptor_parse.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void initialize_descriptor_parse()
1414
SelectParams(ChainType::MAIN);
1515
}
1616

17-
FUZZ_TARGET_INIT(descriptor_parse, initialize_descriptor_parse)
17+
FUZZ_TARGET(descriptor_parse, .init = initialize_descriptor_parse)
1818
{
1919
const std::string descriptor(buffer.begin(), buffer.end());
2020
FlatSigningProvider signing_provider;

src/test/fuzz/deserialize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void initialize_deserialize()
4949
}
5050

5151
#define FUZZ_TARGET_DESERIALIZE(name, code) \
52-
FUZZ_TARGET_INIT(name, initialize_deserialize) \
52+
FUZZ_TARGET(name, .init = initialize_deserialize) \
5353
{ \
5454
try { \
5555
code \

src/test/fuzz/fuzz.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target,
3434
#define FUZZ_TARGET(...) DETAIL_FUZZ(__VA_ARGS__)
3535
#endif
3636

37-
#define FUZZ_TARGET_INIT(name, init_fun) \
38-
FUZZ_TARGET(name, .init = init_fun)
39-
4037
#define DETAIL_FUZZ(name, ...) \
4138
void name##_fuzz_target(FuzzBufferType); \
4239
struct name##_Before_Main { \

src/test/fuzz/headerssync.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class FuzzedHeadersSyncState : public HeadersSyncState
4646
}
4747
};
4848

49-
FUZZ_TARGET_INIT(headers_sync_state, initialize_headers_sync_state_fuzz)
49+
FUZZ_TARGET(headers_sync_state, .init = initialize_headers_sync_state_fuzz)
5050
{
5151
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
5252
auto mock_time{ConsumeTime(fuzzed_data_provider)};

0 commit comments

Comments
 (0)