From 418975ecd6200e21496589aa61a67fd1dc505ead Mon Sep 17 00:00:00 2001
From: Callum Waters <cmwaters19@gmail.com>
Date: Tue, 22 Nov 2022 12:11:47 +0100
Subject: [PATCH] remove flush call after recheck tx

---
 mempool/v0/clist_mempool.go | 6 +++---
 mempool/v1/mempool.go       | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mempool/v0/clist_mempool.go b/mempool/v0/clist_mempool.go
index f1e323c79..9fb23c52a 100644
--- a/mempool/v0/clist_mempool.go
+++ b/mempool/v0/clist_mempool.go
@@ -664,9 +664,9 @@ func (mem *CListMempool) recheckTxs() {
 		}
 	}
 
-	if err := mem.proxyAppConn.Flush(context.TODO()); err != nil {
-		mem.logger.Error("recheckTx flush", err, "err")
-	}
+	// In <v0.37 we would call FlushAsync at the end of recheckTx forcing the buffer to flush
+	// all pending messages to the app. There doesn't seem to be any need here as the buffer
+	// will get flushed regularly or when filled.
 }
 
 //--------------------------------------------------------------------------------
diff --git a/mempool/v1/mempool.go b/mempool/v1/mempool.go
index 573a70d49..cd0a6cfd7 100644
--- a/mempool/v1/mempool.go
+++ b/mempool/v1/mempool.go
@@ -693,7 +693,9 @@ func (txmp *TxMempool) recheckTransactions() {
 				return nil
 			})
 		}
-		_ = txmp.proxyAppConn.Flush(context.TODO())
+		// In <v0.37 we would call FlushAsync at the end of recheckTx forcing the buffer to flush
+		// all pending messages to the app. There doesn't seem to be any need here as the buffer
+		// will get flushed regularly or when filled.
 
 		// When recheck is complete, trigger a notification for more transactions.
 		_ = g.Wait()