diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-09-11 18:06:51 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-11-30 11:27:54 +0100 |
| commit | fae00fe9c25af80024adda33d9077962964269ea (patch) | |
| tree | e273f2c02b7b59911cb4993248793a037b06fe1a /src/test/fuzz | |
| parent | fa7eb4f5c3d2438f9689cd46b22dcfd50f6bd751 (diff) | |
Remove unused CDataStream
Diffstat (limited to 'src/test/fuzz')
| -rw-r--r-- | src/test/fuzz/process_message.cpp | 2 | ||||
| -rw-r--r-- | src/test/fuzz/rpc.cpp | 4 | ||||
| -rw-r--r-- | src/test/fuzz/script_sign.cpp | 7 | ||||
| -rw-r--r-- | src/test/fuzz/util.h | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/test/fuzz/process_message.cpp b/src/test/fuzz/process_message.cpp index d38d1bb40e..f21b5eadd8 100644 --- a/src/test/fuzz/process_message.cpp +++ b/src/test/fuzz/process_message.cpp @@ -82,7 +82,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/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/util.h b/src/test/fuzz/util.h index 045476ab86..b7ec63a39d 100644 --- a/src/test/fuzz/util.h +++ b/src/test/fuzz/util.h @@ -118,7 +118,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; |