Merge #11232: Ensure that data types are consistent

061297f0a Ensure that data types are consistent (jjz)

Pull request description:

  1. nStatus of CBlockIndex  is consistent with the definition of Enum(BlockStatus)
  2. The BlockHeader is consistent with the type of variable defined in CBlockHeader

Tree-SHA512: 3d4a55c62d3e17b9c83807eae153db4fcfcd8477c9413a45dedfa157563e77b775a66974648d28c9d44ac45a5705eef83b31a8a3b44316dc9814b85526a9d034
This commit is contained in:
Wladimir J. van der Laan 2017-09-07 21:07:03 +02:00 committed by Pasta
parent b1af3b8db9
commit 84e5b323b2
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -204,14 +204,14 @@ public:
unsigned int nChainTx; unsigned int nChainTx;
//! Verification status of this block. See enum BlockStatus //! Verification status of this block. See enum BlockStatus
unsigned int nStatus; uint32_t nStatus;
//! block header //! block header
int nVersion; int32_t nVersion;
uint256 hashMerkleRoot; uint256 hashMerkleRoot;
unsigned int nTime; uint32_t nTime;
unsigned int nBits; uint32_t nBits;
unsigned int nNonce; uint32_t nNonce;
//! (memory only) Sequential id assigned to distinguish order in which blocks are received. //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
int32_t nSequenceId; int32_t nSequenceId;