diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -115,7 +115,7 @@ AddTx(tx6_r, 1100 * SATOSHI, pool); AddTx(tx7_r, 9000 * SATOSHI, pool); pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); - pool.TrimToSize(GetVirtualTransactionSize(*tx1_r)); + pool.TrimToSize(GetSerializeSize(*tx1_r, PROTOCOL_VERSION)); } } diff --git a/src/policy/policy.h b/src/policy/policy.h --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -130,12 +130,4 @@ int64_t GetVirtualTransactionInputSize(const CTxIn &txin, int64_t nSigOpCost, unsigned int bytes_per_sigop); -static inline int64_t GetVirtualTransactionSize(const CTransaction &tx) { - return GetVirtualTransactionSize(tx, 0, 0); -} - -static inline int64_t GetVirtualTransactionInputSize(const CTxIn &txin) { - return GetVirtualTransactionInputSize(txin, 0, 0); -} - #endif // BITCOIN_POLICY_POLICY_H diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -301,9 +301,6 @@ "" + tr("Transaction ID") + ": " + rec->getTxID() + "
"; strHTML += "" + tr("Transaction total size") + ": " + QString::number(wtx.tx->GetTotalSize()) + " bytes
"; - strHTML += "" + tr("Transaction virtual size") + ": " + - QString::number(GetVirtualTransactionSize(*wtx.tx)) + - " bytes
"; strHTML += "" + tr("Output index") + ": " + QString::number(rec->getOutputIndex()) + "
"; diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -155,7 +155,7 @@ tx.vout[0].nValue = int64_t(5000000000LL - 1000 - 50000) * SATOSHI; TxId freeTxId = tx.GetId(); g_mempool.addUnchecked(freeTxId, entry.Fee(Amount::zero()).FromTx(tx)); - size_t freeTxSize = GetVirtualTransactionSize(CTransaction(tx)); + size_t freeTxSize = GetSerializeSize(tx, PROTOCOL_VERSION); // Calculate a fee on child transaction that will put the package just // below the block min tx fee (assuming 1 child tx of the same size). diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1699,7 +1699,7 @@ // implies that we can sign for every input. return -1; } - return GetVirtualTransactionSize(CTransaction(txNew)); + return GetSerializeSize(txNew, PROTOCOL_VERSION); } int CalculateMaximumSignedInputSize(const CTxOut &txout, const CWallet *wallet, @@ -1711,7 +1711,7 @@ // implies that we can sign for every input. return -1; } - return GetVirtualTransactionInputSize(txn.vin[0]); + return GetSerializeSize(txn.vin[0], PROTOCOL_VERSION); } void CWalletTx::GetAmounts(std::list &listReceived,