From 081b83229e544f9c496ebd0dfd43d8d779f48df7 Mon Sep 17 00:00:00 2001
From: Mark Friedenbach <mark@friedenbach.org>
Date: Sat, 4 Mar 2017 15:11:15 -0800
Subject: [PATCH] CA: hashAssetIdentifier -> assetEntropy

---
 src/primitives/transaction.cpp | 2 +-
 src/primitives/transaction.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index ec15effa18..f087d3c70b 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -106,7 +106,7 @@ std::string CAssetIssuance::ToString() const
     str += "CAssetIssuance(";
     str += assetBlindingNonce.ToString();
     str += ", ";
-    str += hashAssetIdentifier.ToString();
+    str += assetEntropy.ToString();
     str += strprintf(", %s", (nAmount.IsAmount() ? strprintf("%d.%08d", nAmount.GetAmount() / COIN, nAmount.GetAmount() % COIN) : std::string("UNKNOWN")));
     if (!nInflationKeys.IsNull())
         str += strprintf(", %s", (nInflationKeys.IsAmount() ? strprintf("%d.%08d", nInflationKeys.GetAmount() / COIN, nInflationKeys.GetAmount() % COIN) : std::string("UNKNOWN")));
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 67f7931343..0ef4a48a23 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -324,7 +324,7 @@ public:
     //   The original asset entropy (combination of Ricardian contract
     //   and outpoint used) which was used to generate the fixed asset
     //   tag and reissuance tokens.
-    uint256 hashAssetIdentifier;
+    uint256 assetEntropy;
 
     // Both explicit and blinded issuance amounts are supported
     // (see class definition for CTxOutValue for details).
@@ -347,7 +347,7 @@ public:
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(assetBlindingNonce);
-        READWRITE(hashAssetIdentifier);
+        READWRITE(assetEntropy);
         READWRITE(nAmount);
         READWRITE(nInflationKeys);
     }
@@ -358,7 +358,7 @@ public:
     friend bool operator==(const CAssetIssuance& a, const CAssetIssuance& b)
     {
         return a.assetBlindingNonce == b.assetBlindingNonce &&
-               a.hashAssetIdentifier == b.hashAssetIdentifier &&
+               a.assetEntropy == b.assetEntropy &&
                a.nAmount == b.nAmount &&
                a.nInflationKeys == b.nInflationKeys;
     }