DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Refactor GetTxid() into UpdateTxid() to match coding style of hash member variable.

Browse Source 
UpdateTxid() is called alongside UpdateHash() when a CTransaction is
deserialized or constructed.  GetTxid() now returns a const reference.
This commit is contained in:
Simon
2016-07-26 17:06:55 -07:00
parent 29306269f4
commit 07e6d5b025
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/primitives/transaction.cpp
View File

@@ -132,6 +132,7 @@ CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion
joinSplitPubKey(tx.joinSplitPubKey), joinSplitSig(tx.joinSplitSig)
{
UpdateHash();
UpdateTxid();
}
CTransaction& CTransaction::operator=(const CTransaction &tx) {
@@ -143,6 +144,7 @@ CTransaction& CTransaction::operator=(const CTransaction &tx) {
*const_cast<uint256*>(&joinSplitPubKey) = tx.joinSplitPubKey;
*const_cast<joinsplit_sig_t*>(&joinSplitSig) = tx.joinSplitSig;
*const_cast<uint256*>(&hash) = tx.hash;
*const_cast<uint256*>(&txid) = tx.txid;
return *this;
}
@@ -227,7 +229,7 @@ std::string CTransaction::ToString() const
// Return a txid which is non-malleable.
// Signature data is cleared before the transaction is serialized and hashed.
uint256 CTransaction::GetTxid() const
void CTransaction::UpdateTxid() const
{
// Create a deep copy of this transaction
CMutableTransaction tx(*this);
@@ -241,10 +243,9 @@ uint256 CTransaction::GetTxid() const
tx.joinSplitSig.assign(0);
// Return double SHA256 hash
return tx.GetSerializeHash();
*const_cast<uint256*>(&txid) = tx.GetSerializeHash();
}
// Return a txid which is non-malleable.
uint256 CMutableTransaction::GetTxid() const
{