From 4ccf46bcec17b207f915f358f8b23055cd603a5a Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Tue, 12 Mar 2019 12:23:16 +0800
Subject: vendor: sync to latest core and fix conflict
---
core/vm/oracle_contracts.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'core')
diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go
index 0904c2430..cd20b7afa 100644
--- a/core/vm/oracle_contracts.go
+++ b/core/vm/oracle_contracts.go
@@ -1116,7 +1116,7 @@ func (c *defaultCoreDKGUtils) NewGroupPublicKey(round *big.Int, threshold int) (
complaints = append(complaints, x)
}
- return dexCore.NewDKGGroupPublicKey(round.Uint64(), mpks, complaints, threshold)
+ return dkgTypes.NewGroupPublicKey(round.Uint64(), mpks, complaints, threshold)
}
func (g *GovernanceContract) Address() common.Address {
@@ -1764,7 +1764,7 @@ func (g *GovernanceContract) resetDKG(newSignedCRS []byte) ([]byte, error) {
return nil, errExecutionReverted
}
switch err {
- case dexCore.ErrNotReachThreshold, dexCore.ErrInvalidThreshold:
+ case dkgTypes.ErrNotReachThreshold, dkgTypes.ErrInvalidThreshold:
default:
return nil, errExecutionReverted
}
--
cgit v1.2.3