diff --git a/src/seeder/bitcoin.cpp b/src/seeder/bitcoin.cpp --- a/src/seeder/bitcoin.cpp +++ b/src/seeder/bitcoin.cpp @@ -116,20 +116,13 @@ uint64_t nServiceInt; recv >> nVersion >> nServiceInt >> nTime >> addrMe; you.nServices = ServiceFlags(nServiceInt); - if (nVersion == 10300) nVersion = 300; - if (nVersion >= 106 && !recv.empty()) recv >> addrFrom >> nNonce; - if (nVersion >= 106 && !recv.empty()) recv >> strSubVer; - if (nVersion >= 209 && !recv.empty()) recv >> nStartingHeight; + recv >> addrFrom >> nNonce; + recv >> strSubVer; + recv >> nStartingHeight; - if (nVersion >= 209) { - BeginMessage("verack"); - EndMessage(); - } + BeginMessage("verack"); + EndMessage(); vSend.SetVersion(std::min(nVersion, PROTOCOL_VERSION)); - if (nVersion < 209) { - vRecv.SetVersion(std::min(nVersion, PROTOCOL_VERSION)); - GotVersion(); - } return false; } diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -834,28 +834,17 @@ def deserialize(self, f): self.nVersion = struct.unpack("= 106: - self.addrFrom = CAddress() - self.addrFrom.deserialize(f, False) - self.nNonce = struct.unpack("= 209: - self.nStartingHeight = struct.unpack("= 70001: # Relay field is optional for version 70001 onwards