diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-01-29 14:02:28 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:57 +0800 |
| commit | e5327ae2da93eb3c4784971157db4300d17fb35b (patch) | |
| tree | 0071089bbd8722cdf0f5954c3a7441ce52931747 /vendor/github.com/dexon-foundation/dexon-consensus | |
| parent | 1bfd7ff37aa4c3d135cf2eef52e89b8d4b76daf0 (diff) | |
| download | dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar.gz dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar.bz2 dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar.lz dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar.xz dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.tar.zst dexon-e5327ae2da93eb3c4784971157db4300d17fb35b.zip | |
vendor, param: sync to latest core and update dmoment (#182)
* vendor: sync to latest core
* params: update dmoment
Diffstat (limited to 'vendor/github.com/dexon-foundation/dexon-consensus')
| -rw-r--r-- | vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go index c08518ad8..c2ac711eb 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go @@ -172,7 +172,7 @@ func (a *agreement) restart( defer a.data.blocksLock.Unlock() a.data.votes = make(map[uint64][]map[types.NodeID]*types.Vote) a.data.votes[1] = newVoteListMap() - a.data.period = 1 + a.data.period = 2 a.data.blocks = make(map[types.NodeID]*types.Block) a.data.requiredVote = len(notarySet)/3*2 + 1 a.data.leader.restart(crs) @@ -266,7 +266,11 @@ func isStop(aID types.Position) bool { func (a *agreement) clocks() int { a.data.lock.RLock() defer a.data.lock.RUnlock() - scale := int(a.data.period) + scale := int(a.data.period) - 1 + if scale < 1 { + // just in case. + scale = 1 + } // 10 is a magic number derived from many years of experience. if scale > 10 { scale = 10 @@ -420,7 +424,7 @@ func (a *agreement) processVote(vote *types.Vote) error { a.data.recv.ProposeVote( types.NewVote(types.VoteFastCom, hash, vote.Period)) a.data.lockValue = hash - a.data.lockIter = math.MaxUint64 + a.data.lockIter = 1 a.hasVoteFast = true } } else { |