Skip to content

Commit fa74d3d

Browse files
author
MarcoFalke
committed
qa: Remove unused deserialization code in msg_version
1 parent fa5099c commit fa74d3d

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

test/functional/test_framework/messages.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -909,21 +909,12 @@ def deserialize(self, f):
909909
self.addrTo = CAddress()
910910
self.addrTo.deserialize(f, False)
911911

912-
if self.nVersion >= 106:
913-
self.addrFrom = CAddress()
914-
self.addrFrom.deserialize(f, False)
915-
self.nNonce = struct.unpack("<Q", f.read(8))[0]
916-
self.strSubVer = deser_string(f)
917-
else:
918-
self.addrFrom = None
919-
self.nNonce = None
920-
self.strSubVer = None
921-
self.nStartingHeight = None
912+
self.addrFrom = CAddress()
913+
self.addrFrom.deserialize(f, False)
914+
self.nNonce = struct.unpack("<Q", f.read(8))[0]
915+
self.strSubVer = deser_string(f)
922916

923-
if self.nVersion >= 209:
924-
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
925-
else:
926-
self.nStartingHeight = None
917+
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
927918

928919
if self.nVersion >= 70001:
929920
# Relay field is optional for version 70001 onwards

0 commit comments

Comments
 (0)