Delete old protocol version constants and simplify code that used them.

fixes #2244 Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-09 13:19:48 +01:00
parent c752b8aa9b
commit 5a49c929dd
4 changed files with 21 additions and 56 deletions
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -103,8 +103,7 @@ public:
            Init();
        if (nType & SER_DISK)
            READWRITE(nVersion);
-        if ((nType & SER_DISK) ||
-            (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH)))
+        if ((nType & SER_DISK) || !(nType & SER_GETHASH))
            READWRITE(nTime);
        READWRITE(nServices);
        READWRITE(*(CService*)this);