diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-11-05 18:37:46 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 97f5cf98e41a6ae9400e7dde6ae2d064e90ce793 (patch) | |
| tree | 8d92fd14e55f334705cfe1d6fce5209eb50d763d | |
| parent | 210ecfb9747901082d8f3a8a8b04605e0669981f (diff) | |
| download | dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.gz dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.zst dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.zip | |
vendor: sync to latest core
| -rw-r--r-- | vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go | 9 | ||||
| -rw-r--r-- | vendor/vendor.json | 34 |
2 files changed, 26 insertions, 17 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 2eed101c7..56c757b0d 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go @@ -159,6 +159,15 @@ func (recv *consensusBAReceiver) ConfirmBlock( recv.consensus.logger.Error("Failed to process block", "error", err) return } + // Clean the restartNotary channel so BA will not stuck by deadlock. +CleanChannelLoop: + for { + select { + case <-recv.restartNotary: + default: + break CleanChannelLoop + } + } if block.Timestamp.After(recv.changeNotaryTime) { recv.round++ recv.restartNotary <- true diff --git a/vendor/vendor.json b/vendor/vendor.json index 4c9a951be..9f8d288d1 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -105,50 +105,50 @@ { "checksumSHA1": "ev84RyegNbt2Pr/sK26LK9LoQNI=", "path": "github.com/dexon-foundation/dexon-consensus/common", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { - "checksumSHA1": "+zyT9PTNnQCnagwCssmx1mJeAqg=", + "checksumSHA1": "mpmQy/NAsKliUPVFaUEW9+vsTe8=", "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "vNsaBvsrXJF+W6K5DCLpgy1rUZY=", "path": "github.com/dexon-foundation/dexon-consensus/core/blockdb", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "p2jOAulavUU2xyj018pYPHlj8XA=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "6Pf6caC8LTNCI7IflFmglKYnxYo=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "RlxtJw5enzIY+6PNEyl1q48qKFg=", "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "ovChyW9OfDGnk/7CDAR+A5vJymc=", "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "c4541185c1d2502dffe09de1af52594f6fae16a6", - "revisionTime": "2018-11-05T05:29:15Z" + "revision": "f3e03e18d815d92493d3a85ecb3a0048247ecf71", + "revisionTime": "2018-11-05T10:36:13Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |