core: merge notarySet and DKGSet (#265)

* vendor: sync to latest core

* core: merge notarySet and dkgSet

* dex: optimize network traffic for finalized block

1 files changed, 6 insertions, 15 deletions

diff --git a/core/vm/oracle_contracts_test.go b/core/vm/oracle_contracts_test.go
index 80bc9a73f..ad6ffd9e3 100644
--- a/core/vm/oracle_contracts_test.go
+++ b/core/vm/oracle_contracts_test.go
@@ -189,7 +189,7 @@ func (g *OracleContractsTestSuite) SetupTest() {
 	config.NextHalvingSupply = new(big.Int).Mul(big.NewInt(1e18), big.NewInt(2.5e9))
 	config.LastHalvedAmount = new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1.5e9))
 	config.MiningVelocity = 0.1875
-	config.DKGSetSize = 7
+	config.NotarySetSize = 7
 
 	g.config = config
 
@@ -658,15 +658,6 @@ func (g *OracleContractsTestSuite) TestConfigurationReading() {
 	res, err = g.call(GovernanceContractAddress, addr, input, big.NewInt(0))
 	g.Require().NoError(err)
 
-	// DKGSetSize.
-	input, err = GovernanceABI.ABI.Pack("dkgSetSize")
-	g.Require().NoError(err)
-	res, err = g.call(GovernanceContractAddress, addr, input, big.NewInt(0))
-	g.Require().NoError(err)
-	err = GovernanceABI.ABI.Unpack(&value, "dkgSetSize", res)
-	g.Require().NoError(err)
-	g.Require().True(uint32(value.Uint64()) > 0)
-
 	// RoundLength.
 	input, err = GovernanceABI.ABI.Pack("roundLength")
 	g.Require().NoError(err)
@@ -934,7 +925,7 @@ func (v *testTSigVerifierMock) VerifySignature(coreCommon.Hash, coreCrypto.Signa
 }
 
 func (g *OracleContractsTestSuite) TestResetDKG() {
-	for i := uint32(0); i < g.config.DKGSetSize; i++ {
+	for i := uint32(0); i < g.config.NotarySetSize; i++ {
 		privKey, addr := newPrefundAccount(g.stateDB)
 		pk := crypto.FromECDSAPub(&privKey.PublicKey)
 
@@ -945,7 +936,7 @@ func (g *OracleContractsTestSuite) TestResetDKG() {
 		_, err = g.call(GovernanceContractAddress, addr, input, amount)
 		g.Require().NoError(err)
 	}
-	g.Require().Len(g.s.QualifiedNodes(), int(g.config.DKGSetSize))
+	g.Require().Len(g.s.QualifiedNodes(), int(g.config.NotarySetSize))
 
 	addrs := make(map[int][]common.Address)
 	dkgSets := make(map[int]map[coreTypes.NodeID]struct{})
@@ -972,7 +963,7 @@ func (g *OracleContractsTestSuite) TestResetDKG() {
 		}
 
 		addrs[round] = []common.Address{}
-		target := coreTypes.NewDKGSetTarget(coreCommon.Hash(g.s.CRS()))
+		target := coreTypes.NewNotarySetTarget(coreCommon.Hash(g.s.CRS()))
 		ns := coreTypes.NewNodeSet()
 
 		for _, x := range g.s.QualifiedNodes() {
@@ -982,8 +973,8 @@ func (g *OracleContractsTestSuite) TestResetDKG() {
 			}
 			ns.Add(coreTypes.NewNodeID(mpk))
 		}
-		dkgSet := ns.GetSubSet(int(g.s.DKGSetSize().Uint64()), target)
-		g.Require().Len(dkgSet, int(g.config.DKGSetSize))
+		dkgSet := ns.GetSubSet(int(g.s.NotarySetSize().Uint64()), target)
+		g.Require().Len(dkgSet, int(g.config.NotarySetSize))
 		dkgSets[round] = dkgSet
 
 		for id := range dkgSet {