aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2019-04-24 15:26:36 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-15 22:09:56 +0800
commit3669053d5a73a37127ab5d9a7fc23f2e8198f813 (patch)
tree862b9c3b72882a0ad11b343c773495565bce3205
parent39c5430303e34f1b5d2712fdb4d13c9e9f9ade48 (diff)
downloadgo-tangerine-3669053d5a73a37127ab5d9a7fc23f2e8198f813.tar.gz
go-tangerine-3669053d5a73a37127ab5d9a7fc23f2e8198f813.tar.zst
go-tangerine-3669053d5a73a37127ab5d9a7fc23f2e8198f813.zip
vendor: sync to latest core (#392)
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go4
-rw-r--r--vendor/vendor.json42
2 files changed, 23 insertions, 23 deletions
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
index 3443c9676..a1def58e0 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
@@ -224,7 +224,7 @@ func (recv *consensusBAReceiver) ConfirmBlock(
var exist bool
block, exist = recv.agreementModule.findBlockNoLock(hash)
if !exist {
- recv.consensus.logger.Error("Unknown block confirmed",
+ recv.consensus.logger.Debug("Unknown block confirmed",
"hash", hash.String()[:6])
ch := make(chan *types.Block)
func() {
@@ -245,7 +245,7 @@ func (recv *consensusBAReceiver) ConfirmBlock(
case <-time.After(1 * time.Second):
}
}
- recv.consensus.logger.Info("Receive unknown block",
+ recv.consensus.logger.Debug("Receive unknown block",
"hash", hash.String()[:6],
"position", block.Position)
recv.agreementModule.addCandidateBlock(block)
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 1d1ba4730..3eaeb7733 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
{
"checksumSHA1": "In6vBHYUsX7DUIGiFN2hQggBgvI=",
"path": "github.com/dexon-foundation/dexon-consensus/common",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
- "checksumSHA1": "K/YaclK3zFvFyNIMj1QBc4hJoqc=",
+ "checksumSHA1": "q6i1dfbCBPnNz4w1NLF13v4++kg=",
"path": "github.com/dexon-foundation/dexon-consensus/core",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
@@ -165,64 +165,64 @@
{
"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "4besQaa0rm8jRUAJjpEaLZ/ZOYs=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "3Ludp/1V4dMBZH/c1oIVjHj0CqY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/db",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "sO5twEFTdLvkMuQo+I3vyzm9T3o=",
"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "0BY+E0E2cM7IHIMqunXwoolDS5Y=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "yEPSfn48GaJmDbd2OFY+QRhjJ0w=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "51hQ5Wl/n9A5cu8t2yNIqfUuIR8=",
"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
- "revision": "ff246f8ac36d7bbbb8323026c457200d66c07889",
- "revisionTime": "2019-04-22T09:25:34Z",
+ "revision": "3bc4cb2b9bb26c739d7e80daf42509628501758e",
+ "revisionTime": "2019-04-24T07:23:27Z",
"version": "master",
"versionExact": "master"
},