Rename GetHash() method to GetSerializeHash().

When pulling from upstream we are now forced to examine GetHash() usage
and replace with GetSerializeHash() if the caller wants a double SHA256
hash, or with GetTxid() if the caller wants a transaction id.
This commit is contained in:
Simon
2016-07-25 11:25:00 -07:00
parent 3574c9251f
commit 1e84d84d3a
2 changed files with 7 additions and 6 deletions

View File

@@ -116,7 +116,7 @@ CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.n
}
uint256 CMutableTransaction::GetHash() const
uint256 CMutableTransaction::GetSerializeHash() const
{
return SerializeHash(*this);
}
@@ -211,8 +211,9 @@ unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const
std::string CTransaction::ToString() const
{
std::string str;
str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n",
GetHash().ToString().substr(0,10),
str += strprintf("CTransaction(txid=%s, hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n",
GetTxid().ToString().substr(0,10),
GetSerializeHash().ToString().substr(0,10),
nVersion,
vin.size(),
vout.size(),
@@ -240,7 +241,7 @@ uint256 CTransaction::GetTxid() const
tx.joinSplitSig.assign(0);
// Return double SHA256 hash
return tx.GetHash();
return tx.GetSerializeHash();
}