LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[wallet] Remove CMerkleTx serialization logic

Browse source 
CMerkleTx is only used for deserialization of old wallet files. Remove
the serialization logic, and tidy up CWalletTx serialization logic.
This commit is contained in:
John Newbery 2019-07-24 14:09:28 -04:00
parent 783a76f23b
commit 05b56d1c93
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/wallet/wallet.h
View file

@ -372,20 +372,16 @@ struct COutputEntry
class CMerkleTx class CMerkleTx
{ {
public: public:
ADD_SERIALIZE_METHODS; template<typename Stream>
void Unserialize(Stream& s)
template <typename Stream, typename Operation> {
inline void SerializationOp(Stream& s, Operation ser_action) {
CTransactionRef tx; CTransactionRef tx;
uint256 hashBlock; uint256 hashBlock;
std::vector<uint256> vMerkleBranch;
int nIndex; int nIndex;
std::vector<uint256> vMerkleBranch; // For compatibility with older versions.
READWRITE(tx);
READWRITE(hashBlock);
READWRITE(vMerkleBranch);
READWRITE(nIndex);
}
s >> tx >> hashBlock >> vMerkleBranch >> nIndex;
}
}; };
//Get the marginal bytes of spending the specified output //Get the marginal bytes of spending the specified output
@ -495,7 +491,6 @@ public:
template<typename Stream> template<typename Stream>
void Serialize(Stream& s) const void Serialize(Stream& s) const
{ {
char fSpent = false;
mapValue_t mapValueCopy = mapValue; mapValue_t mapValueCopy = mapValue;
mapValueCopy["fromaccount"] = ""; mapValueCopy["fromaccount"] = "";
@ -504,22 +499,21 @@ public:
mapValueCopy["timesmart"] = strprintf("%u", nTimeSmart); mapValueCopy["timesmart"] = strprintf("%u", nTimeSmart);
} }
std::vector<uint256> dummy_vector; //!< Used to be vMerkleBranch std::vector<char> dummy_vector1; //!< Used to be vMerkleBranch
s << tx << hashBlock << dummy_vector << nIndex; std::vector<char> dummy_vector2; //!< Used to be vtxPrev
std::vector<CMerkleTx> vUnused; //!< Used to be vtxPrev char dummy_char = false; //!< Used to be fSpent
s << vUnused << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << fSpent; s << tx << hashBlock << dummy_vector1 << nIndex << dummy_vector2 << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << dummy_char;
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s) void Unserialize(Stream& s)
{ {
Init(nullptr); Init(nullptr);
char fSpent;
std::vector<uint256> dummy_vector; //!< Used to be vMerkleBranch std::vector<uint256> dummy_vector1; //!< Used to be vMerkleBranch
s >> tx >> hashBlock >> dummy_vector >> nIndex; std::vector<CMerkleTx> dummy_vector2; //!< Used to be vtxPrev
std::vector<CMerkleTx> vUnused; //!< Used to be vtxPrev char dummy_char; //! Used to be fSpent
s >> vUnused >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> fSpent; s >> tx >> hashBlock >> dummy_vector1 >> nIndex >> dummy_vector2 >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> dummy_char;
ReadOrderPos(nOrderPos, mapValue); ReadOrderPos(nOrderPos, mapValue);
nTimeSmart = mapValue.count("timesmart") ? (unsigned int)atoi64(mapValue["timesmart"]) : 0; nTimeSmart = mapValue.count("timesmart") ? (unsigned int)atoi64(mapValue["timesmart"]) : 0;