From 4407524d13994759230ce6d31d828914597e8f6c Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 10 Jun 2015 13:59:45 +0200 Subject: [PATCH] core: fixed race condition for subscriptions --- core/transaction_pool.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/transaction_pool.go b/core/transaction_pool.go index b63a4dcabf..4a05942281 100644 --- a/core/transaction_pool.go +++ b/core/transaction_pool.go @@ -58,6 +58,7 @@ func NewTxPool(eventMux *event.TypeMux, currentStateFn stateFn, gasLimitFn func( currentState: currentStateFn, gasLimit: gasLimitFn, pendingState: state.ManageState(currentStateFn()), + events: eventMux.Subscribe(ChainEvent{}), } go pool.eventLoop() @@ -68,7 +69,6 @@ func (pool *TxPool) eventLoop() { // Track chain events. When a chain events occurs (new chain canon block) // we need to know the new state. The new state will help us determine // the nonces in the managed state - pool.events = pool.eventMux.Subscribe(ChainEvent{}) for _ = range pool.events.Chan() { pool.mu.Lock() @@ -103,7 +103,6 @@ func (pool *TxPool) resetState() { } func (pool *TxPool) Stop() { - pool.pending = make(map[common.Hash]*types.Transaction) close(pool.quit) pool.events.Unsubscribe() glog.V(logger.Info).Infoln("TX Pool stopped")