From c1548136288e12b83a993821b5668899aca53804 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Tue, 6 Nov 2018 16:02:56 +0800 Subject: dex: fix conflict caused by rebase --- dex/governance.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dex/governance.go') 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 -- cgit v1.2.3