Skip to content

Commit 5196ecb

Browse files
practicalswiftpracticalswift
committed
tests: Add InitializeFuzzingContext() for easy initialization of fuzzing context without debug logging (avoids writing to disk)
1 parent 9a1c554 commit 5196ecb

20 files changed

+38
-43
lines changed

‎src/test/fuzz/block.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <pubkey.h>
1212
#include <streams.h>
1313
#include <test/fuzz/fuzz.h>
14-
#include <test/util/setup_common.h>
14+
#include <test/fuzz/util.h>
1515
#include <validation.h>
1616
#include <version.h>
1717

@@ -20,7 +20,7 @@
2020

2121
void initialize()
2222
{
23-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
23+
InitializeFuzzingContext();
2424
}
2525

2626
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/cuckoocache.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <test/fuzz/FuzzedDataProvider.h>
88
#include <test/fuzz/fuzz.h>
99
#include <test/fuzz/util.h>
10-
#include <test/util/setup_common.h>
1110

1211
#include <cstdint>
1312
#include <string>

‎src/test/fuzz/descriptor_parse.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
65
#include <pubkey.h>
76
#include <script/descriptor.h>
87
#include <test/fuzz/fuzz.h>
9-
#include <test/util/setup_common.h>
8+
#include <test/fuzz/util.h>
109
#include <util/memory.h>
1110

1211
void initialize()
1312
{
14-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
13+
InitializeFuzzingContext();
1514
}
1615

1716
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/deserialize.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <pubkey.h>
2121
#include <script/keyorigin.h>
2222
#include <streams.h>
23-
#include <test/util/setup_common.h>
23+
#include <test/fuzz/util.h>
2424
#include <undo.h>
2525
#include <version.h>
2626

@@ -35,7 +35,7 @@
3535

3636
void initialize()
3737
{
38-
static const BasicTestingSetup basic_testing_setup;
38+
InitializeFuzzingContext(CBaseChainParams::MAIN);
3939
}
4040

