refactor: drop functions from struct which supposed to be simple as p…

…ossible
dashpay · Mar 24, 2024 · 9d429f4 · 9d429f4
1 parent b2bb097
commit 9d429f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -298,7 +298,7 @@ struct CMutableTransaction
         SER_READ(obj, obj.nVersion = (int16_t) (n32bitVersion & 0xffff));
         SER_READ(obj, obj.nType = (uint16_t) ((n32bitVersion >> 16) & 0xffff));
         READWRITE(obj.vin, obj.vout, obj.nLockTime);
-        if (obj.HasExtraPayloadField()) {
+        if (obj.nVersion >= 3 && obj.nType != TRANSACTION_NORMAL) {
             READWRITE(obj.vExtraPayload);
         }
     }
@@ -314,16 +314,6 @@ struct CMutableTransaction
     uint256 GetHash() const;
 
     std::string ToString() const;
-
-    bool IsSpecialTxVersion() const
-    {
-        return nVersion >= 3;
-    }
-
-    bool HasExtraPayloadField() const
-    {
-        return IsSpecialTxVersion() && nType != TRANSACTION_NORMAL;
-    }
 };
 
 typedef std::shared_ptr<const CTransaction> CTransactionRef;

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -1476,7 +1476,7 @@ class CTransactionSignatureSerializer
              SerializeOutput(s, nOutput);
         // Serialize nLockTime
         ::Serialize(s, txTo.nLockTime);
-        if (txTo.HasExtraPayloadField())
+        if (txTo.nVersion >= 3 && txTo.nType != TRANSACTION_NORMAL)
             ::Serialize(s, txTo.vExtraPayload);
     }
 };