diff --git a/src/test/fuzz/CMakeLists.txt b/src/test/fuzz/CMakeLists.txt
index 3defde5e1..365e5da3d 100644
--- a/src/test/fuzz/CMakeLists.txt
+++ b/src/test/fuzz/CMakeLists.txt
@@ -1,222 +1,223 @@
 # Fuzzer test harness
 add_custom_target(bitcoin-fuzzers)
 
 define_property(GLOBAL
 	PROPERTY FUZZ_TARGETS
 	BRIEF_DOCS "List of fuzz targets"
 	FULL_DOCS "A list of the fuzz targets"
 )
 set_property(GLOBAL APPEND PROPERTY FUZZ_TARGETS bitcoin-fuzzers)
 
 include(InstallationHelper)
 macro(add_fuzz_target TARGET EXE_NAME)
 	add_executable(${TARGET} EXCLUDE_FROM_ALL
 		fuzz.cpp
 		${ARGN}
 	)
 	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${EXE_NAME})
 
 	target_link_libraries(${TARGET} server testutil rpcclient)
 	if(TARGET bitcoinconsensus-shared)
 		target_link_libraries(${TARGET} bitcoinconsensus-shared)
 	else()
 		target_link_libraries(${TARGET} bitcoinconsensus)
 	endif()
 
 	add_dependencies(bitcoin-fuzzers ${TARGET})
 
 	set_property(GLOBAL APPEND PROPERTY FUZZ_TARGETS ${TARGET})
 
 	install_target(${TARGET}
 		COMPONENT fuzzer
 		EXCLUDE_FROM_ALL
 	)
 endmacro()
 
 function(add_regular_fuzz_targets)
 	foreach(_fuzz_test_name ${ARGN})
 		sanitize_target_name("fuzz-" ${_fuzz_test_name} _fuzz_target_name)
 		add_fuzz_target(
 			${_fuzz_target_name}
 			${_fuzz_test_name}
 
 			# Sources
 			"${_fuzz_test_name}.cpp"
 		)
 	endforeach()
 endfunction()
 
 include(SanitizeHelper)
 function(add_deserialize_fuzz_targets)
 	foreach(_fuzz_test_name ${ARGN})
 		sanitize_target_name("fuzz-" ${_fuzz_test_name} _fuzz_target_name)
 		add_fuzz_target(
 			${_fuzz_target_name}
 			${_fuzz_test_name}
 
 			# Sources
 			deserialize.cpp
 		)
 
 		sanitize_c_cxx_definition("" ${_fuzz_test_name} _target_definition)
 		string(TOUPPER ${_target_definition} _target_definition)
 		target_compile_definitions(${_fuzz_target_name} PRIVATE ${_target_definition})
 	endforeach()
 endfunction()
 
 function(add_process_message_fuzz_targets)
 	foreach(_fuzz_test_name ${ARGN})
 		sanitize_target_name("fuzz-process_message_" ${_fuzz_test_name} _fuzz_target_name)
 		add_fuzz_target(
 			${_fuzz_target_name}
 			process_message_${_fuzz_test_name}
 
 			# Sources
 			process_message.cpp
 		)
 
 		target_compile_definitions(${_fuzz_target_name} PRIVATE MESSAGE_TYPE=${_fuzz_test_name})
 	endforeach()
 endfunction()
 
 add_regular_fuzz_targets(
 	addition_overflow
 	addrdb
 	asmap
 	asmap_direct
+	banman
 	base_encode_decode
 	block
 	block_header
 	blockfilter
 	bloom_filter
 	cashaddr
 	chain
 	checkqueue
 	coins_view
 	crypto
 	crypto_common
 	cuckoocache
 	descriptor_parse
 	eval_script
 	fee_rate
 	fees
 	flatfile
 	float
 	golomb_rice
 	hex
 	http_request
 	integer
 	key
 	key_io
 	kitchen_sink
 	locale
 	merkleblock
 	message
 	multiplication_overflow
 	net_permissions
 	netaddress
 	p2p_transport_deserializer
 	parse_hd_keypath
 	parse_iso8601
 	parse_numbers
 	parse_script
 	parse_univalue
 	prevector
 	pow
 	primitives_transaction
 	process_message
 	process_messages
 	protocol
 	psbt
 	random
 	rolling_bloom_filter
 	script
 	script_bitcoin_consensus
 	script_descriptor_cache
 	script_flags
 	script_interpreter
 	script_ops
 	script_sigcache
 	script_sign
 	scriptnum_ops
 	signature_checker
 	span
 	spanparsing
 	string
 	strprintf
 	system
 	timedata
 	transaction
 	tx_in
 	tx_out
 )
 
 add_deserialize_fuzz_targets(
 	addr_info_deserialize
 	address_deserialize
 	addrman_deserialize
 	banentry_deserialize
 	block_deserialize
 	block_file_info_deserialize
 	block_filter_deserialize
 	block_header_and_short_txids_deserialize
 	blockheader_deserialize
 	blocklocator_deserialize
 	blockmerkleroot
 	blocktransactions_deserialize
 	blocktransactionsrequest_deserialize
 	blockundo_deserialize
 	bloomfilter_deserialize
 	coins_deserialize
 	diskblockindex_deserialize
 	fee_rate_deserialize
 	flat_file_pos_deserialize
 	inv_deserialize
 	key_origin_info_deserialize
 	merkle_block_deserialize
 	messageheader_deserialize
 	netaddr_deserialize
 	out_point_deserialize
 	partial_merkle_tree_deserialize
 	partially_signed_transaction_deserialize
 	prefilled_transaction_deserialize
 	psbt_input_deserialize
 	psbt_output_deserialize
 	pub_key_deserialize
 	script_deserialize
 	service_deserialize
 	snapshotmetadata_deserialize
 	sub_net_deserialize
 	tx_in_deserialize
 	txoutcompressor_deserialize
 	txundo_deserialize
 	uint160_deserialize
 	uint256_deserialize
 )
 
 add_process_message_fuzz_targets(
 	addr
 	block
 	blocktxn
 	cmpctblock
 	feefilter
 	filteradd
 	filterclear
 	filterload
 	getaddr
 	getblocks
 	getblocktxn
 	getdata
 	getheaders
 	headers
 	inv
 	mempool
 	notfound
 	ping
 	pong
 	sendcmpct
 	sendheaders
 	tx
 	verack
 	version
 )
