kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Get rid of nType and nVersion 

Remove the nType and nVersion as parameters to all serialization methods
and functions. There is only one place where it's read and has an impact
(in CAddress), and even there it does not impact any of the recursively
invoked serializers.

Instead, the few places that need nType or nVersion are changed to read
it directly from the stream object, through GetType() and GetVersion()
methods which are added to all stream classes.
0.14
Pieter Wuille 8 years ago
parent
657e05ab2e
commit
528472111b
36 changed files with 304 additions and 280 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/addrdb.h
  2. 6
      src/addrman.h
  3. 2
      src/amount.h
  4. 10
      src/blockencodings.h
  5. 2
      src/bloom.h
  6. 9
      src/chain.h
  7. 24
      src/coins.h
  8. 6
      src/compressor.h
  9. 5
      src/hash.h
  10. 4
      src/key.h
  11. 4
      src/merkleblock.h
  12. 2
      src/net.h
  13. 6
      src/netaddress.h
  14. 9
      src/primitives/block.h
  15. 22
      src/primitives/transaction.h
  16. 13
      src/protocol.h
  17. 8
      src/pubkey.h
  18. 2
      src/qt/recentrequeststablemodel.h
  19. 2
      src/qt/walletmodel.h
  20. 2
      src/rest.cpp
  21. 4
      src/script/bitcoinconsensus.cpp
  22. 30
      src/script/interpreter.cpp
  23. 256
      src/serialize.h
  24. 34
      src/streams.h
  25. 2
      src/test/blockencodings_tests.cpp
  26. 6
      src/test/bloom_tests.cpp
  27. 2
      src/test/dbwrapper_tests.cpp
  28. 8
      src/test/net_tests.cpp
  29. 4
      src/test/serialize_tests.cpp
  30. 38
      src/test/uint256_tests.cpp
  31. 2
      src/txdb.h
  32. 4
      src/uint256.h
  33. 20
      src/undo.h
  34. 2
      src/wallet/crypter.h
  35. 28
      src/wallet/wallet.h
  36. 4
      src/wallet/walletdb.h

2
src/addrdb.h
Unescape View File

@ -46,7 +46,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(this->nVersion); READWRITE(this->nVersion);
READWRITE(nCreateTime); READWRITE(nCreateTime);
READWRITE(nBanUntil); READWRITE(nBanUntil);

6
src/addrman.h
Unescape View File

@ -58,7 +58,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(*(CAddress*)this); READWRITE(*(CAddress*)this);
READWRITE(source); READWRITE(source);
READWRITE(nLastSuccess); READWRITE(nLastSuccess);
@ -293,7 +293,7 @@ public:
* very little in common. * very little in common.
*/ */
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int nType, int nVersionDummy) const void Serialize(Stream &s) const
{ {
LOCK(cs); LOCK(cs);
@ -343,7 +343,7 @@ public:
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int nType, int nVersionDummy) void Unserialize(Stream& s)
{ {
LOCK(cs); LOCK(cs);

2
src/amount.h
Unescape View File

@ -64,7 +64,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(nSatoshisPerK); READWRITE(nSatoshisPerK);
} }
}; };

10
src/blockencodings.h
Unescape View File

@ -21,7 +21,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(tx); //TODO: Compress tx encoding READWRITE(tx); //TODO: Compress tx encoding
} }
}; };
@ -35,7 +35,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(blockhash); READWRITE(blockhash);
uint64_t indexes_size = (uint64_t)indexes.size(); uint64_t indexes_size = (uint64_t)indexes.size();
READWRITE(COMPACTSIZE(indexes_size)); READWRITE(COMPACTSIZE(indexes_size));
@ -81,7 +81,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(blockhash); READWRITE(blockhash);
uint64_t txn_size = (uint64_t)txn.size(); uint64_t txn_size = (uint64_t)txn.size();
READWRITE(COMPACTSIZE(txn_size)); READWRITE(COMPACTSIZE(txn_size));
@ -109,7 +109,7 @@ struct PrefilledTransaction {
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
uint64_t idx = index; uint64_t idx = index;
READWRITE(COMPACTSIZE(idx)); READWRITE(COMPACTSIZE(idx));
if (idx > std::numeric_limits<uint16_t>::max()) if (idx > std::numeric_limits<uint16_t>::max())
@ -155,7 +155,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(header); READWRITE(header);
READWRITE(nonce); READWRITE(nonce);

2
src/bloom.h
Unescape View File

@ -73,7 +73,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(vData); READWRITE(vData);
READWRITE(nHashFuncs); READWRITE(nHashFuncs);
READWRITE(nTweak); READWRITE(nTweak);

9
src/chain.h
Unescape View File

@ -28,7 +28,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(VARINT(nBlocks)); READWRITE(VARINT(nBlocks));
READWRITE(VARINT(nSize)); READWRITE(VARINT(nSize));
READWRITE(VARINT(nUndoSize)); READWRITE(VARINT(nUndoSize));
@ -76,7 +76,7 @@ struct CDiskBlockPos
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(VARINT(nFile)); READWRITE(VARINT(nFile));
READWRITE(VARINT(nPos)); READWRITE(VARINT(nPos));
} }
@ -357,8 +357,9 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(VARINT(nVersion)); READWRITE(VARINT(nVersion));
READWRITE(VARINT(nHeight)); READWRITE(VARINT(nHeight));

24
src/coins.h
Unescape View File

