From b7704f1717248d342abaaaabd56dbc1cf3f2f006 Mon Sep 17 00:00:00 2001
From: Mark Friedenbach <mark@friedenbach.org>
Date: Sat, 11 Mar 2017 14:20:27 -0800
Subject: [PATCH] Segwit: Rename CTransaction::GetWitnessHash() ->
 CTransaction::GetHashWithWitness()

---
 src/blockencodings.cpp         | 4 ++--
 src/core_write.cpp             | 2 +-
 src/net_processing.cpp         | 2 +-
 src/primitives/transaction.cpp | 2 +-
 src/primitives/transaction.h   | 2 +-
 src/rpc/mining.cpp             | 2 +-
 src/rpc/rawtransaction.cpp     | 2 +-
 src/txmempool.cpp              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 4a311cbba2..651cb80f1d 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -25,7 +25,7 @@ CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block, bool f
     prefilledtxn[0] = {0, block.vtx[0]};
     for (size_t i = 1; i < block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
-        shorttxids[i - 1] = GetShortID(fUseWTXID ? tx.GetWitnessHash() : tx.GetHash());
+        shorttxids[i - 1] = GetShortID(fUseWTXID ? tx.GetHashWithWitness() : tx.GetHash());
     }
 }
 
@@ -150,7 +150,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
                 // Note that we dont want duplication between extra_txn and mempool to
                 // trigger this case, so we compare witness hashes first
                 if (txn_available[idit->second] &&
-                        txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) {
+                        txn_available[idit->second]->GetHashWithWitness() != extra_txn[i].second->GetHashWithWitness()) {
                     txn_available[idit->second].reset();
                     mempool_count--;
                     extra_count--;
diff --git a/src/core_write.cpp b/src/core_write.cpp
index b82e9d5e7c..3b242531c6 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -156,7 +156,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
 void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
 {
     entry.pushKV("txid", tx.GetHash().GetHex());
-    entry.pushKV("hash", tx.GetWitnessHash().GetHex());
+    entry.pushKV("hash", tx.GetHashWithWitness().GetHex());
     entry.pushKV("version", tx.nVersion);
     entry.pushKV("locktime", (int64_t)tx.nLockTime);
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 87fc8dced5..733dab7ef5 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -599,7 +599,7 @@ void AddToCompactExtraTransactions(const CTransactionRef& tx)
         return;
     if (!vExtraTxnForCompact.size())
         vExtraTxnForCompact.resize(max_extra_txn);
-    vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetWitnessHash(), tx);
+    vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetHashWithWitness(), tx);
     vExtraTxnForCompactIt = (vExtraTxnForCompactIt + 1) % max_extra_txn;
 }
 
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index a2de1481a7..64232ddd9e 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -103,7 +103,7 @@ uint256 CTransaction::ComputeHash() const
     return SerializeHash(*this, SER_GETHASH, SERIALIZE_TRANSACTION_NO_WITNESS);
 }
 
-uint256 CTransaction::GetWitnessHash() const
+uint256 CTransaction::GetHashWithWitness() const
 {
     if (!HasWitness()) {
         return GetHash();
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e711c7860c..2d250a7c10 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -702,7 +702,7 @@ public:
     }
 
     // Compute a hash that includes both transaction and witness data
-    uint256 GetWitnessHash() const;
+    uint256 GetHashWithWitness() const;
 
     // Check if explicit TX fees overflow or are negative
     bool HasValidFee() const;
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 362d1e7a46..107d67a72f 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -638,7 +638,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
 
         entry.push_back(Pair("data", EncodeHexTx(tx)));
         entry.push_back(Pair("txid", txHash.GetHex()));
-        entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
+        entry.push_back(Pair("hash", tx.GetHashWithWitness().GetHex()));
 
         UniValue deps(UniValue::VARR);
         BOOST_FOREACH (const CTxIn &in, tx.vin)
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 165285e501..58c8fc4b5d 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -89,7 +89,7 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
 void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
 {
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
-    entry.push_back(Pair("hash", tx.GetWitnessHash().GetHex()));
+    entry.push_back(Pair("hash", tx.GetHashWithWitness().GetHex()));
     entry.push_back(Pair("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
     entry.push_back(Pair("vsize", (int)::GetVirtualTransactionSize(tx)));
     entry.push_back(Pair("version", tx.nVersion));
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 115bb81228..b89edbeea4 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -445,7 +445,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     totalTxSize += entry.GetTxSize();
     minerPolicyEstimator->processTransaction(entry, validFeeEstimate);
 
-    vTxHashes.emplace_back(tx.GetWitnessHash(), newit);
+    vTxHashes.emplace_back(tx.GetHashWithWitness(), newit);
     newit->vTxHashesIdx = vTxHashes.size() - 1;
 
     typedef std::pair<uint256, COutPoint> WithdrawPair;