From e741d01231653eaa88a74efebb1e2cfa3dc96845 Mon Sep 17 00:00:00 2001
From: elias-orijtech <103319121+elias-orijtech@users.noreply.github.com>
Date: Wed, 27 Apr 2022 16:26:21 +0200
Subject: [PATCH] fuzz: don't panic on expected errors (#8423)

In the conversion to Go 1.18 fuzzing in e4991fd862c8300254417360feb2d66c5861aa54,
a `return 0` was converted to a panic. A `return 0` is a hint to the fuzzer, not
a failing testcase.

While here, clean up the test by folding setup code into it.
---
 test/fuzz/tests/mempool_test.go | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/test/fuzz/tests/mempool_test.go b/test/fuzz/tests/mempool_test.go
index a76b059ca..2c8623036 100644
--- a/test/fuzz/tests/mempool_test.go
+++ b/test/fuzz/tests/mempool_test.go
@@ -13,10 +13,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 )
 
-var mp *mempool.TxMempool
-var getMp func() mempool.Mempool
-
-func init() {
+func FuzzMempool(f *testing.F) {
 	app := kvstore.NewApplication()
 	logger := log.NewNopLogger()
 	conn := abciclient.NewLocalClient(logger, app)
@@ -28,19 +25,9 @@ func init() {
 	cfg := config.DefaultMempoolConfig()
 	cfg.Broadcast = false
 
-	getMp = func() mempool.Mempool {
-		if mp == nil {
-			mp = mempool.NewTxMempool(logger, cfg, conn)
-		}
-		return mp
-	}
-}
+	mp := mempool.NewTxMempool(logger, cfg, conn)
 
-func FuzzMempool(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		err := getMp().CheckTx(context.Background(), data, nil, mempool.TxInfo{})
-		if err != nil {
-			panic(err)
-		}
+		_ = mp.CheckTx(context.Background(), data, nil, mempool.TxInfo{})
 	})
 }