diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-12 12:23:16 +0800 |
|---|---|---|
| committer | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-12 12:23:16 +0800 |
| commit | 9567547cf69d49f64cb1c6035a0cdf2489e33f40 (patch) | |
| tree | d0202e7ae9a403aaf5cf28fe75f8de88dc423d3e /core | |
| parent | 2b26b808b64c7343c042c18ee8caab72d6120643 (diff) | |
| download | dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar.gz dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar.bz2 dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar.lz dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar.xz dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.tar.zst dexon-9567547cf69d49f64cb1c6035a0cdf2489e33f40.zip | |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'core')
| -rw-r--r-- | core/vm/oracle_contracts.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |