Skip to content

Commit

Permalink
Merge bitcoin#11232: Ensure that data types are consistent
Browse files Browse the repository at this point in the history
061297f 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
  • Loading branch information
laanwj authored and PastaPastaPasta committed Sep 23, 2019
1 parent 8836221 commit d186cf6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/chain.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ class CBlockIndex
unsigned int nChainTx;

//! Verification status of this block. See enum BlockStatus
unsigned int nStatus;
uint32_t nStatus;

//! block header
int nVersion;
int32_t nVersion;
uint256 hashMerkleRoot;
unsigned int nTime;
unsigned int nBits;
unsigned int nNonce;
uint32_t nTime;
uint32_t nBits;
uint32_t nNonce;

//! (memory only) Sequential id assigned to distinguish order in which blocks are received.
int32_t nSequenceId;
Expand Down

0 comments on commit d186cf6

Please sign in to comment.