e2e adapted to mempool v1; prio pool is default now

test/e2e/pkg/manifest.go

@@ -91,7 +91,8 @@ type ManifestNode struct {
 	// FastSync specifies the fast sync mode: "" (disable), "v0", "v1", or "v2".
 	// Defaults to disabled.
 	FastSync string `toml:"fast_sync"`
-
+	// Mempool specifies which version of mempool to use. Either "v0" or "v1"
+	Mempool string `toml:"mempool_version"`
 	// StateSync enables state sync. The runner automatically configures trusted
 	// block hashes and RPC servers. At least one node in the network must have
 	// SnapshotInterval set to non-zero, and the state syncing node must have

test/e2e/pkg/testnet.go

@@ -75,6 +75,7 @@ type Node struct {
 	StartAt          int64
 	FastSync         string
 	StateSync        bool
+	Mempool          string
 	Database         string
 	ABCIProtocol     Protocol
 	PrivvalProtocol  Protocol
@@ -157,6 +158,7 @@ func LoadTestnet(file string) (*Testnet, error) {
 			PrivvalProtocol:  ProtocolFile,
 			StartAt:          nodeManifest.StartAt,
 			FastSync:         nodeManifest.FastSync,
+			Mempool:          nodeManifest.Mempool,
 			StateSync:        nodeManifest.StateSync,
 			PersistInterval:  1,
 			SnapshotInterval: nodeManifest.SnapshotInterval,
@@ -309,6 +311,11 @@ func (n Node) Validate(testnet Testnet) error {
 	case "", "v0", "v1", "v2":
 	default:
 		return fmt.Errorf("invalid fast sync setting %q", n.FastSync)
+		switch n.Mempool {
+		case "", "v0", "v1":
+		default:
+			return fmt.Errorf("invalid mempool version %q", n.Mempool)
+		}
 	}
 	switch n.Database {
 	case "goleveldb", "cleveldb", "boltdb", "rocksdb", "badgerdb":