Drop SER_GETHASH

Since SER_GETHASH was only ever set in CHashWriter, checking for its presence will now always fail. Remove those checks, and remove the constant.
ajtowns · Sep 26, 2023 · 81954aa · 81954aa
1 parent 66ea0d6
commit 81954aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/serialize.h b/src/serialize.h
@@ -131,7 +131,6 @@ enum
     // primary actions
     SER_NETWORK         = (1 << 0),
     SER_DISK            = (1 << 1),
-    SER_GETHASH         = (1 << 2),
 };
 
 /**

diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -124,19 +124,15 @@ class CKeyPool
     void Serialize(Stream& s) const
     {
         int nVersion = s.GetVersion();
-        if (!(s.GetType() & SER_GETHASH)) {
-            s << nVersion;
-        }
+        s << nVersion;
         s << nTime << vchPubKey << fInternal << m_pre_split;
     }
 
     template<typename Stream>
     void Unserialize(Stream& s)
     {
         int nVersion = s.GetVersion();
-        if (!(s.GetType() & SER_GETHASH)) {
-            s >> nVersion;
-        }
+        s >> nVersion;
         s >> nTime >> vchPubKey;
         try {
             s >> fInternal;