Split into elif in order to deal with pending or queue

core/tx_pool.go

@@ -1231,32 +1231,6 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 		}
 	}
 
-	// for AA we need to re-validate accounts that were included
-	// split into separate function
-	// This introduces some basic race conditions, so this needs to be refactored
-	for _, tx := range included {
-		var account = tx.To()
-		if account != nil && tx.IsAA() {
-			if pool.Has(tx.Hash()) {
-				pool.removeTx(tx.Hash(), true)
-			} else {
-				if pending := pool.pending[*account]; pending != nil {
-					pending_tx := pending.txs.Flatten()[0]
-					pool.removeTx(pending_tx.Hash(), true)
-					// ignore locals for now
-					pool.add(pending_tx, false)
-				}
-
-				if queued := pool.queue[*account]; queued != nil {
-					queued_tx := queued.txs.Flatten()[0]
-					pool.removeTx(queued_tx.Hash(), true)
-					// ignore locals for now
-					pool.add(queued_tx, false)
-				}
-			}
-		}
-	}
-
 	// Initialize the internal state to the current head
 	if newHead == nil {
 		newHead = pool.chain.CurrentBlock().Header() // Special case during testing
@@ -1296,20 +1270,16 @@ func (pool *TxPool) validateAAExecutables(txs []*types.Transaction) {
 		if account != nil && tx.IsAA() {
 			if pool.Has(tx.Hash()) {
 				pool.removeTx(tx.Hash(), true)
-			} else {
-				if pending := pool.pending[*account]; pending != nil {
-					pending_tx := pending.txs.Flatten()[0]
-					pool.removeTx(pending_tx.Hash(), true)
-					// ignore locals for now
-					pool.add(pending_tx, false)
-				}
-
-				if queued := pool.queue[*account]; queued != nil {
-					queued_tx := queued.txs.Flatten()[0]
-					pool.removeTx(queued_tx.Hash(), true)
-					// ignore locals for now
-					pool.add(queued_tx, false)
-				}
+			} else if pending := pool.pending[*account]; pending != nil {
+				pending_tx := pending.txs.Flatten()[0]
+				pool.removeTx(pending_tx.Hash(), true)
+				// ignore locals for now
+				pool.add(pending_tx, false)
+			} else if queued := pool.queue[*account]; queued != nil {
+				queued_tx := queued.txs.Flatten()[0]
+				pool.removeTx(queued_tx.Hash(), true)
+				// ignore locals for now
+				pool.add(queued_tx, false)
 			}
 		}
 	}