From 9702badd83399d62dca4df0cfd65587340def300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 31 May 2017 21:29:50 +0300
Subject: [PATCH] core: don't uselessly recheck transactions on dump

---
 core/tx_pool.go | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/core/tx_pool.go b/core/tx_pool.go
index 1f5b46d4b6..5e399d95f3 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -339,17 +339,6 @@ func (pool *TxPool) Pending() (map[common.Address]types.Transactions, error) {
 	pool.mu.Lock()
 	defer pool.mu.Unlock()
 
-	state, err := pool.currentState()
-	if err != nil {
-		return nil, err
-	}
-
-	// check queue first
-	pool.promoteExecutables(state)
-
-	// invalidate any txs
-	pool.demoteUnexecutables(state)
-
 	pending := make(map[common.Address]types.Transactions)
 	for addr, list := range pool.pending {
 		pending[addr] = list.Flatten()
@@ -551,12 +540,12 @@ func (pool *TxPool) Add(tx *types.Transaction) error {
 	if err != nil {
 		return err
 	}
-	state, err := pool.currentState()
-	if err != nil {
-		return err
-	}
 	// If we added a new transaction, run promotion checks and return
 	if !replace {
+		state, err := pool.currentState()
+		if err != nil {
+			return err
+		}
 		pool.promoteExecutables(state)
 	}
 	return nil
@@ -579,11 +568,11 @@ func (pool *TxPool) AddBatch(txs []*types.Transaction) error {
 	}
 	// Only reprocess the internal state if something was actually added
 	if added > 0 {
-		state, err := pool.currentState()
-		if err != nil {
-			return err
-		}
 		if !replaced {
+			state, err := pool.currentState()
+			if err != nil {
+				return err
+			}
 			pool.promoteExecutables(state)
 		}
 	}