s/HF_MASK/DYNAFED_HF_MASK/

Author: instagibbs

src/chain.h

@@ -440,11 +440,11 @@ class CDiskBlockIndex : public CBlockIndex
         if (ser_action.ForRead()) {
             READWRITE(nVersion);
             is_dyna = nVersion < 0;
-            this->nVersion = ~CBlockHeader::HF_MASK & nVersion;
+            this->nVersion = ~CBlockHeader::DYNAFED_HF_MASK & nVersion;
         } else {
             nVersion = this->nVersion;
             if (!dynafed_params.IsNull()) {
-                nVersion |= CBlockHeader::HF_MASK;
+                nVersion |= CBlockHeader::DYNAFED_HF_MASK;
                 is_dyna = true;
             }
             READWRITE(nVersion);

src/primitives/block.h

@@ -194,7 +194,7 @@ class CBlockHeader
     }
 
     // HF bit to detect dynamic federation blocks
-    static const uint32_t HF_MASK = 1 << 31;
+    static const uint32_t DYNAFED_HF_MASK = 1 << 31;
 
     ADD_SERIALIZE_METHODS;
 
@@ -209,11 +209,11 @@ class CBlockHeader
         if (ser_action.ForRead()) {
             READWRITE(nVersion);
             is_dyna = nVersion < 0;
-            this->nVersion = ~HF_MASK & nVersion;
+            this->nVersion = ~DYNAFED_HF_MASK & nVersion;
         } else {
             nVersion = this->nVersion;
             if (!m_dyna_params.IsNull()) {
-                nVersion |= HF_MASK;
+                nVersion |= DYNAFED_HF_MASK;
                 is_dyna = true;
             }
             READWRITE(nVersion);

test/functional/test_framework/messages.py

@@ -925,7 +925,7 @@ def __repr__(self):
 
 
 HEADER_HF_BIT = 1 << 31
-HEADER_HF_MASK = 0x7fffffff
+HEADER_DYNAFED_HF_MASK = 0x7fffffff
 class CBlockHeader:
     __slots__ = ("hash", "hashMerkleRoot", "hashPrevBlock", "nBits", "nNonce",
                  "nTime", "nVersion", "sha256", "block_height", "proof", "m_dyna_params",
@@ -965,7 +965,7 @@ def deserialize(self, f):
 
         if self.nVersion < 0:
             is_dyna = True
-            self.nVersion = HEADER_HF_MASK & self.nVersion
+            self.nVersion = HEADER_DYNAFED_HF_MASK & self.nVersion
 
         self.hashPrevBlock = deser_uint256(f)
         self.hashMerkleRoot = deser_uint256(f)