diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-06 16:02:56 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:18 +0800 |
| commit | c1548136288e12b83a993821b5668899aca53804 (patch) | |
| tree | a4685f67f60379420ef1f94caeb7ec792f3b869d /dex/governance.go | |
| parent | 5db9884093fe8187fbf52bbdd96d4e166ab24a85 (diff) | |
| download | go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar.gz go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar.bz2 go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar.lz go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar.xz go-tangerine-c1548136288e12b83a993821b5668899aca53804.tar.zst go-tangerine-c1548136288e12b83a993821b5668899aca53804.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 |