diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-06 16:02:56 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 21fabd3f164b23a3f984fceb1d8cdd7ab6c62978 (patch) | |
| tree | 6bd6d60a4d4ef3a6e906c12f7309d9fd45b1998c /dex/governance.go | |
| parent | 97f5cf98e41a6ae9400e7dde6ae2d064e90ce793 (diff) | |
| download | dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.gz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.bz2 dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.lz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.xz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.zst dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.zip | |
dex: fix conflict caused by rebase
Diffstat (limited to 'dex/governance.go')
| -rw-r--r-- | dex/governance.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dex/governance.go b/dex/governance.go index c1c635bf9..92a8789b3 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -317,8 +317,7 @@ func (d *DexconGovernance) GetNumChains(round uint64) uint32 { return d.Configuration(round).NumChains } -func (d *DexconGovernance) NotarySet( - round uint64, chainID uint32) (map[string]struct{}, error) { +func (d *DexconGovernance) NotarySet(round uint64, chainID uint32) (map[string]struct{}, error) { notarySet, err := d.nodeSetCache.GetNotarySet(round, chainID) if err != nil { return nil, err @@ -327,7 +326,7 @@ func (d *DexconGovernance) NotarySet( r := make(map[string]struct{}, len(notarySet)) for id := range notarySet { if key, exists := d.nodeSetCache.GetPublicKey(id); exists { - r[hex.EncodeToString(key.Bytes()[1:])] = struct{}{} + r[hex.EncodeToString(key.Bytes())] = struct{}{} } } return r, nil @@ -342,7 +341,7 @@ func (d *DexconGovernance) DKGSet(round uint64) (map[string]struct{}, error) { r := make(map[string]struct{}, len(dkgSet)) for id := range dkgSet { if key, exists := d.nodeSetCache.GetPublicKey(id); exists { - r[hex.EncodeToString(key.Bytes()[1:])] = struct{}{} + r[hex.EncodeToString(key.Bytes())] = struct{}{} } } return r, nil |