From 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 4 Jun 2015 17:28:09 +0200
Subject: core: added fork test & double nonce test

---
 core/transaction_pool.go | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'core/transaction_pool.go')

diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 462159fa7..27dc1b0d1 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -68,31 +68,37 @@ func (pool *TxPool) Start() {
 	pool.events = pool.eventMux.Subscribe(ChainEvent{})
 	for _ = range pool.events.Chan() {
 		pool.mu.Lock()
-		pool.state = state.ManageState(pool.currentState())
-
-		// validate the pool of pending transactions, this will remove
-		// any transactions that have been included in the block or
-		// have been invalidated because of another transaction (e.g.
-		// higher gas price)
-		pool.validatePool()
-
-		// Loop over the pending transactions and base the nonce of the new
-		// pending transaction set.
-		for _, tx := range pool.pending {
-			if addr, err := tx.From(); err == nil {
-				// Set the nonce. Transaction nonce can never be lower
-				// than the state nonce; validatePool took care of that.
-				pool.state.SetNonce(addr, tx.Nonce())
-			}
-		}
 
-		// Check the queue and move transactions over to the pending if possible
-		// or remove those that have become invalid
-		pool.checkQueue()
+		pool.resetState()
+
 		pool.mu.Unlock()
 	}
 }
 
+func (pool *TxPool) resetState() {
+	pool.state = state.ManageState(pool.currentState())
+
+	// validate the pool of pending transactions, this will remove
+	// any transactions that have been included in the block or
+	// have been invalidated because of another transaction (e.g.
+	// higher gas price)
+	pool.validatePool()
+
+	// Loop over the pending transactions and base the nonce of the new
+	// pending transaction set.
+	for _, tx := range pool.pending {
+		if addr, err := tx.From(); err == nil {
+			// Set the nonce. Transaction nonce can never be lower
+			// than the state nonce; validatePool took care of that.
+			pool.state.SetNonce(addr, tx.Nonce())
+		}
+	}
+
+	// Check the queue and move transactions over to the pending if possible
+	// or remove those that have become invalid
+	pool.checkQueue()
+}
+
 func (pool *TxPool) Stop() {
 	pool.pending = make(map[common.Hash]*types.Transaction)
 	close(pool.quit)
-- 
cgit v1.2.3