diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-13 18:19:53 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:22 +0800 |
commit | 43457d6a008524f9dd353fce7b12e16cd4d0e157 (patch) | |
tree | 12782a2db49a1ee4e1fa97db64901251eeed36af /vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go | |
parent | a0684dc255fb2d3db22ea4c03957d9b7b27a0a36 (diff) | |
download | go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar.gz go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar.bz2 go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar.lz go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar.xz go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.tar.zst go-tangerine-43457d6a008524f9dd353fce7b12e16cd4d0e157.zip |
vendor: sync to latest core (#253)
Diffstat (limited to 'vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go')
-rw-r--r-- | vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go index 88cc432ff..7b5effba8 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go @@ -65,7 +65,7 @@ func genValidLeader( } type agreementMgrConfig struct { - roundBasedConfig + utils.RoundBasedConfig notarySetSize uint32 lambdaBA time.Duration @@ -77,14 +77,14 @@ func (c *agreementMgrConfig) from( c.notarySetSize = config.NotarySetSize c.lambdaBA = config.LambdaBA c.crs = crs - c.setupRoundBasedFields(round, config) + c.SetupRoundBasedFields(round, config) } func newAgreementMgrConfig(prev agreementMgrConfig, config *types.Config, crs common.Hash) (c agreementMgrConfig) { c = agreementMgrConfig{} - c.from(prev.roundID+1, config, crs) - c.setRoundBeginHeight(prev.roundEndHeight) + c.from(prev.RoundID()+1, config, crs) + c.AppendTo(prev.RoundBasedConfig) return } @@ -356,7 +356,7 @@ Loop: setting.recv.isNotary = checkRound() // Run BA for this round. setting.recv.roundValue.Store(currentRound) - setting.recv.changeNotaryHeight = curConfig.roundEndHeight + setting.recv.changeNotaryHeight = curConfig.RoundEndHeight() setting.recv.restartNotary <- types.Position{ Round: setting.recv.round(), Height: math.MaxUint64, |