diff --git a/src/test/fuzz/banman.cpp b/src/test/fuzz/banman.cpp
new file mode 100644
index 000000000..56f1e6381
--- /dev/null
+++ b/src/test/fuzz/banman.cpp
@@ -0,0 +1,95 @@
+// Copyright (c) 2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <banman.h>
+#include <config.h>
+#include <fs.h>
+#include <netaddress.h>
+#include <util/system.h>
+
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+
+#include <cstdint>
+#include <limits>
+#include <string>
+#include <vector>
+
+namespace {
+int64_t
+ConsumeBanTimeOffset(FuzzedDataProvider &fuzzed_data_provider) noexcept {
+    // Avoid signed integer overflow by capping to int32_t max:
+    // banman.cpp:137:73: runtime error: signed integer overflow: 1591700817 +
+    // 9223372036854775807 cannot be represented in type 'long'
+    return fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(
+        std::numeric_limits<int64_t>::min(),
+        std::numeric_limits<int32_t>::max());
+}
+} // namespace
+
+void initialize() {
+    InitializeFuzzingContext();
+}
+
+void test_one_input(const std::vector<uint8_t> &buffer) {
+    FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    const fs::path banlist_file = GetDataDir() / "fuzzed_banlist.dat";
+    fs::remove(banlist_file);
+    const CChainParams &chainparams = GetConfig().GetChainParams();
+    {
+        BanMan ban_man{banlist_file, chainparams, nullptr,
+                       ConsumeBanTimeOffset(fuzzed_data_provider)};
+        while (fuzzed_data_provider.ConsumeBool()) {
+            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 11)) {
+                case 0: {
+                    ban_man.Ban(ConsumeNetAddr(fuzzed_data_provider),
+                                ConsumeBanTimeOffset(fuzzed_data_provider),
+                                fuzzed_data_provider.ConsumeBool());
+                    break;
+                }
+                case 1: {
+                    ban_man.Ban(ConsumeSubNet(fuzzed_data_provider),
+                                ConsumeBanTimeOffset(fuzzed_data_provider),
+                                fuzzed_data_provider.ConsumeBool());
+                    break;
+                }
+                case 2: {
+                    ban_man.ClearBanned();
+                    break;
+                }
+                case 4: {
+                    ban_man.IsBanned(ConsumeNetAddr(fuzzed_data_provider));
+                    break;
+                }
+                case 5: {
+                    ban_man.IsBanned(ConsumeSubNet(fuzzed_data_provider));
+                    break;
+                }
+                case 6: {
+                    ban_man.Unban(ConsumeNetAddr(fuzzed_data_provider));
+                    break;
+                }
+                case 7: {
+                    ban_man.Unban(ConsumeSubNet(fuzzed_data_provider));
+                    break;
+                }
+                case 8: {
+                    banmap_t banmap;
+                    ban_man.GetBanned(banmap);
+                    break;
+                }
+                case 9: {
+                    ban_man.DumpBanlist();
+                    break;
+                }
+                case 11: {
+                    ban_man.Discourage(ConsumeNetAddr(fuzzed_data_provider));
+                    break;
+                }
+            }
+        }
+    }
+    fs::remove(banlist_file);
+}
diff --git a/src/test/fuzz/netaddress.cpp b/src/test/fuzz/netaddress.cpp
index e5ed3df7a..a4cb3b887 100644
--- a/src/test/fuzz/netaddress.cpp
+++ b/src/test/fuzz/netaddress.cpp
@@ -1,148 +1,117 @@
 // Copyright (c) 2020 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <netaddress.h>
 
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
 
 #include <cassert>
 #include <cstdint>
 #include <netinet/in.h>
 #include <vector>
 
