aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/dexon-foundation
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-04-09 21:32:52 +0800
commit6ed9128259023d440ea3297da85e0a0dba12e941 (patch)
tree5e9648b04f3f482050fd170983b7530c2d46507d /vendor/github.com/dexon-foundation
parent2064d1f0271560ffaf42a870321bf7fc08aeb7f4 (diff)
downloaddexon-6ed9128259023d440ea3297da85e0a0dba12e941.tar.gz
dexon-6ed9128259023d440ea3297da85e0a0dba12e941.tar.zst
dexon-6ed9128259023d440ea3297da85e0a0dba12e941.zip
vendor: sync to latest core
Diffstat (limited to 'vendor/github.com/dexon-foundation')
-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