From 80a2999624f05d2a682822702132603966cc1c98 Mon Sep 17 00:00:00 2001
From: Jeff Wentworth <jeff@curvegrid.com>
Date: Fri, 8 Mar 2019 10:29:06 +0900
Subject: [PATCH] [#19212] code cleanup

---
 core/tx_pool.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/tx_pool.go b/core/tx_pool.go
index bdde7c794b..5202dc8d7e 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -394,13 +394,13 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 			)
 
 			// handle cases where rem or add could come up nil
-			if rem == nil && add == nil {
-				return
-			} else if rem != nil && add == nil {
-				discarded = append(discarded, rem.Transactions()...)
-				return
-			} else if rem == nil && add != nil {
-				included = append(included, add.Transactions()...)
+			if rem == nil || add == nil {
+				if rem != nil{
+					discarded = append(discarded, rem.Transactions()...)
+				}
+				if add != nil{
+					included = append(included, add.Transactions()...)
+				}
 				return
 			}