mempool: v1 implementation (#6466)

test/e2e/tests/app_test.go

@@ -87,11 +87,12 @@ func TestApp_Tx(t *testing.T) {
 
 		hash := tx.Hash()
 		waitTime := 20 * time.Second
+
 		require.Eventuallyf(t, func() bool {
 			txResp, err := client.Tx(ctx, hash, false)
 			return err == nil && bytes.Equal(txResp.Tx, tx)
 		}, waitTime, time.Second,
-			"submitted tx wasn't committed after %v", waitTime,
+			"submitted tx %X wasn't committed after %v", hash, waitTime,
 		)
 
 		// NOTE: we don't test abci query of the light client

test/fuzz/mempool/checktx.go

@@ -3,11 +3,12 @@ package checktx
 import (
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	"github.com/tendermint/tendermint/config"
-	mempl "github.com/tendermint/tendermint/mempool"
+	"github.com/tendermint/tendermint/mempool"
+	mempoolv0 "github.com/tendermint/tendermint/mempool/v0"
 	"github.com/tendermint/tendermint/proxy"
 )
 
-var mempool mempl.Mempool
+var mp mempool.Mempool
 
 func init() {
 	app := kvstore.NewApplication()
@@ -21,11 +22,11 @@ func init() {
 	cfg := config.DefaultMempoolConfig()
 	cfg.Broadcast = false
 
-	mempool = mempl.NewCListMempool(cfg, appConnMem, 0)
+	mp = mempoolv0.NewCListMempool(cfg, appConnMem, 0)
 }
 
 func Fuzz(data []byte) int {
-	err := mempool.CheckTx(data, nil, mempl.TxInfo{})
+	err := mp.CheckTx(data, nil, mempool.TxInfo{})
 	if err != nil {
 		return 0
 	}