aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-08-23 10:10:13 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-08-23 10:05:43 -0400
commitfa74d3d720f72c5f1184ca3e03b0c14a2bc06ed5 (patch)
tree48016742ac348725e2060fe9baf0a22c28c80e04 /test/functional/test_framework
parentfa5099ceb757c9d56fa54a08d0441750df6c8869 (diff)
qa: Remove unused deserialization code in msg_version
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-xtest/functional/test_framework/messages.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 3cd148a02e..0a3907cba4 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -909,21 +909,12 @@ class msg_version():
self.addrTo = CAddress()
self.addrTo.deserialize(f, False)
- if self.nVersion >= 106:
- self.addrFrom = CAddress()
- self.addrFrom.deserialize(f, False)
- self.nNonce = struct.unpack("<Q", f.read(8))[0]
- self.strSubVer = deser_string(f)
- else:
- self.addrFrom = None
- self.nNonce = None
- self.strSubVer = None
- self.nStartingHeight = None
+ self.addrFrom = CAddress()
+ self.addrFrom.deserialize(f, False)
+ self.nNonce = struct.unpack("<Q", f.read(8))[0]
+ self.strSubVer = deser_string(f)
- if self.nVersion >= 209:
- self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
- else:
- self.nStartingHeight = None
+ self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
if self.nVersion >= 70001:
# Relay field is optional for version 70001 onwards