4141
namespace {

‎src/test/fuzz/eval_script.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
#include <script/interpreter.h>
77
#include <test/fuzz/FuzzedDataProvider.h>
88
#include <test/fuzz/fuzz.h>
9-
#include <test/util/setup_common.h>
9+
#include <test/fuzz/util.h>
1010
#include <util/memory.h>
1111

1212
#include <limits>
1313

1414
void initialize()
1515
{
16-
static const BasicTestingSetup basic_testing_setup;
16+
InitializeFuzzingContext(CBaseChainParams::MAIN);
1717
}
1818

1919
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/fuzz.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <test/util/setup_common.h>
88

99
#include <cstdint>
10+
#include <functional>
11+
#include <string>
1012
#include <unistd.h>
1113
#include <vector>
1214

‎src/test/fuzz/hex.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <pubkey.h>
88
#include <rpc/util.h>
99
#include <test/fuzz/fuzz.h>
10-
#include <test/util/setup_common.h>
10+
#include <test/fuzz/util.h>
1111
#include <uint256.h>
1212
#include <univalue.h>
1313
#include <util/strencodings.h>
@@ -19,7 +19,7 @@
1919

2020
void initialize()
2121
{
22-
static const BasicTestingSetup basic_testing_setup;
22+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2323
}
2424

2525
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/integer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <test/fuzz/FuzzedDataProvider.h>
2525
#include <test/fuzz/fuzz.h>
2626
#include <test/fuzz/util.h>
27-
#include <test/util/setup_common.h>
2827
#include <uint256.h>
2928
#include <util/check.h>
3029
#include <util/moneystr.h>
@@ -43,7 +42,7 @@
4342

4443
void initialize()
4544
{
46-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
45+
InitializeFuzzingContext();
4746
}
4847

4948
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/key.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
6-
#include <chainparamsbase.h>
75
#include <key.h>
86
#include <key_io.h>
97
#include <outputtype.h>
@@ -17,7 +15,7 @@
1715
#include <script/standard.h>
1816
#include <streams.h>
1917
#include <test/fuzz/fuzz.h>
20-
#include <test/util/setup_common.h>
18+
#include <test/fuzz/util.h>
2119
#include <util/memory.h>
2220
#include <util/strencodings.h>
2321

@@ -29,7 +27,7 @@
2927

3028
void initialize()
3129
{
32-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
30+
InitializeFuzzingContext();
3331
}
3432

3533
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/key_io.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <script/signingprovider.h>
99
#include <script/standard.h>
1010
#include <test/fuzz/fuzz.h>
11-
#include <test/util/setup_common.h>
11+
#include <test/fuzz/util.h>
1212

1313
#include <cassert>
1414
#include <cstdint>
@@ -17,7 +17,7 @@
1717

1818
void initialize()
1919
{
20-
static const BasicTestingSetup basic_testing_setup;
20+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2121
}
2222

2323
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/message.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
65
#include <key_io.h>
76
#include <test/fuzz/FuzzedDataProvider.h>
87
#include <test/fuzz/fuzz.h>
98
#include <test/fuzz/util.h>
10-
#include <test/util/setup_common.h>
119
#include <util/message.h>
1210
#include <util/strencodings.h>
1311

@@ -19,7 +17,7 @@
1917

2018
void initialize()
2119
{
22-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
20+
InitializeFuzzingContext();
2321
}
2422

2523
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/p2p_transport_deserializer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <net.h>
77
#include <protocol.h>
88
#include <test/fuzz/fuzz.h>
9-
#include <test/util/setup_common.h>
9+
#include <test/fuzz/util.h>
1010

1111
#include <cassert>
1212
#include <cstdint>
@@ -15,7 +15,7 @@
1515

1616
void initialize()
1717
{
18-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
18+
InitializeFuzzingContext();
1919
}
2020

2121
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/parse_univalue.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
65
#include <core_io.h>
76
#include <rpc/client.h>
87
#include <rpc/util.h>
9-
#include <test/fuzz/fuzz.h>
108
#include <test/fuzz/FuzzedDataProvider.h>
9+
#include <test/fuzz/fuzz.h>
1110
#include <test/fuzz/util.h>
12-
#include <test/util/setup_common.h>
1311
#include <util/memory.h>
1412

1513
#include <limits>
1614
#include <string>
1715

1816
void initialize()
1917
{
20-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
18+
InitializeFuzzingContext();
2119
}
2220

2321
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/pow.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <test/fuzz/FuzzedDataProvider.h>
1010
#include <test/fuzz/fuzz.h>
1111
#include <test/fuzz/util.h>
12-
#include <test/util/setup_common.h>
1312

1413
#include <cstdint>
1514
#include <optional>
@@ -18,7 +17,7 @@
1817

1918
void initialize()
2019
{
21-
static const BasicTestingSetup basic_testing_setup;
20+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2221
}
2322

2423
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/psbt.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <pubkey.h>
1111
#include <script/script.h>
1212
#include <streams.h>
13-
#include <test/util/setup_common.h>
13+
#include <test/fuzz/util.h>
1414
#include <util/memory.h>
1515
#include <version.h>
1616

@@ -20,7 +20,7 @@
2020

2121
void initialize()
2222
{
23-
static const BasicTestingSetup basic_testing_setup;
23+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2424
}
2525

2626
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/script.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
65
#include <compressor.h>
76
#include <core_io.h>
87
#include <core_memusage.h>
@@ -19,7 +18,6 @@
1918
#include <test/fuzz/FuzzedDataProvider.h>
2019
#include <test/fuzz/fuzz.h>
2120
#include <test/fuzz/util.h>
22-
#include <test/util/setup_common.h>
2321
#include <univalue.h>
2422
#include <util/memory.h>
2523

@@ -32,7 +30,7 @@
3230

3331
void initialize()
3432
{
35-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
33+
InitializeFuzzingContext();
3634
}
3735

3836
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/script_flags.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <pubkey.h>
66
#include <script/interpreter.h>
77
#include <streams.h>
8-
#include <test/util/setup_common.h>
8+
#include <test/fuzz/util.h>
99
#include <util/memory.h>
1010
#include <version.h>
1111

@@ -16,7 +16,7 @@ static bool IsValidFlagCombination(unsigned flags);
1616

1717
void initialize()
1818
{
19-
static const BasicTestingSetup basic_testing_setup;
19+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2020
}
2121

2222
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/signature_checker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <script/interpreter.h>
77
#include <test/fuzz/FuzzedDataProvider.h>
88
#include <test/fuzz/fuzz.h>
9-
#include <test/util/setup_common.h>
9+
#include <test/fuzz/util.h>
1010
#include <util/memory.h>
1111

1212
#include <cstdint>
@@ -16,7 +16,7 @@
1616

1717
void initialize()
1818
{
19-
static const BasicTestingSetup basic_testing_setup;
19+
InitializeFuzzingContext(CBaseChainParams::MAIN);
2020
}
2121

2222
namespace {

‎src/test/fuzz/transaction.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <chainparams.h>
65
#include <coins.h>
76
#include <consensus/tx_check.h>
87
#include <consensus/tx_verify.h>
@@ -14,7 +13,7 @@
1413
#include <primitives/transaction.h>
1514
#include <streams.h>
1615
#include <test/fuzz/fuzz.h>
17-
#include <test/util/setup_common.h>
16+
#include <test/fuzz/util.h>
1817
#include <univalue.h>
1918
#include <util/rbf.h>
2019
#include <validation.h>
@@ -24,7 +23,7 @@
2423

2524
void initialize()
2625
{
27-
static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
26+
InitializeFuzzingContext();
2827
}
2928

3029
void test_one_input(const std::vector<uint8_t>& buffer)

‎src/test/fuzz/util.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <streams.h>
1818
#include <test/fuzz/FuzzedDataProvider.h>
1919
#include <test/fuzz/fuzz.h>
20+
#include <test/util/setup_common.h>
2021
#include <txmempool.h>
2122
#include <uint256.h>
2223
#include <version.h>
@@ -214,4 +215,9 @@ NODISCARD inline bool ContainsSpentInput(const CTransaction& tx, const CCoinsVie
214215
return false;
215216
}
216217

218+
void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)
219+
{
220+
static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}};
221+
}
222+
217223
#endif // BITCOIN_TEST_FUZZ_UTIL_H

0 commit comments

Comments
 (0)