From 5196ecb4850d62fd7117febcae5c5e3ebf3d77e6 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Mon, 8 Jun 2020 13:22:21 +0000
Subject: [PATCH] tests: Add InitializeFuzzingContext() for easy initialization
 of fuzzing context without debug logging (avoids writing to disk)

---
 src/test/fuzz/block.cpp                      | 4 ++--
 src/test/fuzz/cuckoocache.cpp                | 1 -
 src/test/fuzz/descriptor_parse.cpp           | 5 ++---
 src/test/fuzz/deserialize.cpp                | 4 ++--
 src/test/fuzz/eval_script.cpp                | 4 ++--
 src/test/fuzz/fuzz.cpp                       | 2 ++
 src/test/fuzz/hex.cpp                        | 4 ++--
 src/test/fuzz/integer.cpp                    | 3 +--
 src/test/fuzz/key.cpp                        | 6 ++----
 src/test/fuzz/key_io.cpp                     | 4 ++--
 src/test/fuzz/message.cpp                    | 4 +---
 src/test/fuzz/p2p_transport_deserializer.cpp | 4 ++--
 src/test/fuzz/parse_univalue.cpp             | 6 ++----
 src/test/fuzz/pow.cpp                        | 3 +--
 src/test/fuzz/psbt.cpp                       | 4 ++--
 src/test/fuzz/script.cpp                     | 4 +---
 src/test/fuzz/script_flags.cpp               | 4 ++--
 src/test/fuzz/signature_checker.cpp          | 4 ++--
 src/test/fuzz/transaction.cpp                | 5 ++---
 src/test/fuzz/util.h                         | 6 ++++++
 20 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/test/fuzz/block.cpp b/src/test/fuzz/block.cpp
index d4a76aacd00690..b3797def664252 100644
--- a/src/test/fuzz/block.cpp
+++ b/src/test/fuzz/block.cpp
@@ -11,7 +11,7 @@
 #include <pubkey.h>
 #include <streams.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <validation.h>
 #include <version.h>
 
@@ -20,7 +20,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/cuckoocache.cpp b/src/test/fuzz/cuckoocache.cpp
index 5b45aa79d8fa11..045e2c88ee8c4b 100644
--- a/src/test/fuzz/cuckoocache.cpp
+++ b/src/test/fuzz/cuckoocache.cpp
@@ -7,7 +7,6 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 
 #include <cstdint>
 #include <string>
diff --git a/src/test/fuzz/descriptor_parse.cpp b/src/test/fuzz/descriptor_parse.cpp
index 4a655841b85d9c..199eb1d69bf608 100644
--- a/src/test/fuzz/descriptor_parse.cpp
+++ b/src/test/fuzz/descriptor_parse.cpp
@@ -2,16 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <pubkey.h>
 #include <script/descriptor.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index af27b84443c175..ce459de36aab63 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -20,7 +20,7 @@
 #include <pubkey.h>
 #include <script/keyorigin.h>
 #include <streams.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <undo.h>
 #include <version.h>
 
