diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-06 01:32:04 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-22 15:42:59 +0200 |
| commit | 7030d9eb47254499bba14f1c00abc6bf493efd91 (patch) | |
| tree | 95055978907c7418c1b96728ff09413781b9c0b7 /src/primitives/block.h | |
| parent | ecacfd98e657c5819a1bcb1da93b25d3ad4e5045 (diff) | |
| download | bitcoin-7030d9eb47254499bba14f1c00abc6bf493efd91.tar.xz | |
BIP144: Serialization, hashes, relay (sender side)
Contains refactorings by Eric Lombrozo.
Contains fixup by Nicolas Dorier.
Contains cleanup of CInv::GetCommand by Alex Morcos
Diffstat (limited to 'src/primitives/block.h')
| -rw-r--r-- | src/primitives/block.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/primitives/block.h b/src/primitives/block.h index 42276b2bc2..29307aed5b 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -38,7 +38,6 @@ public: template <typename Stream, typename Operation> inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(this->nVersion); - nVersion = this->nVersion; READWRITE(hashPrevBlock); READWRITE(hashMerkleRoot); READWRITE(nTime); @@ -120,7 +119,6 @@ public: std::string ToString() const; }; - /** Describes a place in the block chain to another node such that if the * other node doesn't have the same branch, it can find a recent common trunk. * The further back it is, the further before the fork it may be. |