From ab72a3dc05517eae276abdd4d669fdf52516096a Mon Sep 17 00:00:00 2001
From: Mark Friedenbach <mark@friedenbach.org>
Date: Mon, 7 Nov 2016 14:59:14 -0500
Subject: [PATCH] CT: Rename nCommitmentSize -> nCommittedSize

---
 src/primitives/transaction.cpp | 12 ++++++------
 src/primitives/transaction.h   |  4 ++--
 src/validation.cpp             |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index c1df4044e1..f2453e9e96 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -46,13 +46,13 @@ std::string CTxIn::ToString() const
 
 CTxOutValue::CTxOutValue()
 {
-    vchCommitment.resize(nCommitmentSize);
+    vchCommitment.resize(nCommittedSize);
     vchCommitment[0] = 0xff;
 }
 
 CTxOutValue::CTxOutValue(CAmount nAmountIn)
 {
-    vchCommitment.resize(nCommitmentSize);
+    vchCommitment.resize(nCommittedSize);
     SetToAmount(nAmountIn);
 }
 
@@ -61,7 +61,7 @@ bool CTxOutValue::IsValid() const
     switch(vchCommitment[0]) {
         case 0:
         case 1:
-            for (size_t i = 0; i < nCommitmentSize - sizeof(CAmount); i++)
+            for (size_t i = 0; i < nCommittedSize - sizeof(CAmount); i++)
                 if (vchCommitment[i])
                     return false;
             return true;
@@ -92,7 +92,7 @@ CAmount CTxOutValue::GetAmount() const
     assert(IsAmount());
     CAmount nAmount = 0;
     for (size_t i = 0; i < sizeof(nAmount); i++)
-        nAmount |= CAmount(vchCommitment[nCommitmentSize - 1 - i]) << (i * 8);
+        nAmount |= CAmount(vchCommitment[nCommittedSize - 1 - i]) << (i * 8);
     return nAmount;
 }
 
@@ -117,9 +117,9 @@ bool CTxOutValue::IsInBitcoinTransaction() const {
 }
 
 void CTxOutValue::SetToAmount(const CAmount nAmount) {
-    memset(&vchCommitment[0], 0, nCommitmentSize - sizeof(nAmount));
+    memset(&vchCommitment[0], 0, nCommittedSize - sizeof(nAmount));
     for (size_t i = 0; i < sizeof(nAmount); ++i)
-        vchCommitment[nCommitmentSize - 1 - i] = ((nAmount >> (i * 8)) & 0xff);
+        vchCommitment[nCommittedSize - 1 - i] = ((nAmount >> (i * 8)) & 0xff);
 }
 
 CTxOut::CTxOut(const CTxOutValue& nValueIn, CScript scriptPubKeyIn)
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 49d4c36aff..acfdbe5697 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -133,7 +133,7 @@ public:
 class CTxOutValue
 {
 public:
-    static const size_t nCommitmentSize = 33;
+    static const size_t nCommittedSize = 33;
 
     std::vector<unsigned char> vchCommitment;
     std::vector<unsigned char> vchRangeproof;
@@ -157,7 +157,7 @@ public:
         } else {
             // We only serialize the value commitment here.
             // The ECDH key and range proof are serialized through CTxOutWitnessSerializer.
-            READWRITE(REF(CFlatData(&vchCommitment[0], &vchCommitment[nCommitmentSize])));
+            READWRITE(REF(CFlatData(&vchCommitment[0], &vchCommitment[nCommittedSize])));
         }
     }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index de81b783fa..0c39b9cb09 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -661,7 +661,7 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, const C
             else
             {
                 blindedInputs += 1;
-                assert(val.vchCommitment.size() == CTxOutValue::nCommitmentSize);
+                assert(val.vchCommitment.size() == CTxOutValue::nCommittedSize);
                 if (secp256k1_pedersen_commitment_parse(secp256k1_ctx_verify_amounts, &commit, &val.vchCommitment[0]) != 1)
                     return false;
                 memcpy(p, &commit, sizeof(secp256k1_pedersen_commitment));
@@ -673,8 +673,8 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, const C
     for (size_t i = 0; i < tx.vout.size(); ++i)
     {
         const CTxOutValue& val = tx.vout[i].nValue;
-        assert(val.vchCommitment.size() == CTxOutValue::nCommitmentSize);
-        if (val.vchNonceCommitment.size() > CTxOutValue::nCommitmentSize || val.vchRangeproof.size() > 5000)
+        assert(val.vchCommitment.size() == CTxOutValue::nCommittedSize);
+        if (val.vchNonceCommitment.size() > CTxOutValue::nCommittedSize || val.vchRangeproof.size() > 5000)
             return false;
         if (val.IsAmount()) {
             nPlainAmount += val.GetAmount();