@ -154,7 +154,7 @@ public:
} }
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int nType, int nVersion) const { void Serialize(Stream &s) const {
unsigned int nMaskSize = 0, nMaskCode = 0; unsigned int nMaskSize = 0, nMaskCode = 0;
CalcMaskSize(nMaskSize, nMaskCode); CalcMaskSize(nMaskSize, nMaskCode);
bool fFirst = vout.size() > 0 && !vout[0].IsNull(); bool fFirst = vout.size() > 0 && !vout[0].IsNull();
@ -162,33 +162,33 @@ public:
assert(fFirst || fSecond || nMaskCode); assert(fFirst || fSecond || nMaskCode);
unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0); unsigned int nCode = 8*(nMaskCode - (fFirst || fSecond ? 0 : 1)) + (fCoinBase ? 1 : 0) + (fFirst ? 2 : 0) + (fSecond ? 4 : 0);
// version // version
::Serialize(s, VARINT(this->nVersion), nType, nVersion); ::Serialize(s, VARINT(this->nVersion));
// header code // header code
::Serialize(s, VARINT(nCode), nType, nVersion); ::Serialize(s, VARINT(nCode));
// spentness bitmask // spentness bitmask
for (unsigned int b = 0; b<nMaskSize; b++) { for (unsigned int b = 0; b<nMaskSize; b++) {
unsigned char chAvail = 0; unsigned char chAvail = 0;
for (unsigned int i = 0; i < 8 && 2+b*8+i < vout.size(); i++) for (unsigned int i = 0; i < 8 && 2+b*8+i < vout.size(); i++)
if (!vout[2+b*8+i].IsNull()) if (!vout[2+b*8+i].IsNull())
chAvail |= (1 << i); chAvail |= (1 << i);
::Serialize(s, chAvail, nType, nVersion); ::Serialize(s, chAvail);
} }
// txouts themself // txouts themself
for (unsigned int i = 0; i < vout.size(); i++) { for (unsigned int i = 0; i < vout.size(); i++) {
if (!vout[i].IsNull()) if (!vout[i].IsNull())
::Serialize(s, CTxOutCompressor(REF(vout[i])), nType, nVersion); ::Serialize(s, CTxOutCompressor(REF(vout[i])));
} }
// coinbase height // coinbase height
::Serialize(s, VARINT(nHeight), nType, nVersion); ::Serialize(s, VARINT(nHeight));
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream &s, int nType, int nVersion) { void Unserialize(Stream &s) {
unsigned int nCode = 0; unsigned int nCode = 0;
// version // version
::Unserialize(s, VARINT(this->nVersion), nType, nVersion); ::Unserialize(s, VARINT(this->nVersion));
// header code // header code
::Unserialize(s, VARINT(nCode), nType, nVersion); ::Unserialize(s, VARINT(nCode));
fCoinBase = nCode & 1; fCoinBase = nCode & 1;
std::vector<bool> vAvail(2, false); std::vector<bool> vAvail(2, false);
vAvail[0] = (nCode & 2) != 0; vAvail[0] = (nCode & 2) != 0;
@ -197,7 +197,7 @@ public:
// spentness bitmask // spentness bitmask
while (nMaskCode > 0) { while (nMaskCode > 0) {
unsigned char chAvail = 0; unsigned char chAvail = 0;
::Unserialize(s, chAvail, nType, nVersion); ::Unserialize(s, chAvail);
for (unsigned int p = 0; p < 8; p++) { for (unsigned int p = 0; p < 8; p++) {
bool f = (chAvail & (1 << p)) != 0; bool f = (chAvail & (1 << p)) != 0;
vAvail.push_back(f); vAvail.push_back(f);
@ -209,10 +209,10 @@ public:
vout.assign(vAvail.size(), CTxOut()); vout.assign(vAvail.size(), CTxOut());
for (unsigned int i = 0; i < vAvail.size(); i++) { for (unsigned int i = 0; i < vAvail.size(); i++) {
if (vAvail[i]) if (vAvail[i])
::Unserialize(s, REF(CTxOutCompressor(vout[i])), nType, nVersion); ::Unserialize(s, REF(CTxOutCompressor(vout[i])));
} }
// coinbase height // coinbase height
::Unserialize(s, VARINT(nHeight), nType, nVersion); ::Unserialize(s, VARINT(nHeight));
Cleanup(); Cleanup();
} }

6
src/compressor.h
Unescape View File

@ -56,7 +56,7 @@ public:
CScriptCompressor(CScript &scriptIn) : script(scriptIn) { } CScriptCompressor(CScript &scriptIn) : script(scriptIn) { }
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int nType, int nVersion) const { void Serialize(Stream &s) const {
std::vector<unsigned char> compr; std::vector<unsigned char> compr;
if (Compress(compr)) { if (Compress(compr)) {
s << CFlatData(compr); s << CFlatData(compr);
@ -68,7 +68,7 @@ public:
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream &s, int nType, int nVersion) { void Unserialize(Stream &s) {
unsigned int nSize = 0; unsigned int nSize = 0;
s >> VARINT(nSize); s >> VARINT(nSize);
if (nSize < nSpecialScripts) { if (nSize < nSpecialScripts) {
@ -104,7 +104,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!ser_action.ForRead()) { if (!ser_action.ForRead()) {
uint64_t nVal = CompressAmount(txout.nValue); uint64_t nVal = CompressAmount(txout.nValue);
READWRITE(VARINT(nVal)); READWRITE(VARINT(nVal));

5
src/hash.h
Unescape View File

@ -138,6 +138,9 @@ public:
CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {} CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {}
int GetType() const { return nType; }
int GetVersion() const { return nVersion; }
void write(const char *pch, size_t size) { void write(const char *pch, size_t size) {
ctx.Write((const unsigned char*)pch, size); ctx.Write((const unsigned char*)pch, size);
} }
@ -152,7 +155,7 @@ public:
template<typename T> template<typename T>
CHashWriter& operator<<(const T& obj) { CHashWriter& operator<<(const T& obj) {
// Serialize to this stream // Serialize to this stream
::Serialize(*this, obj, nType, nVersion); ::Serialize(*this, obj);
return (*this); return (*this);
} }
}; };

4
src/key.h
Unescape View File

@ -162,7 +162,7 @@ struct CExtKey {
CExtPubKey Neuter() const; CExtPubKey Neuter() const;
void SetMaster(const unsigned char* seed, unsigned int nSeedLen); void SetMaster(const unsigned char* seed, unsigned int nSeedLen);
template <typename Stream> template <typename Stream>
void Serialize(Stream& s, int nType, int nVersion) const void Serialize(Stream& s) const
{ {
unsigned int len = BIP32_EXTKEY_SIZE; unsigned int len = BIP32_EXTKEY_SIZE;
::WriteCompactSize(s, len); ::WriteCompactSize(s, len);
@ -171,7 +171,7 @@ struct CExtKey {
s.write((const char *)&code[0], len); s.write((const char *)&code[0], len);
} }
template <typename Stream> template <typename Stream>
void Unserialize(Stream& s, int nType, int nVersion) void Unserialize(Stream& s)
{ {
unsigned int len = ::ReadCompactSize(s); unsigned int len = ::ReadCompactSize(s);
unsigned char code[BIP32_EXTKEY_SIZE]; unsigned char code[BIP32_EXTKEY_SIZE];

4
src/merkleblock.h
Unescape View File

@ -85,7 +85,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(nTransactions); READWRITE(nTransactions);
READWRITE(vHash); READWRITE(vHash);
std::vector<unsigned char> vBytes; std::vector<unsigned char> vBytes;
@ -148,7 +148,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(header); READWRITE(header);
READWRITE(txn); READWRITE(txn);
} }

2
src/net.h
Unescape View File

@ -140,7 +140,7 @@ public:
void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args) void PushMessageWithVersionAndFlag(CNode* pnode, int nVersion, int flag, const std::string& sCommand, Args&&... args)
{ {
auto msg(BeginMessage(pnode, nVersion, flag, sCommand)); auto msg(BeginMessage(pnode, nVersion, flag, sCommand));
::SerializeMany(msg, msg.GetType(), msg.GetVersion(), std::forward<Args>(args)...); ::SerializeMany(msg, std::forward<Args>(args)...);
EndMessage(msg); EndMessage(msg);
PushMessage(pnode, msg, sCommand); PushMessage(pnode, msg, sCommand);
} }

6
src/netaddress.h
Unescape View File

@ -85,7 +85,7 @@ class CNetAddr
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(FLATDATA(ip)); READWRITE(FLATDATA(ip));
} }
@ -122,7 +122,7 @@ class CSubNet
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(network); READWRITE(network);
READWRITE(FLATDATA(netmask)); READWRITE(FLATDATA(netmask));
READWRITE(FLATDATA(valid)); READWRITE(FLATDATA(valid));
@ -159,7 +159,7 @@ class CService : public CNetAddr
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(FLATDATA(ip)); READWRITE(FLATDATA(ip));
unsigned short portN = htons(port); unsigned short portN = htons(port);
READWRITE(FLATDATA(portN)); READWRITE(FLATDATA(portN));

9
src/primitives/block.h
Unescape View File

@ -36,7 +36,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(this->nVersion); READWRITE(this->nVersion);
READWRITE(hashPrevBlock); READWRITE(hashPrevBlock);
READWRITE(hashMerkleRoot); READWRITE(hashMerkleRoot);
@ -92,7 +92,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(*(CBlockHeader*)this); READWRITE(*(CBlockHeader*)this);
READWRITE(vtx); READWRITE(vtx);
} }
@ -137,8 +137,9 @@ struct CBlockLocator
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(vHave); READWRITE(vHave);
} }

22
src/primitives/transaction.h
Unescape View File

@ -28,7 +28,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(hash); READWRITE(hash);
READWRITE(n); READWRITE(n);
} }
@ -104,7 +104,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(prevout); READWRITE(prevout);
READWRITE(*(CScriptBase*)(&scriptSig)); READWRITE(*(CScriptBase*)(&scriptSig));
READWRITE(nSequence); READWRITE(nSequence);
@ -144,7 +144,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(nValue); READWRITE(nValue);
READWRITE(*(CScriptBase*)(&scriptPubKey)); READWRITE(*(CScriptBase*)(&scriptPubKey));
} }
@ -219,7 +219,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
READWRITE(scriptWitness.stack); READWRITE(scriptWitness.stack);
} }
@ -255,7 +255,7 @@ public:
} }
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
for (size_t n = 0; n < vtxinwit.size(); n++) { for (size_t n = 0; n < vtxinwit.size(); n++) {
READWRITE(vtxinwit[n]); READWRITE(vtxinwit[n]);
@ -287,8 +287,8 @@ struct CMutableTransaction;
* - uint32_t nLockTime * - uint32_t nLockTime
*/ */
template<typename Stream, typename Operation, typename TxType> template<typename Stream, typename Operation, typename TxType>
inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializeTransaction(TxType& tx, Stream& s, Operation ser_action) {
const bool fAllowWitness = !(nVersion & SERIALIZE_TRANSACTION_NO_WITNESS); const bool fAllowWitness = !(s.GetVersion() & SERIALIZE_TRANSACTION_NO_WITNESS);
READWRITE(*const_cast<int32_t*>(&tx.nVersion)); READWRITE(*const_cast<int32_t*>(&tx.nVersion));
unsigned char flags = 0; unsigned char flags = 0;
@ -385,8 +385,8 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
SerializeTransaction(*this, s, ser_action, nType, nVersion); SerializeTransaction(*this, s, ser_action);
if (ser_action.ForRead()) { if (ser_action.ForRead()) {
UpdateHash(); UpdateHash();
} }
@ -456,8 +456,8 @@ struct CMutableTransaction
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
SerializeTransaction(*this, s, ser_action, nType, nVersion); SerializeTransaction(*this, s, ser_action);
} }
/** Compute the hash of this CMutableTransaction. This is computed on the /** Compute the hash of this CMutableTransaction. This is computed on the

13
src/protocol.h
Unescape View File

@ -48,7 +48,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
READWRITE(FLATDATA(pchMessageStart)); READWRITE(FLATDATA(pchMessageStart));
READWRITE(FLATDATA(pchCommand)); READWRITE(FLATDATA(pchCommand));
@ -289,14 +289,15 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
if (ser_action.ForRead()) if (ser_action.ForRead())
Init(); Init();
if (nType & SER_DISK) int nVersion = s.GetVersion();
if (s.GetType() & SER_DISK)
READWRITE(nVersion); READWRITE(nVersion);
if ((nType & SER_DISK) || if ((s.GetType() & SER_DISK) ||
(nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH))) (nVersion >= CADDR_TIME_VERSION && !(s.GetType() & SER_GETHASH)))
READWRITE(nTime); READWRITE(nTime);
uint64_t nServicesInt = nServices; uint64_t nServicesInt = nServices;
READWRITE(nServicesInt); READWRITE(nServicesInt);
@ -343,7 +344,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
READWRITE(type); READWRITE(type);
READWRITE(hash); READWRITE(hash);

8
src/pubkey.h
Unescape View File

@ -117,14 +117,14 @@ public:
//! Implement serialization, as if this was a byte vector. //! Implement serialization, as if this was a byte vector.
template <typename Stream> template <typename Stream>
void Serialize(Stream& s, int nType, int nVersion) const void Serialize(Stream& s) const
{ {
unsigned int len = size(); unsigned int len = size();
::WriteCompactSize(s, len); ::WriteCompactSize(s, len);
s.write((char*)vch, len); s.write((char*)vch, len);
} }
template <typename Stream> template <typename Stream>
void Unserialize(Stream& s, int nType, int nVersion) void Unserialize(Stream& s)
{ {
unsigned int len = ::ReadCompactSize(s); unsigned int len = ::ReadCompactSize(s);
if (len <= 65) { if (len <= 65) {
@ -211,7 +211,7 @@ struct CExtPubKey {
bool Derive(CExtPubKey& out, unsigned int nChild) const; bool Derive(CExtPubKey& out, unsigned int nChild) const;
template <typename Stream> template <typename Stream>
void Serialize(Stream& s, int nType, int nVersion) const void Serialize(Stream& s) const
{ {
unsigned int len = BIP32_EXTKEY_SIZE; unsigned int len = BIP32_EXTKEY_SIZE;
::WriteCompactSize(s, len); ::WriteCompactSize(s, len);
@ -220,7 +220,7 @@ struct CExtPubKey {
s.write((const char *)&code[0], len); s.write((const char *)&code[0], len);
} }
template <typename Stream> template <typename Stream>
void Unserialize(Stream& s, int nType, int nVersion) void Unserialize(Stream& s)
{ {
unsigned int len = ::ReadCompactSize(s); unsigned int len = ::ReadCompactSize(s);
unsigned char code[BIP32_EXTKEY_SIZE]; unsigned char code[BIP32_EXTKEY_SIZE];

2
src/qt/recentrequeststablemodel.h
Unescape View File

@ -27,7 +27,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
unsigned int nDate = date.toTime_t(); unsigned int nDate = date.toTime_t();
READWRITE(this->nVersion); READWRITE(this->nVersion);

2
src/qt/walletmodel.h
Unescape View File

@ -65,7 +65,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
std::string sAddress = address.toStdString(); std::string sAddress = address.toStdString();
std::string sLabel = label.toStdString(); std::string sLabel = label.toStdString();
std::string sMessage = message.toStdString(); std::string sMessage = message.toStdString();

2
src/rest.cpp
Unescape View File

@ -50,7 +50,7 @@ struct CCoin {
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
READWRITE(nTxVer); READWRITE(nTxVer);
READWRITE(nHeight); READWRITE(nHeight);

4
src/script/bitcoinconsensus.cpp
Unescape View File

@ -42,10 +42,12 @@ public:
template<typename T> template<typename T>
TxInputStream& operator>>(T& obj) TxInputStream& operator>>(T& obj)
{ {
::Unserialize(*this, obj, m_type, m_version); ::Unserialize(*this, obj);
return *this; return *this;
} }
int GetVersion() const { return m_version; }
int GetType() const { return m_type; }
private: private:
const int m_type; const int m_type;
const int m_version; const int m_version;

30
src/script/interpreter.cpp
Unescape View File

@ -1069,7 +1069,7 @@ public:
/** Serialize the passed scriptCode, skipping OP_CODESEPARATORs */ /** Serialize the passed scriptCode, skipping OP_CODESEPARATORs */
template<typename S> template<typename S>
void SerializeScriptCode(S &s, int nType, int nVersion) const { void SerializeScriptCode(S &s) const {
CScript::const_iterator it = scriptCode.begin(); CScript::const_iterator it = scriptCode.begin();
CScript::const_iterator itBegin = it; CScript::const_iterator itBegin = it;
opcodetype opcode; opcodetype opcode;
@ -1092,53 +1092,53 @@ public:
/** Serialize an input of txTo */ /** Serialize an input of txTo */
template<typename S> template<typename S>
void SerializeInput(S &s, unsigned int nInput, int nType, int nVersion) const { void SerializeInput(S &s, unsigned int nInput) const {
// In case of SIGHASH_ANYONECANPAY, only the input being signed is serialized // In case of SIGHASH_ANYONECANPAY, only the input being signed is serialized
if (fAnyoneCanPay) if (fAnyoneCanPay)
nInput = nIn; nInput = nIn;
// Serialize the prevout // Serialize the prevout
::Serialize(s, txTo.vin[nInput].prevout, nType, nVersion); ::Serialize(s, txTo.vin[nInput].prevout);
// Serialize the script // Serialize the script
if (nInput != nIn) if (nInput != nIn)
// Blank out other inputs' signatures // Blank out other inputs' signatures
::Serialize(s, CScriptBase(), nType, nVersion); ::Serialize(s, CScriptBase());
else else
SerializeScriptCode(s, nType, nVersion); SerializeScriptCode(s);
// Serialize the nSequence // Serialize the nSequence
if (nInput != nIn && (fHashSingle || fHashNone)) if (nInput != nIn && (fHashSingle || fHashNone))
// let the others update at will // let the others update at will
::Serialize(s, (int)0, nType, nVersion); ::Serialize(s, (int)0);
else else
::Serialize(s, txTo.vin[nInput].nSequence, nType, nVersion); ::Serialize(s, txTo.vin[nInput].nSequence);
} }
/** Serialize an output of txTo */ /** Serialize an output of txTo */
template<typename S> template<typename S>
void SerializeOutput(S &s, unsigned int nOutput, int nType, int nVersion) const { void SerializeOutput(S &s, unsigned int nOutput) const {
if (fHashSingle && nOutput != nIn) if (fHashSingle && nOutput != nIn)
// Do not lock-in the txout payee at other indices as txin // Do not lock-in the txout payee at other indices as txin
::Serialize(s, CTxOut(), nType, nVersion); ::Serialize(s, CTxOut());
else else
::Serialize(s, txTo.vout[nOutput], nType, nVersion); ::Serialize(s, txTo.vout[nOutput]);
} }
/** Serialize txTo */ /** Serialize txTo */
template<typename S> template<typename S>
void Serialize(S &s, int nType, int nVersion) const { void Serialize(S &s) const {
// Serialize nVersion // Serialize nVersion
::Serialize(s, txTo.nVersion, nType, nVersion); ::Serialize(s, txTo.nVersion);
// Serialize vin // Serialize vin
unsigned int nInputs = fAnyoneCanPay ? 1 : txTo.vin.size(); unsigned int nInputs = fAnyoneCanPay ? 1 : txTo.vin.size();
::WriteCompactSize(s, nInputs); ::WriteCompactSize(s, nInputs);
for (unsigned int nInput = 0; nInput < nInputs; nInput++) for (unsigned int nInput = 0; nInput < nInputs; nInput++)
SerializeInput(s, nInput, nType, nVersion); SerializeInput(s, nInput);
// Serialize vout // Serialize vout
unsigned int nOutputs = fHashNone ? 0 : (fHashSingle ? nIn+1 : txTo.vout.size()); unsigned int nOutputs = fHashNone ? 0 : (fHashSingle ? nIn+1 : txTo.vout.size());
::WriteCompactSize(s, nOutputs); ::WriteCompactSize(s, nOutputs);
for (unsigned int nOutput = 0; nOutput < nOutputs; nOutput++) for (unsigned int nOutput = 0; nOutput < nOutputs; nOutput++)
SerializeOutput(s, nOutput, nType, nVersion); SerializeOutput(s, nOutput);
// Serialize nLockTime // Serialize nLockTime
::Serialize(s, txTo.nLockTime, nType, nVersion); ::Serialize(s, txTo.nLockTime);
} }
}; };

256
src/serialize.h
Unescape View File

@ -159,8 +159,8 @@ enum
SER_GETHASH = (1 << 2), SER_GETHASH = (1 << 2),
}; };
#define READWRITE(obj) (::SerReadWrite(s, (obj), nType, nVersion, ser_action)) #define READWRITE(obj) (::SerReadWrite(s, (obj), ser_action))
#define READWRITEMANY(...) (::SerReadWriteMany(s, nType, nVersion, ser_action, __VA_ARGS__)) #define READWRITEMANY(...) (::SerReadWriteMany(s, ser_action, __VA_ARGS__))
/** /**
* Implement three methods for serializable objects. These are actually wrappers over * Implement three methods for serializable objects. These are actually wrappers over
@ -168,45 +168,42 @@ enum
* code. Adding "ADD_SERIALIZE_METHODS" in the body of the class causes these wrappers to be * code. Adding "ADD_SERIALIZE_METHODS" in the body of the class causes these wrappers to be
* added as members. * added as members.
*/ */
#define ADD_SERIALIZE_METHODS \ #define ADD_SERIALIZE_METHODS \
template<typename Stream> \ template<typename Stream> \
void Serialize(Stream& s, int nType, int nVersion) const { \ void Serialize(Stream& s) const { \
NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize(), nType, nVersion);\ NCONST_PTR(this)->SerializationOp(s, CSerActionSerialize()); \
} \ } \
template<typename Stream> \ template<typename Stream> \
void Unserialize(Stream& s, int nType, int nVersion) { \ void Unserialize(Stream& s) { \
SerializationOp(s, CSerActionUnserialize(), nType, nVersion); \ SerializationOp(s, CSerActionUnserialize()); \
} }
/* template<typename Stream> inline void Serialize(Stream& s, char a ) { ser_writedata8(s, a); } // TODO Get rid of bare char
* Basic Types template<typename Stream> inline void Serialize(Stream& s, int8_t a ) { ser_writedata8(s, a); }
*/ template<typename Stream> inline void Serialize(Stream& s, uint8_t a ) { ser_writedata8(s, a); }
template<typename Stream> inline void Serialize(Stream& s, char a, int, int=0) { ser_writedata8(s, a); } // TODO Get rid of bare char template<typename Stream> inline void Serialize(Stream& s, int16_t a ) { ser_writedata16(s, a); }
template<typename Stream> inline void Serialize(Stream& s, int8_t a, int, int=0) { ser_writedata8(s, a); } template<typename Stream> inline void Serialize(Stream& s, uint16_t a) { ser_writedata16(s, a); }
template<typename Stream> inline void Serialize(Stream& s, uint8_t a, int, int=0) { ser_writedata8(s, a); } template<typename Stream> inline void Serialize(Stream& s, int32_t a ) { ser_writedata32(s, a); }
template<typename Stream> inline void Serialize(Stream& s, int16_t a, int, int=0) { ser_writedata16(s, a); } template<typename Stream> inline void Serialize(Stream& s, uint32_t a) { ser_writedata32(s, a); }
template<typename Stream> inline void Serialize(Stream& s, uint16_t a, int, int=0) { ser_writedata16(s, a); } template<typename Stream> inline void Serialize(Stream& s, int64_t a ) { ser_writedata64(s, a); }
template<typename Stream> inline void Serialize(Stream& s, int32_t a, int, int=0) { ser_writedata32(s, a); } template<typename Stream> inline void Serialize(Stream& s, uint64_t a) { ser_writedata64(s, a); }
template<typename Stream> inline void Serialize(Stream& s, uint32_t a, int, int=0) { ser_writedata32(s, a); } template<typename Stream> inline void Serialize(Stream& s, float a ) { ser_writedata32(s, ser_float_to_uint32(a)); }
template<typename Stream> inline void Serialize(Stream& s, int64_t a, int, int=0) { ser_writedata64(s, a); } template<typename Stream> inline void Serialize(Stream& s, double a ) { ser_writedata64(s, ser_double_to_uint64(a)); }
template<typename Stream> inline void Serialize(Stream& s, uint64_t a, int, int=0) { ser_writedata64(s, a); }
template<typename Stream> inline void Serialize(Stream& s, float a, int, int=0) { ser_writedata32(s, ser_float_to_uint32(a)); }
template<typename Stream> inline void Serialize(Stream& s, double a, int, int=0) { ser_writedata64(s, ser_double_to_uint64(a)); }
template<typename Stream> inline void Unserialize(Stream& s, char& a, int, int=0) { a = ser_readdata8(s); } // TODO Get rid of bare char template<typename Stream> inline void Unserialize(Stream& s, char& a ) { a = ser_readdata8(s); } // TODO Get rid of bare char
template<typename Stream> inline void Unserialize(Stream& s, int8_t& a, int, int=0) { a = ser_readdata8(s); } template<typename Stream> inline void Unserialize(Stream& s, int8_t& a ) { a = ser_readdata8(s); }
template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a, int, int=0) { a = ser_readdata8(s); } template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a ) { a = ser_readdata8(s); }
template<typename Stream> inline void Unserialize(Stream& s, int16_t& a, int, int=0) { a = ser_readdata16(s); } template<typename Stream> inline void Unserialize(Stream& s, int16_t& a ) { a = ser_readdata16(s); }
template<typename Stream> inline void Unserialize(Stream& s, uint16_t& a, int, int=0) { a = ser_readdata16(s); } template<typename Stream> inline void Unserialize(Stream& s, uint16_t& a) { a = ser_readdata16(s); }
template<typename Stream> inline void Unserialize(Stream& s, int32_t& a, int, int=0) { a = ser_readdata32(s); } template<typename Stream> inline void Unserialize(Stream& s, int32_t& a ) { a = ser_readdata32(s); }
template<typename Stream> inline void Unserialize(Stream& s, uint32_t& a, int, int=0) { a = ser_readdata32(s); } template<typename Stream> inline void Unserialize(Stream& s, uint32_t& a) { a = ser_readdata32(s); }
template<typename Stream> inline void Unserialize(Stream& s, int64_t& a, int, int=0) { a = ser_readdata64(s); } template<typename Stream> inline void Unserialize(Stream& s, int64_t& a ) { a = ser_readdata64(s); }
template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a, int, int=0) { a = ser_readdata64(s); } template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a) { a = ser_readdata64(s); }
template<typename Stream> inline void Unserialize(Stream& s, float& a, int, int=0) { a = ser_uint32_to_float(ser_readdata32(s)); } template<typename Stream> inline void Unserialize(Stream& s, float& a ) { a = ser_uint32_to_float(ser_readdata32(s)); }
template<typename Stream> inline void Unserialize(Stream& s, double& a, int, int=0) { a = ser_uint64_to_double(ser_readdata64(s)); } template<typename Stream> inline void Unserialize(Stream& s, double& a ) { a = ser_uint64_to_double(ser_readdata64(s)); }
template<typename Stream> inline void Serialize(Stream& s, bool a, int, int=0) { char f=a; ser_writedata8(s, f); } template<typename Stream> inline void Serialize(Stream& s, bool a) { char f=a; ser_writedata8(s, f); }
template<typename Stream> inline void Unserialize(Stream& s, bool& a, int, int=0) { char f=ser_readdata8(s); a=f; } template<typename Stream> inline void Unserialize(Stream& s, bool& a) { char f=ser_readdata8(s); a=f; }
@ -386,13 +383,13 @@ public:
const char* end() const { return pend; } const char* end() const { return pend; }
template<typename Stream> template<typename Stream>
void Serialize(Stream& s, int, int=0) const void Serialize(Stream& s) const
{ {
s.write(pbegin, pend - pbegin); s.write(pbegin, pend - pbegin);
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int, int=0) void Unserialize(Stream& s)
{ {
s.read(pbegin, pend - pbegin); s.read(pbegin, pend - pbegin);
} }
@ -407,12 +404,12 @@ public:
CVarInt(I& nIn) : n(nIn) { } CVarInt(I& nIn) : n(nIn) { }
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int, int) const { void Serialize(Stream &s) const {
WriteVarInt<Stream,I>(s, n); WriteVarInt<Stream,I>(s, n);
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int, int) { void Unserialize(Stream& s) {
n = ReadVarInt<Stream,I>(s); n = ReadVarInt<Stream,I>(s);
} }
}; };
@ -425,12 +422,12 @@ public:
CCompactSize(uint64_t& nIn) : n(nIn) { } CCompactSize(uint64_t& nIn) : n(nIn) { }
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int, int) const { void Serialize(Stream &s) const {
WriteCompactSize<Stream>(s, n); WriteCompactSize<Stream>(s, n);
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int, int) { void Unserialize(Stream& s) {
n = ReadCompactSize<Stream>(s); n = ReadCompactSize<Stream>(s);
} }
}; };
@ -444,7 +441,7 @@ public:
LimitedString(std::string& string) : string(string) {} LimitedString(std::string& string) : string(string) {}
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int, int=0) void Unserialize(Stream& s)
{ {
size_t size = ReadCompactSize(s); size_t size = ReadCompactSize(s);
if (size > Limit) { if (size > Limit) {
@ -456,7 +453,7 @@ public:
} }
template<typename Stream> template<typename Stream>
void Serialize(Stream& s, int, int=0) const void Serialize(Stream& s) const
{ {
WriteCompactSize(s, string.size()); WriteCompactSize(s, string.size());
if (!string.empty()) if (!string.empty())
@ -474,48 +471,48 @@ CVarInt<I> WrapVarInt(I& n) { return CVarInt<I>(n); }
/** /**
* string * string
*/ */
template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str, int, int=0); template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str);
template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str, int, int=0); template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str);
/** /**
* prevector * prevector
* prevectors of unsigned char are a special case and are intended to be serialized as a single opaque blob. * prevectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
*/ */
template<typename Stream, unsigned int N, typename T> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&); template<typename Stream, unsigned int N, typename T> void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&);
template<typename Stream, unsigned int N, typename T, typename V> void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const V&); template<typename Stream, unsigned int N, typename T, typename V> void Serialize_impl(Stream& os, const prevector<N, T>& v, const V&);
template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v, int nType, int nVersion); template<typename Stream, unsigned int N, typename T> inline void Serialize(Stream& os, const prevector<N, T>& v);
template<typename Stream, unsigned int N, typename T> void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const unsigned char&); template<typename Stream, unsigned int N, typename T> void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&);
template<typename Stream, unsigned int N, typename T, typename V> void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const V&); template<typename Stream, unsigned int N, typename T, typename V> void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&);
template<typename Stream, unsigned int N, typename T> inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion); template<typename Stream, unsigned int N, typename T> inline void Unserialize(Stream& is, prevector<N, T>& v);
/** /**
* vector * vector
* vectors of unsigned char are a special case and are intended to be serialized as a single opaque blob. * vectors of unsigned char are a special case and are intended to be serialized as a single opaque blob.
*/ */
template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&); template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&);
template<typename Stream, typename T, typename A, typename V> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const V&); template<typename Stream, typename T, typename A, typename V> void Serialize_impl(Stream& os, const std::vector<T, A>& v, const V&);
template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion); template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v);
template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const unsigned char&); template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&);
template<typename Stream, typename T, typename A, typename V> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const V&); template<typename Stream, typename T, typename A, typename V> void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&);
template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion); template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v);
/** /**
* pair * pair
*/ */
template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion); template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item);
template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion); template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item);
/** /**
* map * map
*/ */
template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion); template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m);
template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion); template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m);
/** /**
* set * set
*/ */
template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion); template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m);
template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion); template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m);
@ -523,20 +520,17 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ
/** /**
* If none of the specialized versions above matched, default to calling member function. * If none of the specialized versions above matched, default to calling member function.
* "int nType" is changed to "long nType" to keep from getting an ambiguous overload error.
* The compiler will only cast int to long if none of the other templates matched.
* Thanks to Boost serialization for this idea.
*/ */
template<typename Stream, typename T> template<typename Stream, typename T>
inline void Serialize(Stream& os, const T& a, long nType, int nVersion) inline void Serialize(Stream& os, const T& a)
{ {
a.Serialize(os, (int)nType, nVersion); a.Serialize(os);
} }
template<typename Stream, typename T> template<typename Stream, typename T>
inline void Unserialize(Stream& is, T& a, long nType, int nVersion) inline void Unserialize(Stream& is, T& a)
{ {
a.Unserialize(is, (int)nType, nVersion); a.Unserialize(is);
} }
@ -547,7 +541,7 @@ inline void Unserialize(Stream& is, T& a, long nType, int nVersion)
* string * string
*/ */
template<typename Stream, typename C> template<typename Stream, typename C>
void Serialize(Stream& os, const std::basic_string<C>& str, int, int) void Serialize(Stream& os, const std::basic_string<C>& str)
{ {
WriteCompactSize(os, str.size()); WriteCompactSize(os, str.size());
if (!str.empty()) if (!str.empty())
@ -555,7 +549,7 @@ void Serialize(Stream& os, const std::basic_string<C>& str, int, int)
} }
template<typename Stream, typename C> template<typename Stream, typename C>
void Unserialize(Stream& is, std::basic_string<C>& str, int, int) void Unserialize(Stream& is, std::basic_string<C>& str)
{ {
unsigned int nSize = ReadCompactSize(is); unsigned int nSize = ReadCompactSize(is);
str.resize(nSize); str.resize(nSize);
@ -569,7 +563,7 @@ void Unserialize(Stream& is, std::basic_string<C>& str, int, int)
* prevector * prevector
*/ */
template<typename Stream, unsigned int N, typename T> template<typename Stream, unsigned int N, typename T>
void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const unsigned char&) void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&)
{ {
WriteCompactSize(os, v.size()); WriteCompactSize(os, v.size());
if (!v.empty()) if (!v.empty())
@ -577,22 +571,22 @@ void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersio
} }
template<typename Stream, unsigned int N, typename T, typename V> template<typename Stream, unsigned int N, typename T, typename V>
void Serialize_impl(Stream& os, const prevector<N, T>& v, int nType, int nVersion, const V&) void Serialize_impl(Stream& os, const prevector<N, T>& v, const V&)
{ {
WriteCompactSize(os, v.size()); WriteCompactSize(os, v.size());
for (typename prevector<N, T>::const_iterator vi = v.begin(); vi != v.end(); ++vi) for (typename prevector<N, T>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
::Serialize(os, (*vi), nType, nVersion); ::Serialize(os, (*vi));
} }
template<typename Stream, unsigned int N, typename T> template<typename Stream, unsigned int N, typename T>
inline void Serialize(Stream& os, const prevector<N, T>& v, int nType, int nVersion) inline void Serialize(Stream& os, const prevector<N, T>& v)
{ {
Serialize_impl(os, v, nType, nVersion, T()); Serialize_impl(os, v, T());
} }
template<typename Stream, unsigned int N, typename T> template<typename Stream, unsigned int N, typename T>
void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const unsigned char&) void Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&)
{ {
// Limit size per read so bogus size value won't cause out of memory // Limit size per read so bogus size value won't cause out of memory
v.clear(); v.clear();
@ -608,7 +602,7 @@ void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, c
} }
template<typename Stream, unsigned int N, typename T, typename V> template<typename Stream, unsigned int N, typename T, typename V>
void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, const V&) void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&)
{ {
v.clear(); v.clear();
unsigned int nSize = ReadCompactSize(is); unsigned int nSize = ReadCompactSize(is);
@ -621,14 +615,14 @@ void Unserialize_impl(Stream& is, prevector<N, T>& v, int nType, int nVersion, c
nMid = nSize; nMid = nSize;
v.resize(nMid); v.resize(nMid);
for (; i < nMid; i++) for (; i < nMid; i++)
Unserialize(is, v[i], nType, nVersion); Unserialize(is, v[i]);
} }
} }
template<typename Stream, unsigned int N, typename T> template<typename Stream, unsigned int N, typename T>
inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion) inline void Unserialize(Stream& is, prevector<N, T>& v)
{ {
Unserialize_impl(is, v, nType, nVersion, T()); Unserialize_impl(is, v, T());
} }
@ -637,7 +631,7 @@ inline void Unserialize(Stream& is, prevector<N, T>& v, int nType, int nVersion)
* vector * vector
*/ */
template<typename Stream, typename T, typename A> template<typename Stream, typename T, typename A>
void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const unsigned char&) void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&)
{ {
WriteCompactSize(os, v.size()); WriteCompactSize(os, v.size());
if (!v.empty()) if (!v.empty())
@ -645,22 +639,22 @@ void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVers
} }
template<typename Stream, typename T, typename A, typename V> template<typename Stream, typename T, typename A, typename V>
void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const V&) void Serialize_impl(Stream& os, const std::vector<T, A>& v, const V&)
{ {
WriteCompactSize(os, v.size()); WriteCompactSize(os, v.size());
for (typename std::vector<T, A>::const_iterator vi = v.begin(); vi != v.end(); ++vi) for (typename std::vector<T, A>::const_iterator vi = v.begin(); vi != v.end(); ++vi)
::Serialize(os, (*vi), nType, nVersion); ::Serialize(os, (*vi));
} }
template<typename Stream, typename T, typename A> template<typename Stream, typename T, typename A>
inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion) inline void Serialize(Stream& os, const std::vector<T, A>& v)
{ {
Serialize_impl(os, v, nType, nVersion, T()); Serialize_impl(os, v, T());
} }
template<typename Stream, typename T, typename A> template<typename Stream, typename T, typename A>
void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const unsigned char&) void Unserialize_impl(Stream& is, std::vector<T, A>& v, const unsigned char&)
{ {
// Limit size per read so bogus size value won't cause out of memory // Limit size per read so bogus size value won't cause out of memory
v.clear(); v.clear();
@ -676,7 +670,7 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion,
} }
template<typename Stream, typename T, typename A, typename V> template<typename Stream, typename T, typename A, typename V>
void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const V&) void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&)
{ {
v.clear(); v.clear();
unsigned int nSize = ReadCompactSize(is); unsigned int nSize = ReadCompactSize(is);
@ -689,14 +683,14 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion,
nMid = nSize; nMid = nSize;
v.resize(nMid); v.resize(nMid);
for (; i < nMid; i++) for (; i < nMid; i++)
Unserialize(is, v[i], nType, nVersion); Unserialize(is, v[i]);
} }
} }
template<typename Stream, typename T, typename A> template<typename Stream, typename T, typename A>
inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion) inline void Unserialize(Stream& is, std::vector<T, A>& v)
{ {
Unserialize_impl(is, v, nType, nVersion, T()); Unserialize_impl(is, v, T());
} }
@ -705,17 +699,17 @@ inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersio
* pair * pair
*/ */
template<typename Stream, typename K, typename T> template<typename Stream, typename K, typename T>
void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion) void Serialize(Stream& os, const std::pair<K, T>& item)
{ {
Serialize(os, item.first, nType, nVersion); Serialize(os, item.first);
Serialize(os, item.second, nType, nVersion); Serialize(os, item.second);
} }
template<typename Stream, typename K, typename T> template<typename Stream, typename K, typename T>
void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion) void Unserialize(Stream& is, std::pair<K, T>& item)
{ {
Unserialize(is, item.first, nType, nVersion); Unserialize(is, item.first);
Unserialize(is, item.second, nType, nVersion); Unserialize(is, item.second);
} }
@ -724,15 +718,15 @@ void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion)
* map * map
*/ */
template<typename Stream, typename K, typename T, typename Pred, typename A> template<typename Stream, typename K, typename T, typename Pred, typename A>
void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion) void Serialize(Stream& os, const std::map<K, T, Pred, A>& m)
{ {
WriteCompactSize(os, m.size()); WriteCompactSize(os, m.size());
for (typename std::map<K, T, Pred, A>::const_iterator mi = m.begin(); mi != m.end(); ++mi) for (typename std::map<K, T, Pred, A>::const_iterator mi = m.begin(); mi != m.end(); ++mi)
Serialize(os, (*mi), nType, nVersion); Serialize(os, (*mi));
} }
template<typename Stream, typename K, typename T, typename Pred, typename A> template<typename Stream, typename K, typename T, typename Pred, typename A>
void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion) void Unserialize(Stream& is, std::map<K, T, Pred, A>& m)
{ {
m.clear(); m.clear();
unsigned int nSize = ReadCompactSize(is); unsigned int nSize = ReadCompactSize(is);
@ -740,7 +734,7 @@ void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion
for (unsigned int i = 0; i < nSize; i++) for (unsigned int i = 0; i < nSize; i++)
{ {
std::pair<K, T> item; std::pair<K, T> item;
Unserialize(is, item, nType, nVersion); Unserialize(is, item);
mi = m.insert(mi, item); mi = m.insert(mi, item);
} }
} }
@ -751,15 +745,15 @@ void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion
* set * set
*/ */
template<typename Stream, typename K, typename Pred, typename A> template<typename Stream, typename K, typename Pred, typename A>
void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion) void Serialize(Stream& os, const std::set<K, Pred, A>& m)
{ {
WriteCompactSize(os, m.size()); WriteCompactSize(os, m.size());
for (typename std::set<K, Pred, A>::const_iterator it = m.begin(); it != m.end(); ++it) for (typename std::set<K, Pred, A>::const_iterator it = m.begin(); it != m.end(); ++it)
Serialize(os, (*it), nType, nVersion); Serialize(os, (*it));
} }
template<typename Stream, typename K, typename Pred, typename A> template<typename Stream, typename K, typename Pred, typename A>
void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion) void Unserialize(Stream& is, std::set<K, Pred, A>& m)
{ {
m.clear(); m.clear();
unsigned int nSize = ReadCompactSize(is); unsigned int nSize = ReadCompactSize(is);
@ -767,7 +761,7 @@ void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion)
for (unsigned int i = 0; i < nSize; i++) for (unsigned int i = 0; i < nSize; i++)
{ {
K key; K key;
Unserialize(is, key, nType, nVersion); Unserialize(is, key);
it = m.insert(it, key); it = m.insert(it, key);
} }
} }
@ -787,15 +781,15 @@ struct CSerActionUnserialize
}; };
template<typename Stream, typename T> template<typename Stream, typename T>
inline void SerReadWrite(Stream& s, const T& obj, int nType, int nVersion, CSerActionSerialize ser_action) inline void SerReadWrite(Stream& s, const T& obj, CSerActionSerialize ser_action)
{ {
::Serialize(s, obj, nType, nVersion); ::Serialize(s, obj);
} }
template<typename Stream, typename T> template<typename Stream, typename T>
inline void SerReadWrite(Stream& s, T& obj, int nType, int nVersion, CSerActionUnserialize ser_action) inline void SerReadWrite(Stream& s, T& obj, CSerActionUnserialize ser_action)
{ {
::Unserialize(s, obj, nType, nVersion); ::Unserialize(s, obj);
} }
@ -814,7 +808,6 @@ protected:
const int nType; const int nType;
const int nVersion; const int nVersion;
public: public:
CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {} CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
void write(const char *psz, size_t nSize) void write(const char *psz, size_t nSize)
@ -825,61 +818,64 @@ public:
template<typename T> template<typename T>
CSizeComputer& operator<<(const T& obj) CSizeComputer& operator<<(const T& obj)
{ {
::Serialize(*this, obj, nType, nVersion); ::Serialize(*this, obj);
return (*this); return (*this);
} }
size_t size() const { size_t size() const {
return nSize; return nSize;
} }
int GetVersion() const { return nVersion; }
int GetType() const { return nType; }
}; };
template<typename Stream> template<typename Stream>
void SerializeMany(Stream& s, int nType, int nVersion) void SerializeMany(Stream& s)
{ {
} }
template<typename Stream, typename Arg> template<typename Stream, typename Arg>
void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg) void SerializeMany(Stream& s, Arg&& arg)
{ {
::Serialize(s, std::forward<Arg>(arg), nType, nVersion); ::Serialize(s, std::forward<Arg>(arg));
} }
template<typename Stream, typename Arg, typename... Args> template<typename Stream, typename Arg, typename... Args>
void SerializeMany(Stream& s, int nType, int nVersion, Arg&& arg, Args&&... args) void SerializeMany(Stream& s, Arg&& arg, Args&&... args)
{ {
::Serialize(s, std::forward<Arg>(arg), nType, nVersion); ::Serialize(s, std::forward<Arg>(arg));
::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...); ::SerializeMany(s, std::forward<Args>(args)...);
} }
template<typename Stream> template<typename Stream>
inline void UnserializeMany(Stream& s, int nType, int nVersion) inline void UnserializeMany(Stream& s)
{ {
} }
template<typename Stream, typename Arg> template<typename Stream, typename Arg>
inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg) inline void UnserializeMany(Stream& s, Arg& arg)
{ {
::Unserialize(s, arg, nType, nVersion); ::Unserialize(s, arg);
} }
template<typename Stream, typename Arg, typename... Args> template<typename Stream, typename Arg, typename... Args>
inline void UnserializeMany(Stream& s, int nType, int nVersion, Arg& arg, Args&... args) inline void UnserializeMany(Stream& s, Arg& arg, Args&... args)
{ {
::Unserialize(s, arg, nType, nVersion); ::Unserialize(s, arg);
::UnserializeMany(s, nType, nVersion, args...); ::UnserializeMany(s, args...);
} }
template<typename Stream, typename... Args> template<typename Stream, typename... Args>
inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionSerialize ser_action, Args&&... args) inline void SerReadWriteMany(Stream& s, CSerActionSerialize ser_action, Args&&... args)
{ {
::SerializeMany(s, nType, nVersion, std::forward<Args>(args)...); ::SerializeMany(s, std::forward<Args>(args)...);
} }
template<typename Stream, typename... Args> template<typename Stream, typename... Args>
inline void SerReadWriteMany(Stream& s, int nType, int nVersion, CSerActionUnserialize ser_action, Args&... args) inline void SerReadWriteMany(Stream& s, CSerActionUnserialize ser_action, Args&... args)
{ {
::UnserializeMany(s, nType, nVersion, args...); ::UnserializeMany(s, args...);
} }
template <typename T> template <typename T>

