diff options
| author | Sonic <sonic@cobinhood.com> | 2018-10-16 10:33:24 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | a7d394e8c08fe9ccadc06c287d680c0632f414d7 (patch) | |
| tree | 057773ba092434ccdd48fdd2cb2f5a6cb17c5a0a /dex/peer.go | |
| parent | 222699705e6fc1d6e3a645b8ad654ea71f99f506 (diff) | |
| download | dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar.gz dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar.bz2 dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar.lz dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar.xz dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.tar.zst dexon-a7d394e8c08fe9ccadc06c287d680c0632f414d7.zip | |
dex: gov: using dex-consensus-core NodeSetCache
Diffstat (limited to 'dex/peer.go')
| -rw-r--r-- | dex/peer.go | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/dex/peer.go b/dex/peer.go index 44f61354c..342d0f033 100644 --- a/dex/peer.go +++ b/dex/peer.go @@ -27,6 +27,7 @@ import ( coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types" "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/core/types" + "github.com/dexon-foundation/dexon/log" "github.com/dexon-foundation/dexon/p2p" "github.com/dexon-foundation/dexon/p2p/discover" "github.com/dexon-foundation/dexon/rlp" @@ -786,7 +787,12 @@ func (ps *peerSet) BuildNotaryConn(round uint64) { selfID := ps.srvr.Self().ID.String() for chainID := uint32(0); chainID < ps.gov.GetNumChains(round); chainID++ { - s := ps.gov.NotarySet(chainID, round) + s, err := ps.gov.NotarySet(round, chainID) + if err != nil { + log.Error("get notary set fail", + "round", round, "chain id", chainID, "err", err) + continue + } // not in notary set, add group if _, ok := s[selfID]; !ok { @@ -826,7 +832,12 @@ func (ps *peerSet) ForgetNotaryConn(round uint64) { func (ps *peerSet) forgetNotaryConn(round uint64) { selfID := ps.srvr.Self().ID.String() for chainID := uint32(0); chainID < ps.gov.GetNumChains(round); chainID++ { - s := ps.gov.NotarySet(chainID, round) + s, err := ps.gov.NotarySet(round, chainID) + if err != nil { + log.Error("get notary set fail", + "round", round, "chain id", chainID, "err", err) + continue + } if _, ok := s[selfID]; !ok { ps.srvr.RemoveGroup(notarySetName(chainID, round)) continue @@ -852,7 +863,12 @@ func (ps *peerSet) BuildDKGConn(round uint64) { ps.lock.Lock() defer ps.lock.Unlock() selfID := ps.srvr.Self().ID.String() - s := ps.gov.DKGSet(round) + s, err := ps.gov.DKGSet(round) + if err != nil { + log.Error("get dkg set fail", "round", round) + return + } + if _, ok := s[selfID]; !ok { return } @@ -882,7 +898,11 @@ func (ps *peerSet) ForgetDKGConn(round uint64) { func (ps *peerSet) forgetDKGConn(round uint64) { selfID := ps.srvr.Self().ID.String() - s := ps.gov.DKGSet(round) + s, err := ps.gov.DKGSet(round) + if err != nil { + log.Error("get dkg set fail", "round", round) + return + } if _, ok := s[selfID]; !ok { return } |