fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-29 06:01:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1483 from tendermint/jae/lower_case_round_state

Browse Source 
Jae/lower case round state
This commit is contained in:
Anton Kaliaev 2018-04-24 09:57:42 +02:00 committed by GitHub
commit 5361073439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
consensus/types/state.go
View File

@ -55,25 +55,25 @@ func (rs RoundStepType) String() string {
// NOTE: Not thread safe. Should only be manipulated by functions downstream // NOTE: Not thread safe. Should only be manipulated by functions downstream
// of the cs.receiveRoutine // of the cs.receiveRoutine
type RoundState struct { type RoundState struct {
Height int64 // Height we are working on Height int64 `json:"height"` // Height we are working on
Round int Round int `json:"round"`
Step RoundStepType Step RoundStepType `json:"step"`
StartTime time.Time StartTime time.Time `json:"start_time"`
CommitTime time.Time // Subjective time when +2/3 precommits for Block at Round were found CommitTime time.Time `json:"commit_time"` // Subjective time when +2/3 precommits for Block at Round were found
Validators *types.ValidatorSet Validators *types.ValidatorSet `json:"validators"`
Proposal *types.Proposal Proposal *types.Proposal `json:"proposal"`
ProposalBlock *types.Block ProposalBlock *types.Block `json:"proposal_block"`
ProposalBlockParts *types.PartSet ProposalBlockParts *types.PartSet `json:"proposal_block_parts"`
LockedRound int LockedRound int `json:"locked_round"`
LockedBlock *types.Block LockedBlock *types.Block `json:"locked_block"`
LockedBlockParts *types.PartSet LockedBlockParts *types.PartSet `json:"locked_block_parts"`
ValidRound int ValidRound int `json:"valid_round"`
ValidBlock *types.Block ValidBlock *types.Block `json:"valid_block"`
ValidBlockParts *types.PartSet ValidBlockParts *types.PartSet `json:"valid_block_parts"`
Votes *HeightVoteSet Votes *HeightVoteSet `json:"votes"`
CommitRound int // CommitRound int `json:"commit_round"` //
LastCommit *types.VoteSet // Last precommits at Height-1 LastCommit *types.VoteSet `json:"last_commit"` // Last precommits at Height-1
LastValidators *types.ValidatorSet LastValidators *types.ValidatorSet `json:"last_validators"`
} }
// RoundStateEvent returns the H/R/S of the RoundState as an event. // RoundStateEvent returns the H/R/S of the RoundState as an event.

2
types/block.go
View File

@ -265,7 +265,7 @@ type Commit struct {
// NOTE: The Precommits are in order of address to preserve the bonded ValidatorSet order. // NOTE: The Precommits are in order of address to preserve the bonded ValidatorSet order.
// Any peer with a block can gossip precommits by index with a peer without recalculating the // Any peer with a block can gossip precommits by index with a peer without recalculating the
// active ValidatorSet. // active ValidatorSet.
BlockID BlockID `json:"blockID"` BlockID BlockID `json:"block_id"`
Precommits []*Vote `json:"precommits"` Precommits []*Vote `json:"precommits"`
// Volatile // Volatile