diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-28 16:51:33 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-07 13:56:22 -0800 |
| commit | 657e05ab2e87ff725723fe8a375fc3f8aad02126 (patch) | |
| tree | e20cebbde1dee31d6d21dccdaa2223a5ca1566e3 /src/undo.h | |
| parent | fad9b66504f176ed3624515f3bf4d428cf687607 (diff) | |
Make GetSerializeSize a wrapper on top of CSizeComputer
Given that in default GetSerializeSize implementations created by
ADD_SERIALIZE_METHODS we're already using CSizeComputer(), get rid
of the specialized GetSerializeSize methods everywhere, and just use
CSizeComputer. This removes a lot of code which isn't actually used
anywhere.
For CCompactSize and CVarInt this actually removes a more efficient
size computing algorithm, which is brought back in a later commit.
Diffstat (limited to 'src/undo.h')
| -rw-r--r-- | src/undo.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/undo.h b/src/undo.h index d4fc84c90c..9d6f9bd0d0 100644 --- a/src/undo.h +++ b/src/undo.h @@ -27,12 +27,6 @@ public: CTxInUndo() : txout(), fCoinBase(false), nHeight(0), nVersion(0) {} CTxInUndo(const CTxOut &txoutIn, bool fCoinBaseIn = false, unsigned int nHeightIn = 0, int nVersionIn = 0) : txout(txoutIn), fCoinBase(fCoinBaseIn), nHeight(nHeightIn), nVersion(nVersionIn) { } - unsigned int GetSerializeSize(int nType, int nVersion) const { - return ::GetSerializeSize(VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion) + - (nHeight > 0 ? ::GetSerializeSize(VARINT(this->nVersion), nType, nVersion) : 0) + - ::GetSerializeSize(CTxOutCompressor(REF(txout)), nType, nVersion); - } - template<typename Stream> void Serialize(Stream &s, int nType, int nVersion) const { ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion); |