diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-07-19 12:09:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-07-19 12:09:15 +0200 |
| commit | ca7550e128a3fa56baa129fc89d8000ba16a8ae5 (patch) | |
| tree | 931520ad5742b9a758a4bd9143fdfe96f180ab79 /src/primitives/transaction.cpp | |
| parent | doc: Clean out release notes (diff) | |
| parent | Rename "block cost" to "block weight" (diff) | |
| download | discoin-ca7550e128a3fa56baa129fc89d8000ba16a8ae5.tar.xz discoin-ca7550e128a3fa56baa129fc89d8000ba16a8ae5.zip | |
Merge #8363: Rename "block cost" to "block weight"
2c06bae Rename "block cost" to "block weight" (Suhas Daftuar)
Diffstat (limited to 'src/primitives/transaction.cpp')
| -rw-r--r-- | src/primitives/transaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 7f10409c0..8d6380564 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -121,7 +121,7 @@ unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const // Providing any more cleanup incentive than making additional inputs free would // risk encouraging people to create junk outputs to redeem later. if (nTxSize == 0) - nTxSize = (GetTransactionCost(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR; + nTxSize = (GetTransactionWeight(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR; for (std::vector<CTxIn>::const_iterator it(vin.begin()); it != vin.end(); ++it) { unsigned int offset = 41U + std::min(110U, (unsigned int)it->scriptSig.size()); @@ -149,7 +149,7 @@ std::string CTransaction::ToString() const return str; } -int64_t GetTransactionCost(const CTransaction& tx) +int64_t GetTransactionWeight(const CTransaction& tx) { return ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR -1) + ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); } |