Skip to content

Commit fa4e6af

Browse files
author
MarcoFalke
committed
Remove unused CSubNet serialize code
1 parent fa384fd commit fa4e6af

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

src/netaddress.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -536,24 +536,6 @@ class CSubNet
536536
friend bool operator==(const CSubNet& a, const CSubNet& b);
537537
friend bool operator!=(const CSubNet& a, const CSubNet& b) { return !(a == b); }
538538
friend bool operator<(const CSubNet& a, const CSubNet& b);
539-
540-
SERIALIZE_METHODS(CSubNet, obj)
541-
{
542-
READWRITE(obj.network);
543-
if (obj.network.IsIPv4()) {
544-
// Before commit 102867c587f5f7954232fb8ed8e85cda78bb4d32, CSubNet used the last 4 bytes of netmask
545-
// to store the relevant bytes for an IPv4 mask. For compatibility reasons, keep doing so in
546-
// serialized form.
547-
unsigned char dummy[12] = {0};
548-
READWRITE(dummy);
549-
READWRITE(MakeSpan(obj.netmask).first(4));
550-
} else {
551-
READWRITE(obj.netmask);
552-
}
553-
READWRITE(obj.valid);
554-
// Mark invalid if the result doesn't pass sanity checking.
555-
SER_READ(obj, if (obj.valid) obj.valid = obj.SanityCheck());
556-
}
557539
};
558540

559541
/** A combination of a network address (CNetAddr) and a (TCP) port */

src/test/fuzz/deserialize.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,17 +142,6 @@ FUZZ_TARGET_DESERIALIZE(script_deserialize, {
142142
CScript script;
143143
DeserializeFromFuzzingInput(buffer, script);
144144
})
145-
FUZZ_TARGET_DESERIALIZE(sub_net_deserialize, {
146-
CSubNet sub_net_1;
147-
DeserializeFromFuzzingInput(buffer, sub_net_1, INIT_PROTO_VERSION);
148-
AssertEqualAfterSerializeDeserialize(sub_net_1, INIT_PROTO_VERSION);
149-
CSubNet sub_net_2;
150-
DeserializeFromFuzzingInput(buffer, sub_net_2, INIT_PROTO_VERSION | ADDRV2_FORMAT);
151-
AssertEqualAfterSerializeDeserialize(sub_net_2, INIT_PROTO_VERSION | ADDRV2_FORMAT);
152-
CSubNet sub_net_3;
153-
DeserializeFromFuzzingInput(buffer, sub_net_3);
154-
AssertEqualAfterSerializeDeserialize(sub_net_3, INIT_PROTO_VERSION | ADDRV2_FORMAT);
155-
})
156145
FUZZ_TARGET_DESERIALIZE(tx_in_deserialize, {
157146
CTxIn tx_in;
158147
DeserializeFromFuzzingInput(buffer, tx_in);

0 commit comments

Comments
 (0)