From 1d1cf23fd22471759354a722269d04ab87ea294d Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 14 Jun 2019 13:08:57 -0400
Subject: [PATCH] s/HF_MASK/DYNAFED_HF_MASK/

---
 src/chain.h                                | 4 ++--
 src/primitives/block.h                     | 6 +++---
 test/functional/test_framework/messages.py | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index 180cf00483..bbc943f2c4 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -440,11 +440,11 @@ public:
         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);
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 9c9203ed56..1ca1dca70a 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -194,7 +194,7 @@ public:
     }
 
     // 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 @@ public:
         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);
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index dd12e303e5..eb96d64af2 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -925,7 +925,7 @@ class DynaFedParams:
 
 
 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 @@ class CBlockHeader:
 
         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)