diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 16:52:14 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:27:20 +0200 |
| commit | fa477d32eefcc3dd2f06b452066290d9936d8c5d (patch) | |
| tree | 4cffc18bae9b48a17213ec50b0f9ef631e1d6cbb /src | |
| parent | fa2f6c1a611dffe5a3f63fe1b453f1dd420371b1 (diff) | |
| download | bitcoin-fa477d32eefcc3dd2f06b452066290d9936d8c5d.tar.xz | |
Remove ::GetVirtualTransactionSize() alias
Each alias is only used in one place.
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/psbt.cpp | 2 | ||||
| -rw-r--r-- | src/policy/settings.h | 16 | ||||
| -rw-r--r-- | src/test/fuzz/integer.cpp | 3 | ||||
| -rw-r--r-- | src/txmempool.cpp | 2 |
4 files changed, 2 insertions, 21 deletions
diff --git a/src/node/psbt.cpp b/src/node/psbt.cpp index 5a932f435d..57162cd679 100644 --- a/src/node/psbt.cpp +++ b/src/node/psbt.cpp @@ -137,7 +137,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx) if (success) { CTransaction ctx = CTransaction(mtx); - size_t size = GetVirtualTransactionSize(ctx, GetTransactionSigOpCost(ctx, view, STANDARD_SCRIPT_VERIFY_FLAGS)); + size_t size(GetVirtualTransactionSize(ctx, GetTransactionSigOpCost(ctx, view, STANDARD_SCRIPT_VERIFY_FLAGS), ::nBytesPerSigOp)); result.estimated_vsize = size; // Estimate fee rate CFeeRate feerate(fee, size); diff --git a/src/policy/settings.h b/src/policy/settings.h index 22af063b4c..f0d6f779ae 100644 --- a/src/policy/settings.h +++ b/src/policy/settings.h @@ -6,22 +6,6 @@ #ifndef BITCOIN_POLICY_SETTINGS_H #define BITCOIN_POLICY_SETTINGS_H -#include <policy/policy.h> - -#include <cstdint> - -class CTransaction; - extern unsigned int nBytesPerSigOp; -static inline int64_t GetVirtualTransactionSize(int64_t weight, int64_t sigop_cost) -{ - return GetVirtualTransactionSize(weight, sigop_cost, ::nBytesPerSigOp); -} - -static inline int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t sigop_cost) -{ - return GetVirtualTransactionSize(tx, sigop_cost, ::nBytesPerSigOp); -} - #endif // BITCOIN_POLICY_SETTINGS_H diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp index 72574612a2..c52fca5fe8 100644 --- a/src/test/fuzz/integer.cpp +++ b/src/test/fuzz/integer.cpp @@ -87,9 +87,6 @@ FUZZ_TARGET_INIT(integer, initialize_integer) } (void)GetSizeOfCompactSize(u64); (void)GetSpecialScriptSize(u32); - if (!MultiplicationOverflow(i64, static_cast<int64_t>(::nBytesPerSigOp)) && !AdditionOverflow(i64 * ::nBytesPerSigOp, static_cast<int64_t>(4))) { - (void)GetVirtualTransactionSize(i64, i64); - } if (!MultiplicationOverflow(i64, static_cast<int64_t>(u32)) && !AdditionOverflow(i64, static_cast<int64_t>(4)) && !AdditionOverflow(i64 * u32, static_cast<int64_t>(4))) { (void)GetVirtualTransactionSize(i64, i64, u32); } diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 4af4ca0851..37c6c62ea4 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -106,7 +106,7 @@ void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp) size_t CTxMemPoolEntry::GetTxSize() const { - return GetVirtualTransactionSize(nTxWeight, sigOpCost); + return GetVirtualTransactionSize(nTxWeight, sigOpCost, ::nBytesPerSigOp); } void CTxMemPool::UpdateForDescendants(txiter updateIt, cacheMap& cachedDescendants, |