diff options
| author | Mission Liao <mission.liao@dexon.org> | 2018-09-12 15:35:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 15:35:24 +0800 |
| commit | b4af97dd8cfd5bbd7032fb5e1aff240625df06cb (patch) | |
| tree | 7cfd54754cc8dbdb6a3165cf7b1ba3af0ab88986 /core/test/blocks-generator.go | |
| parent | 743983c82b601e200fa53d4aa8973f83ff628d29 (diff) | |
| download | dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar.gz dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar.bz2 dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar.lz dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar.xz dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.tar.zst dexon-consensus-b4af97dd8cfd5bbd7032fb5e1aff240625df06cb.zip | |
core: replace acks with slice (#102)
Diffstat (limited to 'core/test/blocks-generator.go')
| -rw-r--r-- | core/test/blocks-generator.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/test/blocks-generator.go b/core/test/blocks-generator.go index f3e914e..64ddfe2 100644 --- a/core/test/blocks-generator.go +++ b/core/test/blocks-generator.go @@ -116,9 +116,9 @@ func (vs *validatorSetStatus) findIncompleteValidators( // prepareAcksForNewBlock collects acks for one block. func (vs *validatorSetStatus) prepareAcksForNewBlock( proposerID types.ValidatorID, ackingCount int) ( - acks map[common.Hash]struct{}, err error) { + acks common.Hashes, err error) { - acks = make(map[common.Hash]struct{}) + acks = common.Hashes{} if len(vs.status[proposerID].blocks) == 0 { // The 'Acks' filed of genesis blocks would always be empty. return @@ -143,7 +143,7 @@ func (vs *validatorSetStatus) prepareAcksForNewBlock( } continue } - acks[ack] = struct{}{} + acks = append(acks, ack) } return } @@ -151,7 +151,7 @@ func (vs *validatorSetStatus) prepareAcksForNewBlock( // proposeBlock propose new block and update validator status. func (vs *validatorSetStatus) proposeBlock( proposerID types.ValidatorID, - acks map[common.Hash]struct{}) (*types.Block, error) { + acks common.Hashes) (*types.Block, error) { status := vs.status[proposerID] parentHash := common.Hash{} @@ -168,7 +168,7 @@ func (vs *validatorSetStatus) proposeBlock( Height: uint64(len(status.blocks)), ChainID: chainID, }, - Acks: acks, + Acks: common.NewSortedHashes(acks), Timestamp: vs.timestamps[chainID], } for i, vID := range vs.validatorIDs { @@ -283,7 +283,7 @@ func (gen *BlocksGenerator) Generate( // Propose a new block. var ( proposerID = gen.validatorPicker(notYet) - acks map[common.Hash]struct{} + acks common.Hashes ) acks, err = status.prepareAcksForNewBlock( proposerID, ackingCountGenerator()) |