-namespace {
-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});
-    if (network == Network::NET_IPV4) {
-        const in_addr v4_addr = {
-            .s_addr = fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
-        return CNetAddr{v4_addr};
-    } else if (network == Network::NET_IPV6) {
-        if (fuzzed_data_provider.remaining_bytes() < 16) {
-            return CNetAddr{};
-        }
-        in6_addr v6_addr = {};
-        memcpy(v6_addr.s6_addr,
-               fuzzed_data_provider.ConsumeBytes<uint8_t>(16).data(), 16);
-        return CNetAddr{v6_addr,
-                        fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
-    } else if (network == Network::NET_INTERNAL) {
-        CNetAddr net_addr;
-        net_addr.SetInternal(fuzzed_data_provider.ConsumeBytesAsString(32));
-        return net_addr;
-    } else if (network == Network::NET_ONION) {
-        CNetAddr net_addr;
-        net_addr.SetSpecial(fuzzed_data_provider.ConsumeBytesAsString(32));
-        return net_addr;
-    } else {
-        assert(false);
-    }
-}
-}; // namespace
-
 void test_one_input(const std::vector<uint8_t> &buffer) {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
 
     const CNetAddr net_addr = ConsumeNetAddr(fuzzed_data_provider);
     for (int i = 0; i < 15; ++i) {
         (void)net_addr.GetByte(i);
     }
     (void)net_addr.GetHash();
     (void)net_addr.GetNetClass();
     if (net_addr.GetNetwork() == Network::NET_IPV4) {
         assert(net_addr.IsIPv4());
     }
     if (net_addr.GetNetwork() == Network::NET_IPV6) {
         assert(net_addr.IsIPv6());
     }
     if (net_addr.GetNetwork() == Network::NET_ONION) {
         assert(net_addr.IsTor());
     }
     if (net_addr.GetNetwork() == Network::NET_INTERNAL) {
         assert(net_addr.IsInternal());
     }
     if (net_addr.GetNetwork() == Network::NET_UNROUTABLE) {
         assert(!net_addr.IsRoutable());
     }
     (void)net_addr.IsBindAny();
     if (net_addr.IsInternal()) {
         assert(net_addr.GetNetwork() == Network::NET_INTERNAL);
     }
     if (net_addr.IsIPv4()) {
         assert(net_addr.GetNetwork() == Network::NET_IPV4 ||
                net_addr.GetNetwork() == Network::NET_UNROUTABLE);
     }
     if (net_addr.IsIPv6()) {
         assert(net_addr.GetNetwork() == Network::NET_IPV6 ||
                net_addr.GetNetwork() == Network::NET_UNROUTABLE);
     }
     (void)net_addr.IsLocal();
     if (net_addr.IsRFC1918() || net_addr.IsRFC2544() || net_addr.IsRFC6598() ||
         net_addr.IsRFC5737() || net_addr.IsRFC3927()) {
         assert(net_addr.IsIPv4());
     }
     (void)net_addr.IsRFC2544();
     if (net_addr.IsRFC3849() || net_addr.IsRFC3964() || net_addr.IsRFC4380() ||
         net_addr.IsRFC4843() || net_addr.IsRFC7343() || net_addr.IsRFC4862() ||
         net_addr.IsRFC6052() || net_addr.IsRFC6145()) {
         assert(net_addr.IsIPv6());
     }
     (void)net_addr.IsRFC3927();
     (void)net_addr.IsRFC3964();
     if (net_addr.IsRFC4193()) {
         assert(net_addr.GetNetwork() == Network::NET_ONION ||
                net_addr.GetNetwork() == Network::NET_INTERNAL ||
                net_addr.GetNetwork() == Network::NET_UNROUTABLE);
     }
     (void)net_addr.IsRFC4380();
     (void)net_addr.IsRFC4843();
     (void)net_addr.IsRFC4862();
     (void)net_addr.IsRFC5737();
     (void)net_addr.IsRFC6052();
     (void)net_addr.IsRFC6145();
     (void)net_addr.IsRFC6598();
     (void)net_addr.IsRFC7343();
     if (!net_addr.IsRoutable()) {
         assert(net_addr.GetNetwork() == Network::NET_UNROUTABLE ||
                net_addr.GetNetwork() == Network::NET_INTERNAL);
     }
     if (net_addr.IsTor()) {
         assert(net_addr.GetNetwork() == Network::NET_ONION);
     }
     (void)net_addr.IsValid();
     (void)net_addr.ToString();
     (void)net_addr.ToStringIP();
 
     const CSubNet sub_net{net_addr,
                           fuzzed_data_provider.ConsumeIntegral<int32_t>()};
     (void)sub_net.IsValid();
     (void)sub_net.ToString();
 
     const CService service{net_addr,
                            fuzzed_data_provider.ConsumeIntegral<uint16_t>()};
     (void)service.GetKey();
     (void)service.GetPort();
     (void)service.ToString();
     (void)service.ToStringIPPort();
     (void)service.ToStringPort();
 
     const CNetAddr other_net_addr = ConsumeNetAddr(fuzzed_data_provider);
     (void)net_addr.GetReachabilityFrom(&other_net_addr);
     (void)sub_net.Match(other_net_addr);
 
     const CService other_service{
         net_addr, fuzzed_data_provider.ConsumeIntegral<uint16_t>()};
     assert((service == other_service) != (service != other_service));
     (void)(service < other_service);
 
     const CSubNet sub_net_copy_1{net_addr, other_net_addr};
     const CSubNet sub_net_copy_2{net_addr};
 
     CNetAddr mutable_net_addr;
     mutable_net_addr.SetIP(net_addr);
     assert(net_addr == mutable_net_addr);
 }
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 0b25b77a4..d8dd7a7a7 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -1,223 +1,262 @@
 // Copyright (c) 2009-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_TEST_FUZZ_UTIL_H
 #define BITCOIN_TEST_FUZZ_UTIL_H
 
 #include <amount.h>
 #include <arith_uint256.h>
 #include <attributes.h>
