aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-05-10 19:43:07 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-05-10 19:43:07 +0800
commit20d4e527bd85f4bc20cd6a26daf7cd04e90fce07 (patch)
tree36b8d7c9c6cb82fb2656d3f6d8efca216888c7ac
parent5782164a35ea8acdb09507a604c45941051fd5f3 (diff)
parenta824c3f02f74eb11b4382abbb92aa8babc5d685c (diff)
downloadgo-tangerine-20d4e527bd85f4bc20cd6a26daf7cd04e90fce07.tar.gz
go-tangerine-20d4e527bd85f4bc20cd6a26daf7cd04e90fce07.tar.zst
go-tangerine-20d4e527bd85f4bc20cd6a26daf7cd04e90fce07.zip
Merge pull request #2537 from obscuren/hotfix-pending-statu
miner: fixed pending state by not shutting down update loop
-rw-r--r--miner/worker.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 3d1928bf6..fe759560c 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -145,7 +145,6 @@ func newWorker(config *core.ChainConfig, coinbase common.Address, eth core.Backe
fullValidation: false,
}
worker.events = worker.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{}, core.TxPreEvent{})
- worker.wg.Add(1)
go worker.update()
go worker.wait()
@@ -188,8 +187,6 @@ func (self *worker) start() {
}
func (self *worker) stop() {
- // Quit update.
- self.events.Unsubscribe()
self.wg.Wait()
self.mu.Lock()
@@ -224,7 +221,6 @@ func (self *worker) unregister(agent Agent) {
}
func (self *worker) update() {
- defer self.wg.Done()
for event := range self.events.Chan() {
// A real event arrived, process interesting content
switch ev := event.Data.(type) {