34
src/streams.h
Unescape View File

@ -37,7 +37,7 @@ public:
OverrideStream<Stream>& operator<<(const T& obj) OverrideStream<Stream>& operator<<(const T& obj)
{ {
// Serialize to this stream // Serialize to this stream
::Serialize(*this->stream, obj, nType, nVersion); ::Serialize(*this, obj);
return (*this); return (*this);
} }
@ -45,9 +45,22 @@ public:
OverrideStream<Stream>& operator>>(T& obj) OverrideStream<Stream>& operator>>(T& obj)
{ {
// Unserialize from this stream // Unserialize from this stream
::Unserialize(*this->stream, obj, nType, nVersion); ::Unserialize(*this, obj);
return (*this); return (*this);
} }
void write(const char* pch, size_t nSize)
{
stream->write(pch, nSize);
}
void read(char* pch, size_t nSize)
{
stream->read(pch, nSize);
}
int GetVersion() const { return nVersion; }
int GetType() const { return nType; }
}; };
template<typename S> template<typename S>
@ -118,7 +131,7 @@ public:
CDataStream(int nTypeIn, int nVersionIn, Args&&... args) CDataStream(int nTypeIn, int nVersionIn, Args&&... args)
{ {
Init(nTypeIn, nVersionIn); Init(nTypeIn, nVersionIn);
::SerializeMany(*this, nType, nVersion, std::forward<Args>(args)...); ::SerializeMany(*this, std::forward<Args>(args)...);
} }
void Init(int nTypeIn, int nVersionIn) void Init(int nTypeIn, int nVersionIn)
@ -301,7 +314,7 @@ public:
} }
template<typename Stream> template<typename Stream>
void Serialize(Stream& s, int nType, int nVersion) const void Serialize(Stream& s) const
{ {
// Special case: stream << stream concatenates like stream += stream // Special case: stream << stream concatenates like stream += stream
if (!vch.empty()) if (!vch.empty())
@ -312,7 +325,7 @@ public:
CDataStream& operator<<(const T& obj) CDataStream& operator<<(const T& obj)
{ {
// Serialize to this stream // Serialize to this stream
::Serialize(*this, obj, nType, nVersion); ::Serialize(*this, obj);
return (*this); return (*this);
} }
@ -320,7 +333,7 @@ public:
CDataStream& operator>>(T& obj) CDataStream& operator>>(T& obj)
{ {
// Unserialize from this stream // Unserialize from this stream
::Unserialize(*this, obj, nType, nVersion); ::Unserialize(*this, obj);
return (*this); return (*this);
} }
@ -456,7 +469,7 @@ public:
// Serialize to this stream // Serialize to this stream
if (!file) if (!file)
throw std::ios_base::failure("CAutoFile::operator<<: file handle is NULL"); throw std::ios_base::failure("CAutoFile::operator<<: file handle is NULL");
::Serialize(*this, obj, nType, nVersion); ::Serialize(*this, obj);
return (*this); return (*this);
} }
@ -466,7 +479,7 @@ public:
// Unserialize from this stream // Unserialize from this stream
if (!file) if (!file)
throw std::ios_base::failure("CAutoFile::operator>>: file handle is NULL"); throw std::ios_base::failure("CAutoFile::operator>>: file handle is NULL");
::Unserialize(*this, obj, nType, nVersion); ::Unserialize(*this, obj);
return (*this); return (*this);
} }
}; };
@ -525,6 +538,9 @@ public:
fclose(); fclose();
} }
int GetVersion() const { return nVersion; }
int GetType() const { return nType; }
void fclose() void fclose()
{ {
if (src) { if (src) {
@ -603,7 +619,7 @@ public:
template<typename T> template<typename T>
CBufferedFile& operator>>(T& obj) { CBufferedFile& operator>>(T& obj) {
// Unserialize from this stream // Unserialize from this stream
::Unserialize(*this, obj, nType, nVersion); ::Unserialize(*this, obj);
return (*this); return (*this);
} }

2
src/test/blockencodings_tests.cpp
Unescape View File

@ -129,7 +129,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(header); READWRITE(header);
READWRITE(nonce); READWRITE(nonce);
size_t shorttxids_size = shorttxids.size(); size_t shorttxids_size = shorttxids.size();

6
src/test/bloom_tests.cpp
Unescape View File

@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!"); BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION); stream << filter;
vector<unsigned char> vch = ParseHex("03614e9b050000000000000001"); vector<unsigned char> vch = ParseHex("03614e9b050000000000000001");
vector<char> expected(vch.size()); vector<char> expected(vch.size());
@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!"); BOOST_CHECK_MESSAGE(filter.contains(ParseHex("b9300670b4c5366e95b2699e8b18bc75e5f729c5")), "BloomFilter doesn't contain just-inserted object (3)!");
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION); stream << filter;
vector<unsigned char> vch = ParseHex("03ce4299050000000100008001"); vector<unsigned char> vch = ParseHex("03ce4299050000000100008001");
vector<char> expected(vch.size()); vector<char> expected(vch.size());
@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
filter.insert(vector<unsigned char>(hash.begin(), hash.end())); filter.insert(vector<unsigned char>(hash.begin(), hash.end()));
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
filter.Serialize(stream, SER_NETWORK, PROTOCOL_VERSION); stream << filter;
vector<unsigned char> vch = ParseHex("038fc16b080000000000000001"); vector<unsigned char> vch = ParseHex("038fc16b080000000000000001");
vector<char> expected(vch.size()); vector<char> expected(vch.size());

2
src/test/dbwrapper_tests.cpp
Unescape View File

@ -254,7 +254,7 @@ struct StringContentsSerializer {
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (ser_action.ForRead()) { if (ser_action.ForRead()) {
str.clear(); str.clear();
char c = 0; char c = 0;

8
src/test/net_tests.cpp
Unescape View File

@ -17,7 +17,7 @@ using namespace std;
class CAddrManSerializationMock : public CAddrMan class CAddrManSerializationMock : public CAddrMan
{ {
public: public:
virtual void Serialize(CDataStream& s, int nType, int nVersionDummy) const = 0; virtual void Serialize(CDataStream& s) const = 0;
//! Ensure that bucket placement is always the same for testing purposes. //! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic() void MakeDeterministic()
@ -30,16 +30,16 @@ public:
class CAddrManUncorrupted : public CAddrManSerializationMock class CAddrManUncorrupted : public CAddrManSerializationMock
{ {
public: public:
void Serialize(CDataStream& s, int nType, int nVersionDummy) const void Serialize(CDataStream& s) const
{ {
CAddrMan::Serialize(s, nType, nVersionDummy); CAddrMan::Serialize(s);
} }
}; };
class CAddrManCorrupted : public CAddrManSerializationMock class CAddrManCorrupted : public CAddrManSerializationMock
{ {
public: public:
void Serialize(CDataStream& s, int nType, int nVersionDummy) const void Serialize(CDataStream& s) const
{ {
// Produces corrupt output that claims addrman has 20 addrs when it only has one addr. // Produces corrupt output that claims addrman has 20 addrs when it only has one addr.
unsigned char nVersion = 1; unsigned char nVersion = 1;

4
src/test/serialize_tests.cpp
Unescape View File

@ -28,7 +28,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(intval); READWRITE(intval);
READWRITE(boolval); READWRITE(boolval);
READWRITE(stringval); READWRITE(stringval);
@ -53,7 +53,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITEMANY(intval, boolval, stringval, FLATDATA(charstrval), txval); READWRITEMANY(intval, boolval, stringval, FLATDATA(charstrval), txval);
} }
}; };

38
src/test/uint256_tests.cpp
Unescape View File

@ -187,22 +187,22 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
BOOST_CHECK(GetSerializeSize(R1L, 0, PROTOCOL_VERSION) == 32); BOOST_CHECK(GetSerializeSize(R1L, 0, PROTOCOL_VERSION) == 32);
BOOST_CHECK(GetSerializeSize(ZeroL, 0, PROTOCOL_VERSION) == 32); BOOST_CHECK(GetSerializeSize(ZeroL, 0, PROTOCOL_VERSION) == 32);
std::stringstream ss; CDataStream ss(0, PROTOCOL_VERSION);
R1L.Serialize(ss,0,PROTOCOL_VERSION); ss << R1L;
BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+32)); BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+32));
TmpL.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpL;
BOOST_CHECK(R1L == TmpL); BOOST_CHECK(R1L == TmpL);
ss.str(""); ss.clear();
ZeroL.Serialize(ss,0,PROTOCOL_VERSION); ss << ZeroL;
BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+32)); BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+32));
TmpL.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpL;
BOOST_CHECK(ZeroL == TmpL); BOOST_CHECK(ZeroL == TmpL);
ss.str(""); ss.clear();
MaxL.Serialize(ss,0,PROTOCOL_VERSION); ss << MaxL;
BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+32)); BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+32));
TmpL.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpL;
BOOST_CHECK(MaxL == TmpL); BOOST_CHECK(MaxL == TmpL);
ss.str(""); ss.clear();
BOOST_CHECK(R1S.GetHex() == R1S.ToString()); BOOST_CHECK(R1S.GetHex() == R1S.ToString());
BOOST_CHECK(R2S.GetHex() == R2S.ToString()); BOOST_CHECK(R2S.GetHex() == R2S.ToString());
@ -233,21 +233,21 @@ BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 G
BOOST_CHECK(GetSerializeSize(R1S, 0, PROTOCOL_VERSION) == 20); BOOST_CHECK(GetSerializeSize(R1S, 0, PROTOCOL_VERSION) == 20);
BOOST_CHECK(GetSerializeSize(ZeroS, 0, PROTOCOL_VERSION) == 20); BOOST_CHECK(GetSerializeSize(ZeroS, 0, PROTOCOL_VERSION) == 20);
R1S.Serialize(ss,0,PROTOCOL_VERSION); ss << R1S;
BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+20)); BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+20));
TmpS.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpS;
BOOST_CHECK(R1S == TmpS); BOOST_CHECK(R1S == TmpS);
ss.str(""); ss.clear();
ZeroS.Serialize(ss,0,PROTOCOL_VERSION); ss << ZeroS;
BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+20)); BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+20));
TmpS.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpS;
BOOST_CHECK(ZeroS == TmpS); BOOST_CHECK(ZeroS == TmpS);
ss.str(""); ss.clear();
MaxS.Serialize(ss,0,PROTOCOL_VERSION); ss << MaxS;
BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+20)); BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+20));
TmpS.Unserialize(ss,0,PROTOCOL_VERSION); ss >> TmpS;
BOOST_CHECK(MaxS == TmpS); BOOST_CHECK(MaxS == TmpS);
ss.str(""); ss.clear();
} }
BOOST_AUTO_TEST_CASE( conversion ) BOOST_AUTO_TEST_CASE( conversion )

