aboutsummaryrefslogtreecommitdiff
path: root/src/test/fuzz
diff options
context:
space:
mode:
authorRyan Ofsky <ryan@ofsky.org>2023-11-30 11:03:18 -0500
committerRyan Ofsky <ryan@ofsky.org>2023-11-30 11:11:51 -0500
commitffb021612b8f581cbbaffacc80922d1bc5683706 (patch)
tree279b796a909357b685576857726cc1b8f27acb9b /src/test/fuzz
parentcdb772313c037fd71c7dff6f0801a4de93cf0d26 (diff)
parentfa98a097a30bc39f2424c0efd28a7979155faae6 (diff)
Merge bitcoin/bitcoin#28451: refactor: Remove unused SER_DISK, SER_NETWORK, CDataStream
fa98a097a30bc39f2424c0efd28a7979155faae6 Rename version.h to node/protocol_version.h (MarcoFalke) fa4fbd58169a244c14017c62218e443b18a868ef Remove unused version.h include (MarcoFalke) fa0ae22ff2c608c94b26c85040c4a1c7e9f7cf90 Remove unused SER_NETWORK, SER_DISK (MarcoFalke) fae00fe9c25af80024adda33d9077962964269ea Remove unused CDataStream (MarcoFalke) fa7eb4f5c3d2438f9689cd46b22dcfd50f6bd751 fuzz: Drop unused version from fuzz input format (MarcoFalke) Pull request description: Seems odd to have code that is completely dead. Fix this by removing all of it. ACKs for top commit: sipa: utACK fa98a097a30bc39f2424c0efd28a7979155faae6 ajtowns: ACK fa98a097a30bc39f2424c0efd28a7979155faae6 ryanofsky: Seems odd to not code review ACK fa98a097a30bc39f2424c0efd28a7979155faae6 (looks good) Tree-SHA512: 9f1b9d9f92bda0512610bda6653e892756f637860362a9abfa439faab62de233cbad94b7df78ebacc160d9667aadfed4d9df08c0edefa618c040a049050fb913
Diffstat (limited to 'src/test/fuzz')
-rw-r--r--src/test/fuzz/block.cpp6
-rw-r--r--src/test/fuzz/deserialize.cpp18
-rw-r--r--src/test/fuzz/float.cpp1
-rw-r--r--src/test/fuzz/integer.cpp1
-rw-r--r--src/test/fuzz/process_message.cpp4
-rw-r--r--src/test/fuzz/psbt.cpp1
-rw-r--r--src/test/fuzz/rpc.cpp4
-rw-r--r--src/test/fuzz/script_sign.cpp7
-rw-r--r--src/test/fuzz/transaction.cpp15
-rw-r--r--src/test/fuzz/tx_in.cpp1
-rw-r--r--src/test/fuzz/tx_out.cpp1
-rw-r--r--src/test/fuzz/util.cpp1
-rw-r--r--src/test/fuzz/util.h3
-rw-r--r--src/test/fuzz/util/net.cpp2
-rw-r--r--src/test/fuzz/utxo_total_supply.cpp1
15 files changed, 15 insertions, 51 deletions
diff --git a/src/test/fuzz/block.cpp b/src/test/fuzz/block.cpp
index 09c0ed23d2..e38b871747 100644
--- a/src/test/fuzz/block.cpp
+++ b/src/test/fuzz/block.cpp
@@ -13,7 +13,6 @@
#include <test/fuzz/fuzz.h>
#include <util/chaintype.h>
#include <validation.h>
-#include <version.h>
#include <cassert>
#include <string>
@@ -25,12 +24,9 @@ void initialize_block()
FUZZ_TARGET(block, .init = initialize_block)
{
- CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION);
+ DataStream ds{buffer};
CBlock block;
try {
- int nVersion;
- ds >> nVersion;
- ds.SetVersion(nVersion);
ds >> TX_WITH_WITNESS(block);
} catch (const std::ios_base::failure&) {
return;
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index 33c9a93c65..ebc5673e71 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -28,7 +28,6 @@
#include <test/fuzz/util.h>
#include <test/util/setup_common.h>
#include <undo.h>
-#include <version.h>
#include <exception>
#include <optional>
@@ -91,15 +90,15 @@ void DeserializeFromFuzzingInput(FuzzBufferType buffer, T&& obj, const P& params
}
template <typename T>
-CDataStream Serialize(const T& obj)
+DataStream Serialize(const T& obj)
{
- CDataStream ds{SER_NETWORK, INIT_PROTO_VERSION};
+ DataStream ds{};
ds << obj;
return ds;
}
template <typename T>
-T Deserialize(CDataStream ds)
+T Deserialize(DataStream ds)
{
T obj;
ds >> obj;
@@ -109,16 +108,7 @@ T Deserialize(CDataStream ds)
template <typename T>
void DeserializeFromFuzzingInput(FuzzBufferType buffer, T&& obj)
{
- CDataStream ds{buffer, SER_NETWORK, INIT_PROTO_VERSION};
- {
- try {
- int version;
- ds >> version;
- ds.SetVersion(version);
- } catch (const std::ios_base::failure&) {
- throw invalid_fuzzing_input_exception();
- }
- }
+ DataStream ds{buffer};
try {
ds >> obj;
} catch (const std::ios_base::failure&) {
diff --git a/src/test/fuzz/float.cpp b/src/test/fuzz/float.cpp
index 8714ab8a04..6897e81494 100644
--- a/src/test/fuzz/float.cpp
+++ b/src/test/fuzz/float.cpp
@@ -7,7 +7,6 @@
#include <test/fuzz/fuzz.h>
#include <test/fuzz/util.h>
#include <util/serfloat.h>
-#include <version.h>
#include <cassert>
#include <cmath>
diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index 849618d748..9b97958a5d 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -33,7 +33,6 @@
#include <util/overflow.h>
#include <util/strencodings.h>
#include <util/string.h>
-#include <version.h>
#include <cassert>
#include <chrono>
diff --git a/src/test/fuzz/process_message.cpp b/src/test/fuzz/process_message.cpp
index d38d1bb40e..6392f03d4e 100644
--- a/src/test/fuzz/process_message.cpp
+++ b/src/test/fuzz/process_message.cpp
@@ -25,8 +25,6 @@
#include <util/time.h>
#include <validation.h>
#include <validationinterface.h>
-#include <version.h>
-
#include <atomic>
#include <cstdlib>
@@ -82,7 +80,7 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
SetMockTime(mock_time);
// fuzzed_data_provider is fully consumed after this call, don't use it
- CDataStream random_bytes_data_stream{fuzzed_data_provider.ConsumeRemainingBytes<unsigned char>(), SER_NETWORK, PROTOCOL_VERSION};
+ DataStream random_bytes_data_stream{fuzzed_data_provider.ConsumeRemainingBytes<unsigned char>()};
try {
g_setup->m_node.peerman->ProcessMessage(p2p_node, random_message_type, random_bytes_data_stream,
GetTime<std::chrono::microseconds>(), std::atomic<bool>{false});
diff --git a/src/test/fuzz/psbt.cpp b/src/test/fuzz/psbt.cpp
index 825ed67ec1..e0692600bb 100644
--- a/src/test/fuzz/psbt.cpp
+++ b/src/test/fuzz/psbt.cpp
@@ -11,7 +11,6 @@
#include <script/script.h>
#include <streams.h>
#include <util/check.h>
-#include <version.h>
#include <cstdint>
#include <optional>
diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
index 97b99ea2a3..2189dc0067 100644
--- a/src/test/fuzz/rpc.cpp
+++ b/src/test/fuzz/rpc.cpp
@@ -254,7 +254,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
good_data = false;
return;
}
- CDataStream data_stream{SER_NETWORK, PROTOCOL_VERSION};
+ DataStream data_stream{};
data_stream << TX_WITH_WITNESS(*opt_block);
r = HexStr(data_stream);
},
@@ -288,7 +288,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
good_data = false;
return;
}
- CDataStream data_stream{SER_NETWORK, PROTOCOL_VERSION};
+ DataStream data_stream{};
data_stream << *opt_psbt;
r = EncodeBase64(data_stream);
},
diff --git a/src/test/fuzz/script_sign.cpp b/src/test/fuzz/script_sign.cpp
index 9c2966e0cb..9ae150e553 100644
--- a/src/test/fuzz/script_sign.cpp
+++ b/src/test/fuzz/script_sign.cpp
@@ -36,14 +36,13 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
const std::vector<uint8_t> key = ConsumeRandomLengthByteVector(fuzzed_data_provider, 128);
{
- DataStream stream{ConsumeDataStream(fuzzed_data_provider)};
- CDataStream random_data_stream{stream, SER_NETWORK, INIT_PROTO_VERSION}; // temporary copy, to be removed along with the version flag SERIALIZE_TRANSACTION_NO_WITNESS
+ DataStream random_data_stream{ConsumeDataStream(fuzzed_data_provider)};
std::map<CPubKey, KeyOriginInfo> hd_keypaths;
try {
DeserializeHDKeypaths(random_data_stream, key, hd_keypaths);
} catch (const std::ios_base::failure&) {
}
- CDataStream serialized{SER_NETWORK, PROTOCOL_VERSION};
+ DataStream serialized{};
SerializeHDKeypaths(serialized, hd_keypaths, CompactSizeWriter(fuzzed_data_provider.ConsumeIntegral<uint8_t>()));
}
@@ -60,7 +59,7 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
}
hd_keypaths[*pub_key] = *key_origin_info;
}
- CDataStream serialized{SER_NETWORK, PROTOCOL_VERSION};
+ DataStream serialized{};
try {
SerializeHDKeypaths(serialized, hd_keypaths, CompactSizeWriter(fuzzed_data_provider.ConsumeIntegral<uint8_t>()));
} catch (const std::ios_base::failure&) {
diff --git a/src/test/fuzz/transaction.cpp b/src/test/fuzz/transaction.cpp
index ccaee424fb..2a043f7458 100644
--- a/src/test/fuzz/transaction.cpp
+++ b/src/test/fuzz/transaction.cpp
@@ -18,7 +18,6 @@
#include <util/chaintype.h>
#include <util/rbf.h>
#include <validation.h>
-#include <version.h>
#include <cassert>
@@ -29,14 +28,7 @@ void initialize_transaction()
FUZZ_TARGET(transaction, .init = initialize_transaction)
{
- CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION);
- try {
- int nVersion;
- ds >> nVersion;
- ds.SetVersion(nVersion);
- } catch (const std::ios_base::failure&) {
- return;
- }
+ DataStream ds{buffer};
bool valid_tx = true;
const CTransaction tx = [&] {
try {
@@ -47,12 +39,9 @@ FUZZ_TARGET(transaction, .init = initialize_transaction)
}
}();
bool valid_mutable_tx = true;
- CDataStream ds_mtx(buffer, SER_NETWORK, INIT_PROTO_VERSION);
+ DataStream ds_mtx{buffer};
CMutableTransaction mutable_tx;
try {
- int nVersion;
- ds_mtx >> nVersion;
- ds_mtx.SetVersion(nVersion);
ds_mtx >> TX_WITH_WITNESS(mutable_tx);
} catch (const std::ios_base::failure&) {
valid_mutable_tx = false;
diff --git a/src/test/fuzz/tx_in.cpp b/src/test/fuzz/tx_in.cpp
index fc16f80cde..d0ef467db4 100644
--- a/src/test/fuzz/tx_in.cpp
+++ b/src/test/fuzz/tx_in.cpp
@@ -8,7 +8,6 @@
#include <primitives/transaction.h>
#include <streams.h>
#include <test/fuzz/fuzz.h>
-#include <version.h>
#include <cassert>
diff --git a/src/test/fuzz/tx_out.cpp b/src/test/fuzz/tx_out.cpp
index 806216fbf5..37f86822d9 100644
--- a/src/test/fuzz/tx_out.cpp
+++ b/src/test/fuzz/tx_out.cpp
@@ -9,7 +9,6 @@
#include <primitives/transaction.h>
#include <streams.h>
#include <test/fuzz/fuzz.h>
-#include <version.h>
FUZZ_TARGET(tx_out)
{
diff --git a/src/test/fuzz/util.cpp b/src/test/fuzz/util.cpp
index 90ef58d437..23b0761355 100644
--- a/src/test/fuzz/util.cpp
+++ b/src/test/fuzz/util.cpp
@@ -10,7 +10,6 @@
#include <util/overflow.h>
#include <util/rbf.h>
#include <util/time.h>
-#include <version.h>
#include <memory>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 045476ab86..de09745730 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -20,7 +20,6 @@
#include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h>
#include <uint256.h>
-#include <version.h>
#include <algorithm>
#include <array>
@@ -118,7 +117,7 @@ template <typename T>
[[nodiscard]] inline std::optional<T> ConsumeDeserializable(FuzzedDataProvider& fuzzed_data_provider, const std::optional<size_t>& max_length = std::nullopt) noexcept
{
const std::vector<uint8_t> buffer = ConsumeRandomLengthByteVector(fuzzed_data_provider, max_length);
- CDataStream ds{buffer, SER_NETWORK, INIT_PROTO_VERSION};
+ DataStream ds{buffer};
T obj;
try {
ds >> obj;
diff --git a/src/test/fuzz/util/net.cpp b/src/test/fuzz/util/net.cpp
index 5a286c05d2..eb0f14ede0 100644
--- a/src/test/fuzz/util/net.cpp
+++ b/src/test/fuzz/util/net.cpp
@@ -6,13 +6,13 @@
#include <compat/compat.h>
#include <netaddress.h>
+#include <node/protocol_version.h>
#include <protocol.h>
#include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/util.h>
#include <test/util/net.h>
#include <util/sock.h>
#include <util/time.h>
-#include <version.h>
#include <array>
#include <cassert>
diff --git a/src/test/fuzz/utxo_total_supply.cpp b/src/test/fuzz/utxo_total_supply.cpp
index a8f0f3b7ff..48ed266abe 100644
--- a/src/test/fuzz/utxo_total_supply.cpp
+++ b/src/test/fuzz/utxo_total_supply.cpp
@@ -16,7 +16,6 @@
#include <test/util/setup_common.h>
#include <util/chaintype.h>
#include <validation.h>
-#include <version.h>
FUZZ_TARGET(utxo_total_supply)
{
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-17 04:27:28 +0000