From 6c8218eed2492025b18ed4e5adccd3416336a382 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Mon, 22 Apr 2019 21:31:45 +0800
Subject: vendor: sync to latest core (#386)

---
 .../dexon-consensus/core/agreement.go              |  3 +-
 vendor/vendor.json                                 | 42 +++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'vendor')

diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
index 22153948d..d90afc610 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
@@ -436,8 +436,9 @@ func (a *agreement) processVote(vote *types.Vote) error {
 				vote:         vote,
 				receivedTime: time.Now().UTC(),
 			})
+			return nil
 		}
-		return nil
+		return ErrSkipButNoError
 	}
 	if vote.Position != aID {
 		if aID.Newer(vote.Position) {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 68bf4c6d8..1d1ba4730 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
 		{
 			"checksumSHA1": "In6vBHYUsX7DUIGiFN2hQggBgvI=",
 			"path": "github.com/dexon-foundation/dexon-consensus/common",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
-			"checksumSHA1": "m2MgY+DBrYg0nQykXcGbfhbZi0s=",
+			"checksumSHA1": "K/YaclK3zFvFyNIMj1QBc4hJoqc=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
@@ -165,64 +165,64 @@
 		{
 			"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "4besQaa0rm8jRUAJjpEaLZ/ZOYs=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "3Ludp/1V4dMBZH/c1oIVjHj0CqY=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/db",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "sO5twEFTdLvkMuQo+I3vyzm9T3o=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "0BY+E0E2cM7IHIMqunXwoolDS5Y=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/types",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "yEPSfn48GaJmDbd2OFY+QRhjJ0w=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
 		{
 			"checksumSHA1": "51hQ5Wl/n9A5cu8t2yNIqfUuIR8=",
 			"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
-			"revision": "6ab10aadc24193b1366bb1f048b92c1a6aec4861",
-			"revisionTime": "2019-04-19T04:03:31Z",
+			"revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
+			"revisionTime": "2019-04-22T09:25:34Z",
 			"version": "master",
 			"versionExact": "master"
 		},
-- 
cgit v1.2.3