aboutsummaryrefslogtreecommitdiff
path: root/src/primitives
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2015-07-17 13:46:18 -0400
committerPieter Wuille <pieter.wuille@gmail.com>2015-07-20 11:17:53 -0400
commit9e38d0f7451092f6a16853a2b0a37b68a5b3c3fb (patch)
tree469af8922b6454945e160b99e118d35873470180 /src/primitives
parent89289d875da108c42ca013f33597eda46cb6eb53 (diff)
Separate core memory usage computation in core_memusage.h
Diffstat (limited to 'src/primitives')
-rw-r--r--src/primitives/transaction.cpp5
-rw-r--r--src/primitives/transaction.h9
2 files changed, 0 insertions, 14 deletions
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 7ed2d45973..606dbea798 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -72,11 +72,6 @@ void CTransaction::UpdateHash() const
*const_cast<uint256*>(&hash) = SerializeHash(*this);
}
-size_t CTransaction::DynamicMemoryUsage() const
-{
- return memusage::RecursiveDynamicUsage(vin) + memusage::RecursiveDynamicUsage(vout);
-}
-
CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0) { }
CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime) {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 77326c64b0..6cfd93a9a1 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -7,7 +7,6 @@
#define BITCOIN_PRIMITIVES_TRANSACTION_H
#include "amount.h"
-#include "memusage.h"
#include "script/script.h"
#include "serialize.h"
#include "uint256.h"
@@ -49,8 +48,6 @@ public:
}
std::string ToString() const;
-
- size_t DynamicMemoryUsage() const { return 0; }
};
/** An input of a transaction. It contains the location of the previous
@@ -99,8 +96,6 @@ public:
}
std::string ToString() const;
-
- size_t DynamicMemoryUsage() const { return scriptSig.DynamicMemoryUsage(); }
};
/** An output of a transaction. It contains the public key that the next input
@@ -171,8 +166,6 @@ public:
}
std::string ToString() const;
-
- size_t DynamicMemoryUsage() const { return scriptPubKey.DynamicMemoryUsage(); }
};
struct CMutableTransaction;
@@ -256,8 +249,6 @@ public:
}
std::string ToString() const;
-
- size_t DynamicMemoryUsage() const;
};
/** A mutable version of CTransaction. */