diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-04-01 18:01:26 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-15 22:09:55 +0800 |
commit | bde4a6cc02c6806093d2a49a86463f81358ca3d8 (patch) | |
tree | bc3d617f8ff755f6cca5c4fc1dff7b5457845c9f /vendor/github.com/dexon-foundation/dexon-consensus/core/agreement-mgr.go | |
parent | 3c0372165e723de9f1bd3ea8dacd579810463f6d (diff) | |
download | go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.gz go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.bz2 go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.lz go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.xz go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.zst go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.zip |
vendor: sync to latest core (#320)
* vendor: sync to latest core
* dex, core: fix conflict
x
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 | 9 |
1 files changed, 1 insertions, 8 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 7006242b1..423174c48 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 @@ -116,8 +116,7 @@ type agreementMgr struct { lock sync.RWMutex } -func newAgreementMgr(con *Consensus, - initConfig agreementMgrConfig) (mgr *agreementMgr, err error) { +func newAgreementMgr(con *Consensus) (mgr *agreementMgr, err error) { mgr = &agreementMgr{ con: con, ID: con.ID, @@ -130,7 +129,6 @@ func newAgreementMgr(con *Consensus, bcModule: con.bcModule, ctx: con.ctx, processedBAResult: make(map[types.Position]struct{}, maxResultCache), - configs: []agreementMgrConfig{initConfig}, voteFilter: utils.NewVoteFilter(), } mgr.recv = &consensusBAReceiver{ @@ -199,11 +197,6 @@ func (mgr *agreementMgr) notifyRoundEvents(evts []utils.RoundEventParam) error { if len(mgr.configs) > 0 { lastCfg := mgr.configs[len(mgr.configs)-1] if e.BeginHeight != lastCfg.RoundEndHeight() { - // the init config of BA part is provided when constructing. - if len(mgr.configs) == 1 && - e.BeginHeight == lastCfg.LastPeriodBeginHeight() { - return nil - } return ErrInvalidBlockHeight } if lastCfg.RoundID() == e.Round { |