diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-12 12:23:16 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:22 +0800 |
| commit | 5d30e58203e27153c9b7a0dd23c349035e175f13 (patch) | |
| tree | b56b8dda0136fc81b1a60b7d73ada9b1b0ede79c /core/vm/oracle_contracts.go | |
| parent | 7c261cc567abbbef286b5b993b52d9c032c1d36f (diff) | |
| download | go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar.gz go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar.bz2 go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar.lz go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar.xz go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.tar.zst go-tangerine-5d30e58203e27153c9b7a0dd23c349035e175f13.zip | |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'core/vm/oracle_contracts.go')
| -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 } |