2
src/txdb.h
Unescape View File

@ -43,7 +43,7 @@ struct CDiskTxPos : public CDiskBlockPos
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(*(CDiskBlockPos*)this); READWRITE(*(CDiskBlockPos*)this);
READWRITE(VARINT(nTxOffset)); READWRITE(VARINT(nTxOffset));
} }

4
src/uint256.h
Unescape View File

@ -92,13 +92,13 @@ public:
} }
template<typename Stream> template<typename Stream>
void Serialize(Stream& s, int nType, int nVersion) const void Serialize(Stream& s) const
{ {
s.write((char*)data, sizeof(data)); s.write((char*)data, sizeof(data));
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s, int nType, int nVersion) void Unserialize(Stream& s)
{ {
s.read((char*)data, sizeof(data)); s.read((char*)data, sizeof(data));
} }

20
src/undo.h
Unescape View File

@ -28,22 +28,22 @@ public:
CTxInUndo(const CTxOut &txoutIn, bool fCoinBaseIn = false, unsigned int nHeightIn = 0, int nVersionIn = 0) : txout(txoutIn), fCoinBase(fCoinBaseIn), nHeight(nHeightIn), nVersion(nVersionIn) { } CTxInUndo(const CTxOut &txoutIn, bool fCoinBaseIn = false, unsigned int nHeightIn = 0, int nVersionIn = 0) : txout(txoutIn), fCoinBase(fCoinBaseIn), nHeight(nHeightIn), nVersion(nVersionIn) { }
template<typename Stream> template<typename Stream>
void Serialize(Stream &s, int nType, int nVersion) const { void Serialize(Stream &s) const {
::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)), nType, nVersion); ::Serialize(s, VARINT(nHeight*2+(fCoinBase ? 1 : 0)));
if (nHeight > 0) if (nHeight > 0)
::Serialize(s, VARINT(this->nVersion), nType, nVersion); ::Serialize(s, VARINT(this->nVersion));
::Serialize(s, CTxOutCompressor(REF(txout)), nType, nVersion); ::Serialize(s, CTxOutCompressor(REF(txout)));
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream &s, int nType, int nVersion) { void Unserialize(Stream &s) {
unsigned int nCode = 0; unsigned int nCode = 0;
::Unserialize(s, VARINT(nCode), nType, nVersion); ::Unserialize(s, VARINT(nCode));
nHeight = nCode / 2; nHeight = nCode / 2;
fCoinBase = nCode & 1; fCoinBase = nCode & 1;
if (nHeight > 0) if (nHeight > 0)
::Unserialize(s, VARINT(this->nVersion), nType, nVersion); ::Unserialize(s, VARINT(this->nVersion));
::Unserialize(s, REF(CTxOutCompressor(REF(txout))), nType, nVersion); ::Unserialize(s, REF(CTxOutCompressor(REF(txout))));
} }
}; };
@ -57,7 +57,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(vprevout); READWRITE(vprevout);
} }
}; };
@ -71,7 +71,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(vtxundo); READWRITE(vtxundo);
} }
}; };

