mempool: consoldate implementations (#7171)

* mempool: consoldate implementations

* update chagelog

* fix test

* Apply suggestions from code review

Co-authored-by: M. J. Fromberger <michael.j.fromberger@gmail.com>

* cleanup locking comments

* context twiddle

* migrate away from deprecated ioutil APIs (#7175)

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
Co-authored-by: M. J. Fromberger <fromberger@interchain.io>

Co-authored-by: M. J. Fromberger <michael.j.fromberger@gmail.com>
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
Co-authored-by: M. J. Fromberger <fromberger@interchain.io>

test/e2e/generator/generate.go

@@ -44,10 +44,6 @@ var (
 		"tcp":  20,
 		"unix": 10,
 	}
-	nodeMempools = weightedChoice{
-		"v0": 20,
-		"v1": 80,
-	}
 	nodeStateSyncs = weightedChoice{
 		e2e.StateSyncDisabled: 10,
 		e2e.StateSyncP2P:      45,
@@ -277,7 +273,6 @@ func generateNode(
 		StartAt:          startAt,
 		Database:         nodeDatabases.Choose(r),
 		PrivvalProtocol:  nodePrivvalProtocols.Choose(r),
-		Mempool:          nodeMempools.Choose(r),
 		StateSync:        e2e.StateSyncDisabled,
 		PersistInterval:  ptrUint64(uint64(nodePersistIntervals.Choose(r).(int))),
 		SnapshotInterval: uint64(nodeSnapshotIntervals.Choose(r).(int)),
@@ -285,9 +280,6 @@ func generateNode(
 		Perturb:          nodePerturbations.Choose(r),
 	}
 
-	if node.Mempool == "" {
-		node.Mempool = "v1"
-	}
 	if node.PrivvalProtocol == "" {
 		node.PrivvalProtocol = "file"
 	}

test/e2e/generator/generate_test.go

@@ -37,9 +37,6 @@ func TestGenerator(t *testing.T) {
 						}
 					})
 					if e2e.Mode(node.Mode) != e2e.ModeLight {
-						t.Run("Mempool", func(t *testing.T) {
-							require.NotZero(t, node.Mempool)
-						})
 						t.Run("PrivvalProtocol", func(t *testing.T) {
 							require.NotZero(t, node.PrivvalProtocol)
 						})

test/e2e/runner/setup.go

@@ -291,10 +291,6 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) {
 		return nil, fmt.Errorf("unexpected mode %q", node.Mode)
 	}
 
-	if node.Mempool != "" {
-		cfg.Mempool.Version = node.Mempool
-	}
-
 	switch node.StateSync {
 	case e2e.StateSyncP2P:
 		cfg.StateSync.Enable = true