DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove nType and nVersion from Zcash-specific code

Browse Source
This commit is contained in:
Jack Grigg
2018-04-15 21:09:19 -06:00
parent 242f1421db
commit 68a1a592ca
14 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/primitives/block.h
View File

@@ -155,9 +155,8 @@ public:
ADD_SERIALIZE_METHODS;
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);
nVersion = this->nVersion;
READWRITE(hashPrevBlock);
READWRITE(hashMerkleRoot);
READWRITE(hashReserved);

4
src/primitives/transaction.h
View File

@@ -109,7 +109,7 @@ public:
ADD_SERIALIZE_METHODS;
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(vpub_old);
READWRITE(vpub_new);
READWRITE(anchor);
@@ -383,7 +383,6 @@ public:
uint32_t header = GetHeader();
READWRITE(header);
}
nVersion = this->nVersion;
if (fOverwintered) {
READWRITE(*const_cast<uint32_t*>(&this->nVersionGroupId));
}
@@ -498,7 +497,6 @@ struct CMutableTransaction
}
READWRITE(header);
}
nVersion = this->nVersion;
if (fOverwintered) {
READWRITE(nVersionGroupId);
}