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

refactor decideProposal in common_test (#3343)

Browse Source
This commit is contained in:
Anton Kaliaev
2019-02-22 11:48:40 +04:00
committed by GitHub
parent ed1de13548
commit f22ada442a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
consensus/common_test.go
View File

@ -127,20 +127,18 @@ func startTestRound(cs *ConsensusState, height int64, round int) {
cs.startRoutines(0) cs.startRoutines(0)
} }
// Create proposal block from cs1 but sign it with vs // Create proposal block from cs1 but sign it with vs.
func decideProposal(cs1 *ConsensusState, vs *validatorStub, height int64, round int) (proposal *types.Proposal, block *types.Block) { func decideProposal(cs1 *ConsensusState, vs *validatorStub, height int64, round int) (proposal *types.Proposal, block *types.Block) {
cs1.mtx.Lock() cs1.mtx.Lock()
block, blockParts := cs1.createProposalBlock() block, blockParts := cs1.createProposalBlock()
validRound := cs1.ValidRound
chainID := cs1.state.ChainID
cs1.mtx.Unlock() cs1.mtx.Unlock()
if block == nil { // on error if block == nil {
panic("error creating proposal block") panic("Failed to createProposalBlock. Did you forget to add commit for previous block?")
} }
// Make proposal // Make proposal
cs1.mtx.RLock()
validRound := cs1.ValidRound
chainID := cs1.state.ChainID
cs1.mtx.RUnlock()
polRound, propBlockID := validRound, types.BlockID{block.Hash(), blockParts.Header()} polRound, propBlockID := validRound, types.BlockID{block.Hash(), blockParts.Header()}
proposal = types.NewProposal(height, round, polRound, propBlockID) proposal = types.NewProposal(height, round, polRound, propBlockID)
if err := vs.SignProposal(chainID, proposal); err != nil { if err := vs.SignProposal(chainID, proposal); err != nil {