@@ -35,7 +35,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 namespace {
diff --git a/src/test/fuzz/eval_script.cpp b/src/test/fuzz/eval_script.cpp
index 1f046d09812122..9d51a4d0e02964 100644
--- a/src/test/fuzz/eval_script.cpp
+++ b/src/test/fuzz/eval_script.cpp
@@ -6,14 +6,14 @@
 #include <script/interpreter.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 
 #include <limits>
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/fuzz.cpp b/src/test/fuzz/fuzz.cpp
index 82e1d55c0b6c82..2859f191982ce3 100644
--- a/src/test/fuzz/fuzz.cpp
+++ b/src/test/fuzz/fuzz.cpp
@@ -7,6 +7,8 @@
 #include <test/util/setup_common.h>
 
 #include <cstdint>
+#include <functional>
+#include <string>
 #include <unistd.h>
 #include <vector>
 
diff --git a/src/test/fuzz/hex.cpp b/src/test/fuzz/hex.cpp
index 5310caab49dbbe..aaa160b9a0062d 100644
--- a/src/test/fuzz/hex.cpp
+++ b/src/test/fuzz/hex.cpp
@@ -7,7 +7,7 @@
 #include <pubkey.h>
 #include <rpc/util.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <uint256.h>
 #include <univalue.h>
 #include <util/strencodings.h>
@@ -19,7 +19,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index 401443fd0986a0..5506c07e9fc86f 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -24,7 +24,6 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/moneystr.h>
@@ -43,7 +42,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/key.cpp b/src/test/fuzz/key.cpp
index e09d3cc75a8a3b..05e0fb969b8ec2 100644
--- a/src/test/fuzz/key.cpp
+++ b/src/test/fuzz/key.cpp
@@ -2,8 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
-#include <chainparamsbase.h>
 #include <key.h>
 #include <key_io.h>
 #include <outputtype.h>
@@ -17,7 +15,7 @@
 #include <script/standard.h>
 #include <streams.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 #include <util/strencodings.h>
 
@@ -29,7 +27,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/key_io.cpp b/src/test/fuzz/key_io.cpp
index 853af7b6ec2a8a..a6a83fdc921288 100644
--- a/src/test/fuzz/key_io.cpp
+++ b/src/test/fuzz/key_io.cpp
@@ -8,7 +8,7 @@
 #include <script/signingprovider.h>
 #include <script/standard.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 
 #include <cassert>
 #include <cstdint>
@@ -17,7 +17,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/message.cpp b/src/test/fuzz/message.cpp
index 3e255b4b2e8717..2f4c470e66f87d 100644
--- a/src/test/fuzz/message.cpp
+++ b/src/test/fuzz/message.cpp
@@ -2,12 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <key_io.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 #include <util/message.h>
 #include <util/strencodings.h>
 
@@ -19,7 +17,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/p2p_transport_deserializer.cpp b/src/test/fuzz/p2p_transport_deserializer.cpp
index cd970a833145f0..5735ab3a99d677 100644
--- a/src/test/fuzz/p2p_transport_deserializer.cpp
+++ b/src/test/fuzz/p2p_transport_deserializer.cpp
@@ -6,7 +6,7 @@
 #include <net.h>
 #include <protocol.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 
 #include <cassert>
 #include <cstdint>
@@ -15,7 +15,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/parse_univalue.cpp b/src/test/fuzz/parse_univalue.cpp
index 1b384b44448586..b175a1fe151048 100644
--- a/src/test/fuzz/parse_univalue.cpp
+++ b/src/test/fuzz/parse_univalue.cpp
@@ -2,14 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <core_io.h>
 #include <rpc/client.h>
 #include <rpc/util.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 #include <util/memory.h>
 
 #include <limits>
@@ -17,7 +15,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/pow.cpp b/src/test/fuzz/pow.cpp
index e790effa49ae39..2585441c0b93e6 100644
--- a/src/test/fuzz/pow.cpp
+++ b/src/test/fuzz/pow.cpp
@@ -9,7 +9,6 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 
 #include <cstdint>
 #include <optional>
@@ -18,7 +17,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/psbt.cpp b/src/test/fuzz/psbt.cpp
index 2c48c1d7f84e55..c624513450f0be 100644
--- a/src/test/fuzz/psbt.cpp
+++ b/src/test/fuzz/psbt.cpp
@@ -10,7 +10,7 @@
 #include <pubkey.h>
 #include <script/script.h>
 #include <streams.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 #include <version.h>
 
@@ -20,7 +20,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/script.cpp b/src/test/fuzz/script.cpp
index 99969eda7c5c1d..190bd6656d2cfd 100644
--- a/src/test/fuzz/script.cpp
+++ b/src/test/fuzz/script.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <compressor.h>
 #include <core_io.h>
 #include <core_memusage.h>
@@ -19,7 +18,6 @@
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
-#include <test/util/setup_common.h>
 #include <univalue.h>
 #include <util/memory.h>
 
@@ -32,7 +30,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/script_flags.cpp b/src/test/fuzz/script_flags.cpp
index 56973be65fbc5e..440c19830e0246 100644
--- a/src/test/fuzz/script_flags.cpp
+++ b/src/test/fuzz/script_flags.cpp
@@ -5,7 +5,7 @@
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <streams.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 #include <version.h>
 
@@ -16,7 +16,7 @@ static bool IsValidFlagCombination(unsigned flags);
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/signature_checker.cpp b/src/test/fuzz/signature_checker.cpp
index 84e44045b0648a..34f81ba20dd531 100644
--- a/src/test/fuzz/signature_checker.cpp
+++ b/src/test/fuzz/signature_checker.cpp
@@ -6,7 +6,7 @@
 #include <script/interpreter.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <util/memory.h>
 
 #include <cstdint>
@@ -16,7 +16,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup;
+    InitializeFuzzingContext(CBaseChainParams::MAIN);
 }
 
 namespace {
diff --git a/src/test/fuzz/transaction.cpp b/src/test/fuzz/transaction.cpp
index 63a851aafef71a..c8b60608244945 100644
--- a/src/test/fuzz/transaction.cpp
+++ b/src/test/fuzz/transaction.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <coins.h>
 #include <consensus/tx_check.h>
 #include <consensus/tx_verify.h>
@@ -14,7 +13,7 @@
 #include <primitives/transaction.h>
 #include <streams.h>
 #include <test/fuzz/fuzz.h>
-#include <test/util/setup_common.h>
+#include <test/fuzz/util.h>
 #include <univalue.h>
 #include <util/rbf.h>
 #include <validation.h>
@@ -24,7 +23,7 @@
 
 void initialize()
 {
-    static const BasicTestingSetup basic_testing_setup{CBaseChainParams::REGTEST};
+    InitializeFuzzingContext();
 }
 
 void test_one_input(const std::vector<uint8_t>& buffer)
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index f26878a704669e..98cb7474001333 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -17,6 +17,7 @@
 #include <streams.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
+#include <test/util/setup_common.h>
 #include <txmempool.h>
 #include <uint256.h>
 #include <version.h>
@@ -214,4 +215,9 @@ NODISCARD inline bool ContainsSpentInput(const CTransaction& tx, const CCoinsVie
     return false;
 }
 
+void InitializeFuzzingContext(const std::string& chain_name = CBaseChainParams::REGTEST)
+{
+    static const BasicTestingSetup basic_testing_setup{chain_name, {"-nodebuglogfile"}};
+}
+
 #endif // BITCOIN_TEST_FUZZ_UTIL_H