diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-08-31 18:13:55 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-08-31 18:13:10 +0200 |
commit | fab53ff1e5a995f40a110d6f9e1214f263908b46 (patch) | |
tree | 8556636c8e5d33240be25174eb01e48a383e00cd | |
parent | 7be143a960e2bb9ac81144f55c45731c1bb209c5 (diff) | |
download | bitcoin-fab53ff1e5a995f40a110d6f9e1214f263908b46.tar.xz |
Remove unused SERIALIZE_METHODS for CBanEntry
-rw-r--r-- | src/addrdb.h | 8 | ||||
-rw-r--r-- | src/test/fuzz/addrdb.cpp | 16 | ||||
-rw-r--r-- | src/test/fuzz/deserialize.cpp | 4 |
3 files changed, 1 insertions, 27 deletions
diff --git a/src/addrdb.h b/src/addrdb.h index 1e0ccb1f60..567b9973b7 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -8,10 +8,8 @@ #include <fs.h> #include <net_types.h> // For banmap_t -#include <serialize.h> #include <univalue.h> -#include <string> #include <vector> class CAddress; @@ -44,12 +42,6 @@ public: */ explicit CBanEntry(const UniValue& json); - SERIALIZE_METHODS(CBanEntry, obj) - { - uint8_t ban_reason = 2; //! For backward compatibility - READWRITE(obj.nVersion, obj.nCreateTime, obj.nBanUntil, ban_reason); - } - void SetNull() { nVersion = CBanEntry::CURRENT_VERSION; diff --git a/src/test/fuzz/addrdb.cpp b/src/test/fuzz/addrdb.cpp index d15c785673..44df3576c4 100644 --- a/src/test/fuzz/addrdb.cpp +++ b/src/test/fuzz/addrdb.cpp @@ -18,20 +18,6 @@ FUZZ_TARGET(addrdb) FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size()); // The point of this code is to exercise all CBanEntry constructors. - const CBanEntry ban_entry = [&] { - switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 2)) { - case 0: - return CBanEntry{fuzzed_data_provider.ConsumeIntegral<int64_t>()}; - break; - case 1: { - const std::optional<CBanEntry> ban_entry = ConsumeDeserializable<CBanEntry>(fuzzed_data_provider); - if (ban_entry) { - return *ban_entry; - } - break; - } - } - return CBanEntry{}; - }(); + const CBanEntry ban_entry{fuzzed_data_provider.ConsumeIntegral<int64_t>()}; (void)ban_entry; // currently unused } diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp index 49503e8dc6..cfbbe77311 100644 --- a/src/test/fuzz/deserialize.cpp +++ b/src/test/fuzz/deserialize.cpp @@ -195,10 +195,6 @@ FUZZ_TARGET_DESERIALIZE(blockheader_deserialize, { CBlockHeader bh; DeserializeFromFuzzingInput(buffer, bh); }) -FUZZ_TARGET_DESERIALIZE(banentry_deserialize, { - CBanEntry be; - DeserializeFromFuzzingInput(buffer, be); -}) FUZZ_TARGET_DESERIALIZE(txundo_deserialize, { CTxUndo tu; DeserializeFromFuzzingInput(buffer, tu); |