+#include <chainparamsbase.h>
 #include <coins.h>
+#include <netbase.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
 #include <version.h>
 
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
+#include <test/util/setup_common.h>
 
 #include <algorithm>
 #include <cstdint>
 #include <string>
 #include <vector>
 
 namespace fuzzer {
 // FIXME find a better way to avoid duplicating the MAX_MONEY definition
 constexpr int64_t MAX_MONEY_AS_INT = int64_t(21000000) * int64_t(100000000);
 } // end namespace fuzzer
 
 using namespace fuzzer;
 
 NODISCARD inline std::vector<uint8_t>
 ConsumeRandomLengthByteVector(FuzzedDataProvider &fuzzed_data_provider,
                               const size_t max_length = 4096) noexcept {
     const std::string s =
         fuzzed_data_provider.ConsumeRandomLengthString(max_length);
     return {s.begin(), s.end()};
 }
 
 NODISCARD inline CDataStream
 ConsumeDataStream(FuzzedDataProvider &fuzzed_data_provider,
                   const size_t max_length = 4096) noexcept {
     return {ConsumeRandomLengthByteVector(fuzzed_data_provider, max_length),
             SER_NETWORK, INIT_PROTO_VERSION};
 }
 
 NODISCARD inline std::vector<std::string>
 ConsumeRandomLengthStringVector(FuzzedDataProvider &fuzzed_data_provider,
                                 const size_t max_vector_size = 16,
                                 const size_t max_string_length = 16) noexcept {
     const size_t n_elements =
         fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, max_vector_size);
     std::vector<std::string> r;
     for (size_t i = 0; i < n_elements; ++i) {
         r.push_back(
             fuzzed_data_provider.ConsumeRandomLengthString(max_string_length));
     }
     return r;
 }
 
 template <typename T>
 NODISCARD inline std::vector<T>
 ConsumeRandomLengthIntegralVector(FuzzedDataProvider &fuzzed_data_provider,
                                   const size_t max_vector_size = 16) noexcept {
     const size_t n_elements =
         fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, max_vector_size);
     std::vector<T> r;
     for (size_t i = 0; i < n_elements; ++i) {
         r.push_back(fuzzed_data_provider.ConsumeIntegral<T>());
     }
     return r;
 }
 
 template <typename T>
 NODISCARD inline std::optional<T>
 ConsumeDeserializable(FuzzedDataProvider &fuzzed_data_provider,
                       const size_t max_length = 4096) noexcept {
     const std::vector<uint8_t> buffer =
         ConsumeRandomLengthByteVector(fuzzed_data_provider, max_length);
     CDataStream ds{buffer, SER_NETWORK, INIT_PROTO_VERSION};
     T obj;
     try {
         ds >> obj;
     } catch (const std::ios_base::failure &) {
         return std::nullopt;
     }
     return obj;
 }
 
 NODISCARD inline opcodetype
 ConsumeOpcodeType(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     return static_cast<opcodetype>(
         fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(0, MAX_OPCODE));
 }
 
 NODISCARD inline Amount
 ConsumeMoney(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     return fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(
                0, MAX_MONEY_AS_INT) *
            SATOSHI;
 }
 
 NODISCARD inline CScript
 ConsumeScript(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     const std::vector<uint8_t> b =
         ConsumeRandomLengthByteVector(fuzzed_data_provider);
     return {b.begin(), b.end()};
 }
 
 NODISCARD inline CScriptNum
 ConsumeScriptNum(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     return CScriptNum{fuzzed_data_provider.ConsumeIntegral<int64_t>()};
 }
 
 NODISCARD inline uint160
 ConsumeUInt160(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     const std::vector<uint8_t> v160 =
         fuzzed_data_provider.ConsumeBytes<uint8_t>(160 / 8);
     if (v160.size() != 160 / 8) {
         return {};
     }
     return uint160{v160};
 }
 
 NODISCARD inline uint256
 ConsumeUInt256(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     const std::vector<uint8_t> v256 =
         fuzzed_data_provider.ConsumeBytes<uint8_t>(256 / 8);
     if (v256.size() != 256 / 8) {
         return {};
     }
     return uint256{v256};
 }
 
 NODISCARD inline arith_uint256
 ConsumeArithUInt256(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     return UintToArith256(ConsumeUInt256(fuzzed_data_provider));
 }
 
 NODISCARD inline CTxDestination
 ConsumeTxDestination(FuzzedDataProvider &fuzzed_data_provider) noexcept {
     CTxDestination tx_destination;
     switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 3)) {
         case 0: {
             tx_destination = CNoDestination{};
             break;
         }
         case 1: {
             tx_destination = PKHash{ConsumeUInt160(fuzzed_data_provider)};
             break;
         }
         case 2: {
             tx_destination = ScriptHash{ConsumeUInt160(fuzzed_data_provider)};
             break;
         }
     }
     return tx_destination;
 }
 
 template <typename T>
 NODISCARD bool MultiplicationOverflow(const T i, const T j) noexcept {
     static_assert(std::is_integral<T>::value, "Integral required.");
     if (std::numeric_limits<T>::is_signed) {
         if (i > 0) {
             if (j > 0) {
                 return i > (std::numeric_limits<T>::max() / j);
             } else {
                 return j < (std::numeric_limits<T>::min() / i);
             }
         } else {
             if (j > 0) {
                 return i < (std::numeric_limits<T>::min() / j);
             } else {
                 return i != 0 && (j < (std::numeric_limits<T>::max() / i));
             }
         }
     } else {
         return j != 0 && i > std::numeric_limits<T>::max() / j;
     }
 }
 
 template <class T>
 NODISCARD bool AdditionOverflow(const T i, const T j) noexcept {
     static_assert(std::is_integral<T>::value, "Integral required.");
     if (std::numeric_limits<T>::is_signed) {
         return (i > 0 && j > std::numeric_limits<T>::max() - i) ||
                (i < 0 && j < std::numeric_limits<T>::min() - i);
     }
     return std::numeric_limits<T>::max() - i < j;
 }
 
 NODISCARD inline bool
 ContainsSpentInput(const CTransaction &tx,
                    const CCoinsViewCache &inputs) noexcept {
     for (const CTxIn &tx_in : tx.vin) {
         const Coin &coin = inputs.AccessCoin(tx_in.prevout);
         if (coin.IsSpent()) {
             return true;
         }
     }
     return false;
 }
 
 /**
  * Returns a byte vector of specified size regardless of the number of remaining
  * bytes available from the fuzzer. Pads with zero value bytes if needed to
  * achieve the specified size.
  */
 NODISCARD inline std::vector<uint8_t>
 ConsumeFixedLengthByteVector(FuzzedDataProvider &fuzzed_data_provider,
                              const size_t length) noexcept {
     std::vector<uint8_t> result(length);
     const std::vector<uint8_t> random_bytes =
         fuzzed_data_provider.ConsumeBytes<uint8_t>(length);
     if (!random_bytes.empty()) {
         std::memcpy(result.data(), random_bytes.data(), random_bytes.size());
     }
     return result;
 }
 
