aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-08-22 09:24:43 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-08-22 09:22:04 -0400
commitfa5099ceb757c9d56fa54a08d0441750df6c8869 (patch)
treeb60aa11da7ff2e66b6e92d3c1d3b44e0bc7d0e52
parent17d644901bbd770578619545bbd8bc930fe6f2d9 (diff)
p2p: Remove dead code for nVersion=10300
-rw-r--r--src/net_processing.cpp5
-rwxr-xr-xtest/functional/test_framework/messages.py2
2 files changed, 1 insertions, 6 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 88999ba735..0fad012257 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1662,8 +1662,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
return false;
}
- if (nVersion < MIN_PEER_PROTO_VERSION)
- {
+ if (nVersion < MIN_PEER_PROTO_VERSION) {
// disconnect from peers older than this proto version
LogPrint(BCLog::NET, "peer=%d using obsolete version %i; disconnecting\n", pfrom->GetId(), nVersion);
if (enable_bip61) {
@@ -1674,8 +1673,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
return false;
}
- if (nVersion == 10300)
- nVersion = 300;
if (!vRecv.empty())
vRecv >> addrFrom >> nNonce;
if (!vRecv.empty()) {
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 7276f6b450..3cd148a02e 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -904,8 +904,6 @@ class msg_version():
def deserialize(self, f):
self.nVersion = struct.unpack("<i", f.read(4))[0]
- if self.nVersion == 10300:
- self.nVersion = 300
self.nServices = struct.unpack("<Q", f.read(8))[0]
self.nTime = struct.unpack("<q", f.read(8))[0]
self.addrTo = CAddress()