aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2018-11-05 18:37:46 +0800
committerWei-Ning Huang <w@dexon.org>2019-03-12 12:19:09 +0800
commit97f5cf98e41a6ae9400e7dde6ae2d064e90ce793 (patch)
tree8d92fd14e55f334705cfe1d6fce5209eb50d763d /vendor/github.com
parent210ecfb9747901082d8f3a8a8b04605e0669981f (diff)
downloaddexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.gz
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.bz2
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.lz
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.xz
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.tar.zst
dexon-97f5cf98e41a6ae9400e7dde6ae2d064e90ce793.zip
vendor: sync to latest core
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go9
1 files changed, 9 insertions, 0 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