From e1ab3e03d1e3ea560955e22c68c57a5c10a18f67 Mon Sep 17 00:00:00 2001 From: benjamin202410 Date: Thu, 19 Dec 2024 01:18:13 -0800 Subject: [PATCH] add buffer channel to unlock deadlock (#766) * add buffer channel to unlock deadlock * add buffer channel to unlock deadlock * close channel --------- Co-authored-by: liam.lai --- miner/worker.go | 7 +++++-- params/version.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index df642c49bb..31bb721744 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -277,12 +277,15 @@ func (self *worker) update() { MinePeriodCh := self.engine.(*XDPoS.XDPoS).MinePeriodCh defer close(MinePeriodCh) NewRoundCh := self.engine.(*XDPoS.XDPoS).NewRoundCh + defer close(NewRoundCh) timeout := time.NewTimer(time.Duration(minePeriod) * time.Second) - c := make(chan struct{}) + defer timeout.Stop() + c := make(chan struct{}, 1) + defer close(c) finish := make(chan struct{}) defer close(finish) - defer timeout.Stop() + go func() { for { // A real event arrived, process interesting content diff --git a/params/version.go b/params/version.go index a2aea26f2c..45407ecbb3 100644 --- a/params/version.go +++ b/params/version.go @@ -23,7 +23,7 @@ import ( const ( VersionMajor = 2 // Major version component of the current release VersionMinor = 4 // Minor version component of the current release - VersionPatch = 3 // Patch version component of the current release + VersionPatch = 4 // Patch version component of the current release VersionMeta = "beta1" // Version metadata to append to the version string )