core/vm: remove round from addDKG functions (#279)

* vendor: sync to latest core

* core/vm: remove addDKG functions

* core: fix conflict

1 files changed, 6 insertions, 6 deletions

diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go
index e95861112..2c32ebb6e 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/db/interfaces.go
@@ -50,12 +50,12 @@ var (
 	// ErrDKGPrivateKeyDoesNotExist raised when the DKG private key of the
 	// requested round does not exists.
 	ErrDKGPrivateKeyDoesNotExist = errors.New("dkg private key does not exists")
-	// ErrDKGMasterPrivateSharesExists raised when attempting to save DKG master private shares
+	// ErrDKGProtocolExists raised when attempting to save DKG protocol
 	// that already saved.
-	ErrDKGMasterPrivateSharesExists = errors.New("dkg master private shares exists")
-	// ErrDKGMasterPrivateSharesDoesNotExist raised when the DKG master private shares of the
+	ErrDKGProtocolExists = errors.New("dkg protocol exists")
+	// ErrDKGProtocolDoesNotExist raised when the DKG protocol of the
 	// requested round does not exists.
-	ErrDKGMasterPrivateSharesDoesNotExist = errors.New("dkg master private shares does not exists")
+	ErrDKGProtocolDoesNotExist = errors.New("dkg protocol does not exists")
 )
 
 // Database is the interface for a Database.
@@ -82,7 +82,7 @@ type Reader interface {
 	// DKG Private Key related methods.
 	HasDKGPrivateKey(round uint64) (bool, error)
 	GetDKGPrivateKey(round uint64) (dkg.PrivateKey, error)
-	GetDKGMasterPrivateShares(round uint64) (shares dkg.PrivateKeyShares, err error)
+	GetDKGProtocol() (dkgProtocol DKGProtocolInfo, err error)
 }
 
 // Writer defines the interface for writing blocks into DB.
@@ -91,7 +91,7 @@ type Writer interface {
 	PutBlock(block types.Block) error
 	PutCompactionChainTipInfo(common.Hash, uint64) error
 	PutDKGPrivateKey(uint64, dkg.PrivateKey) error
-	PutOrUpdateDKGMasterPrivateShares(round uint64, shares dkg.PrivateKeyShares) error
+	PutOrUpdateDKGProtocol(dkgProtocol DKGProtocolInfo) error
 }
 
 // BlockIterator defines an iterator on blocks hold