| リビジョン | b6fae706ce8a41f2c805566e076a69894d805a20 (tree) |
|---|---|
| 日時 | 2019-06-05 12:27:02 |
| 作者 | paladz <453256728@qq.c...> |
| コミッター | paladz |
edit for code review
protocol/consensus_node_manager.go (diff) protocol/state/vote_result.go (diff)| @@ -92,7 +92,7 @@ func (c *consensusNodeManager) getConsensusNodes(prevBlockHash *bc.Hash) (map[st | ||
| 92 | 92 | seqHeight = bestHeight |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - preSeq := (seqHeight - 1) / consensus.RoundVoteBlockNums | |
| 95 | + preSeq := state.CalcVoteSeq(seqHeight) - 1 | |
| 96 | 96 | voteResult, err := c.store.GetVoteResult(preSeq) |
| 97 | 97 | if err != nil { |
| 98 | 98 | return nil, err |
| @@ -115,11 +115,7 @@ func (c *consensusNodeManager) getConsensusNodes(prevBlockHash *bc.Hash) (map[st | ||
| 115 | 115 | |
| 116 | 116 | func (c *consensusNodeManager) getBestVoteResult() (*state.VoteResult, error) { |
| 117 | 117 | blockNode := c.blockIndex.BestNode() |
| 118 | - if blockNode.Height == 0 { | |
| 119 | - return c.store.GetVoteResult(0) | |
| 120 | - } | |
| 121 | - | |
| 122 | - seq := (blockNode.Height-1)/consensus.RoundVoteBlockNums + 1 | |
| 118 | + seq := state.CalcVoteSeq(blockNode.Height) | |
| 123 | 119 | voteResult, err := c.store.GetVoteResult(seq) |
| 124 | 120 | if err != nil { |
| 125 | 121 | return nil, err |
| @@ -32,6 +32,12 @@ func (c byVote) Swap(i, j int) { c[i], c[j] = c[j], c[i] } | ||
| 32 | 32 | // seq 1 is the the block height 1, to block height RoundVoteBlockNums |
| 33 | 33 | // seq 2 is the block height RoundVoteBlockNums + 1 to block height 2 * RoundVoteBlockNums |
| 34 | 34 | // consensus node of the current round is the final result of previous round |
| 35 | +func CalcVoteSeq(blockHeight uint64) uint64 { | |
| 36 | + if blockHeight == 0 { | |
| 37 | + return 0 | |
| 38 | + } | |
| 39 | + return (blockHeight-1)/consensus.RoundVoteBlockNums + 1 | |
| 40 | +} | |
| 35 | 41 | |
| 36 | 42 | // VoteResult represents a snapshot of each round of DPOS voting |
| 37 | 43 | // Seq indicates the sequence of current votes, which start from zero |
| @@ -82,7 +88,7 @@ func (v *VoteResult) ApplyBlock(block *types.Block) error { | ||
| 82 | 88 | |
| 83 | 89 | v.BlockHash = block.Hash() |
| 84 | 90 | v.BlockHeight = block.Height |
| 85 | - v.Seq = (block.Height-1)/consensus.RoundVoteBlockNums + 1 | |
| 91 | + v.Seq = CalcVoteSeq(block.Height) | |
| 86 | 92 | return nil |
| 87 | 93 | } |
| 88 | 94 |
| @@ -147,7 +153,7 @@ func (v *VoteResult) DetachBlock(block *types.Block) error { | ||
| 147 | 153 | |
| 148 | 154 | v.BlockHash = block.PreviousBlockHash |
| 149 | 155 | v.BlockHeight = block.Height - 1 |
| 150 | - v.Seq = (block.Height-2)/consensus.RoundVoteBlockNums + 1 | |
| 156 | + v.Seq = CalcVoteSeq(block.Height - 1) | |
| 151 | 157 | return nil |
| 152 | 158 | } |
| 153 | 159 |
Fork