dexcon: correctly fine DKGSet for not producing blocks (#325)

2 files changed, 25 insertions, 24 deletions

diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go
index 6572d1e9d..301cef7da 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/types/dkg/dkg.go
@@ -320,7 +320,8 @@ func (gpk *GroupPublicKey) VerifySignature(
 	return gpk.GroupPublicKey.VerifySignature(hash, sig)
 }
 
-func calcQualifyNodes(
+// CalcQualifyNodes returns the qualified nodes.
+func CalcQualifyNodes(
 	mpks []*MasterPublicKey, complaints []*Complaint, threshold int) (
 	qualifyIDs cryptoDKG.IDs, qualifyNodeIDs map[types.NodeID]struct{}, err error) {
 	if len(mpks) < threshold {
@@ -371,7 +372,7 @@ func NewGroupPublicKey(
 	threshold int) (
 	*GroupPublicKey, error) {
 	qualifyIDs, qualifyNodeIDs, err :=
-		calcQualifyNodes(mpks, complaints, threshold)
+		CalcQualifyNodes(mpks, complaints, threshold)
 	if err != nil {
 		return nil, err
 	}
@@ -417,7 +418,7 @@ func NewNodePublicKeys(
 	threshold int) (
 	*NodePublicKeys, error) {
 	qualifyIDs, qualifyNodeIDs, err :=
-		calcQualifyNodes(mpks, complaints, threshold)
+		CalcQualifyNodes(mpks, complaints, threshold)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index a3182f836..4ad0a8c6c 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
 		{
 			"checksumSHA1": "In6vBHYUsX7DUIGiFN2hQggBgvI=",
 			"path": "github.com/dexon-foundation/dexon-consensus/common",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "fE4+Jlw+2y4JJMHtGuHxHWqqPfY=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
@@ -165,64 +165,64 @@
 		{
 			"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "mMdctxTa/jNwAwZjjYoyEZdLoF8=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "hj/KetWUHp+1CX+50V0QnCthfWc=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/db",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "pxAzlI5kjyIAJSX+/aRGjjhR+pw=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "TmZF8DyrzGHTTfXXIFnKlzva3mU=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/types",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
-			"checksumSHA1": "yoVRmvJDCp/1jSfY7wMt2LBQ9e8=",
+			"checksumSHA1": "5BskQaPpK94/ecmvy845hwM6F+8=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},
 		{
 			"checksumSHA1": "pvJYiUy3EubRjeh5VYpt73Jjg1Q=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
-			"revision": "ecc5e12b1ac4826e302607769f5b831ab4c27046",
-			"revisionTime": "2019-04-01T04:25:09Z",
+			"revision": "b11406ecd961bc26f4382e06c8061708a58063e0",
+			"revisionTime": "2019-04-01T11:36:40Z",
 			"version": "single-chain",
 			"versionExact": "single-chain"
 		},