diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-04-22 21:31:45 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-22 21:31:45 +0800 |
| commit | 4056d794eb09c9eee2ab8353a0c93ac34c601b28 (patch) | |
| tree | ed203ded4a2e193fd6fa5d70d41967fc32a6e880 | |
| parent | c69110d06efa62dc9cab4d717ef1b580da897527 (diff) | |
| download | go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar.gz go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar.bz2 go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar.lz go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar.xz go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.tar.zst go-tangerine-4056d794eb09c9eee2ab8353a0c93ac34c601b28.zip | |
vendor: sync to latest core (#386)
| -rw-r--r-- | vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go | 3 | ||||
| -rw-r--r-- | vendor/vendor.json | 42 |
2 files changed, 23 insertions, 22 deletions
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" }, |