aboutsummaryrefslogtreecommitdiff
path: root/src/txmempool.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-07-19 12:09:11 +0200
committerWladimir J. van der Laan <[email protected]>2016-07-19 12:09:15 +0200
commitca7550e128a3fa56baa129fc89d8000ba16a8ae5 (patch)
tree931520ad5742b9a758a4bd9143fdfe96f180ab79 /src/txmempool.cpp
parentdoc: Clean out release notes (diff)
parentRename "block cost" to "block weight" (diff)
downloaddiscoin-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/txmempool.cpp')
-rw-r--r--src/txmempool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index a48a6d946..691baa674 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -28,7 +28,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, const CAmount& _nFee,
hadNoDependencies(poolHasNoInputsOf), inChainInputValue(_inChainInputValue),
spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp)
{
- nTxCost = GetTransactionCost(_tx);
+ nTxWeight = GetTransactionWeight(_tx);
nModSize = _tx.CalculateModifiedSize(GetTxSize());
nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
@@ -75,7 +75,7 @@ void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp)
size_t CTxMemPoolEntry::GetTxSize() const
{
- return GetVirtualTransactionSize(nTxCost);
+ return GetVirtualTransactionSize(nTxWeight);
}
// Update the given tx for any in-mempool descendants.