2
src/wallet/crypter.h
Unescape View File

@ -47,7 +47,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(vchCryptedKey); READWRITE(vchCryptedKey);
READWRITE(vchSalt); READWRITE(vchSalt);
READWRITE(nDerivationMethod); READWRITE(nDerivationMethod);

28
src/wallet/wallet.h
Unescape View File

@ -100,8 +100,9 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(nTime); READWRITE(nTime);
READWRITE(vchPubKey); READWRITE(vchPubKey);
@ -195,7 +196,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
std::vector<uint256> vMerkleBranch; // For compatibility with older versions. std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
READWRITE(*(CTransaction*)this); READWRITE(*(CTransaction*)this);
READWRITE(hashBlock); READWRITE(hashBlock);
@ -315,7 +316,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (ser_action.ForRead()) if (ser_action.ForRead())
Init(NULL); Init(NULL);
char fSpent = false; char fSpent = false;
@ -448,8 +449,9 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(vchPrivKey); READWRITE(vchPrivKey);
READWRITE(nTimeCreated); READWRITE(nTimeCreated);
@ -493,8 +495,9 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(nVersion); READWRITE(nVersion);
//! Note: strAccount is serialized as part of the key, not here. //! Note: strAccount is serialized as part of the key, not here.
READWRITE(nCreditDebit); READWRITE(nCreditDebit);
@ -507,7 +510,7 @@ public:
if (!(mapValue.empty() && _ssExtra.empty())) if (!(mapValue.empty() && _ssExtra.empty()))
{ {
CDataStream ss(nType, nVersion); CDataStream ss(s.GetType(), s.GetVersion());
ss.insert(ss.begin(), '\0'); ss.insert(ss.begin(), '\0');
ss << mapValue; ss << mapValue;
ss.insert(ss.end(), _ssExtra.begin(), _ssExtra.end()); ss.insert(ss.end(), _ssExtra.begin(), _ssExtra.end());
@ -523,7 +526,7 @@ public:
mapValue.clear(); mapValue.clear();
if (std::string::npos != nSepPos) if (std::string::npos != nSepPos)
{ {
CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), nType, nVersion); CDataStream ss(std::vector<char>(strComment.begin() + nSepPos + 1, strComment.end()), s.GetType(), s.GetVersion());
ss >> mapValue; ss >> mapValue;
_ssExtra = std::vector<char>(ss.begin(), ss.end()); _ssExtra = std::vector<char>(ss.begin(), ss.end());
} }
@ -986,8 +989,9 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
if (!(nType & SER_GETHASH)) int nVersion = s.GetVersion();
if (!(s.GetType() & SER_GETHASH))
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(vchPubKey); READWRITE(vchPubKey);
} }

4
src/wallet/walletdb.h
Unescape View File

@ -54,7 +54,7 @@ public:
CHDChain() { SetNull(); } CHDChain() { SetNull(); }
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) inline void SerializationOp(Stream& s, Operation ser_action)
{ {
READWRITE(this->nVersion); READWRITE(this->nVersion);
READWRITE(nExternalChainCounter); READWRITE(nExternalChainCounter);
@ -93,7 +93,7 @@ public:
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(this->nVersion); READWRITE(this->nVersion);
READWRITE(nCreateTime); READWRITE(nCreateTime);
if (this->nVersion >= VERSION_WITH_HDDATA) if (this->nVersion >= VERSION_WITH_HDDATA)

Write Preview
Loading…
Cancel
Save