diff options
| author | Antoine Poinsot <darosior@protonmail.com> | 2023-09-08 11:16:06 +0200 |
|---|---|---|
| committer | Antoine Poinsot <darosior@protonmail.com> | 2023-09-08 11:16:06 +0200 |
| commit | 8d6228fc1fe72db3ac38ab9c853be0256bed5f24 (patch) | |
| tree | b36fe39b64a24f2e4e813c9da22f6839d180f5ef /src | |
| parent | d2ccca253f4294b8f480e1d192913f4985a1af08 (diff) | |
| download | bitcoin-8d6228fc1fe72db3ac38ab9c853be0256bed5f24.tar.xz | |
consensus/validation.h: remove needless GetTransactionOutputWeight helper
Introduced in 9b7ec393b82ca9d7ada77d06e0835df0386a8b85. This copied the format of the other Get.*Weight helpers but it's useless for a CTxOut.
Diffstat (limited to 'src')
| -rw-r--r-- | src/consensus/validation.h | 4 | ||||
| -rw-r--r-- | src/wallet/spend.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/consensus/validation.h b/src/consensus/validation.h index 8fb638abcf..d5bf08cd61 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -158,10 +158,6 @@ static inline int64_t GetTransactionInputWeight(const CTxIn& txin) // scriptWitness size is added here because witnesses and txins are split up in segwit serialization. return ::GetSerializeSize(txin, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(txin, PROTOCOL_VERSION) + ::GetSerializeSize(txin.scriptWitness.stack, PROTOCOL_VERSION); } -static inline int64_t GetTransactionOutputWeight(const CTxOut& txout) -{ - return ::GetSerializeSize(txout, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(txout, PROTOCOL_VERSION); -} /** Compute at which vout of the block's coinbase transaction the witness commitment occurs, or -1 if not found */ inline int GetWitnessCommitmentIndex(const CBlock& block) diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp index 750b6c100b..fd7f279505 100644 --- a/src/wallet/spend.cpp +++ b/src/wallet/spend.cpp @@ -144,7 +144,7 @@ TxSize CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *walle if (is_segwit) weight += 2; // Add the size of the transaction outputs. - for (const auto& txo : tx.vout) weight += GetTransactionOutputWeight(txo); + for (const auto& txo : tx.vout) weight += GetSerializeSize(txo) * WITNESS_SCALE_FACTOR; // Add the size of the transaction inputs as if they were signed. for (uint32_t i = 0; i < txouts.size(); i++) { |