+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;
+    if (network == Network::NET_IPV4) {
+        const in_addr v4_addr = {
+            .s_addr = fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
+        net_addr = CNetAddr{v4_addr};
+    } else if (network == Network::NET_IPV6) {
+        if (fuzzed_data_provider.remaining_bytes() >= 16) {
+            in6_addr v6_addr = {};
+            memcpy(v6_addr.s6_addr,
+                   fuzzed_data_provider.ConsumeBytes<uint8_t>(16).data(), 16);
+            net_addr = CNetAddr{
+                v6_addr, fuzzed_data_provider.ConsumeIntegral<uint32_t>()};
+        }
+    } else if (network == Network::NET_INTERNAL) {
+        net_addr.SetInternal(fuzzed_data_provider.ConsumeBytesAsString(32));
+    } else if (network == Network::NET_ONION) {
+        net_addr.SetSpecial(fuzzed_data_provider.ConsumeBytesAsString(32));
+    }
+    return net_addr;
+}
+
+CSubNet ConsumeSubNet(FuzzedDataProvider &fuzzed_data_provider) noexcept {
+    return {ConsumeNetAddr(fuzzed_data_provider),
+            fuzzed_data_provider.ConsumeIntegral<int32_t>()};
+}
+
+void InitializeFuzzingContext(
+    const std::string &chain_name = CBaseChainParams::REGTEST) {
+    static const BasicTestingSetup basic_testing_setup{chain_name,
+                                                       {"-nodebuglogfile"}};
+}
+
 #endif // BITCOIN_TEST_FUZZ_UTIL_H