From 26d421b8f6c3e9b2ba98c32b1f9cac3a06d3ee7b Mon Sep 17 00:00:00 2001
From: Sam Kleinman <garen@tychoish.com>
Date: Tue, 7 Dec 2021 16:17:55 -0500
Subject: [PATCH] Revert "ci: tweak e2e configuration (#7400)" (#7404)

This reverts commit b057740bd3dc92689b83901eb7cbd33758661f38.
---
 test/e2e/networks/ci.toml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml
index b3fa7891f..f73a18859 100644
--- a/test/e2e/networks/ci.toml
+++ b/test/e2e/networks/ci.toml
@@ -16,14 +16,15 @@ validator03 = 30
 validator04 = 40
 
 [validator_update.1010]
-validator04 = 50
+validator05 = 50
 
 # validator03 gets killed and validator05 has lots of perturbations, so weight them low.
 [validator_update.1020]
 validator01 = 100
 validator02 = 100
 validator03 = 50
-validator04 = 50
+validator04 = 100
+validator05 = 50
 
 [node.seed01]
 mode = "seed"
@@ -37,7 +38,7 @@ block_sync = "v0"
 
 [node.validator02]
 abci_protocol = "tcp"
-database = "rocksdb"
+database = "boltdb"
 persist_interval = 0
 perturb = ["restart"]
 privval_protocol = "tcp"
@@ -55,19 +56,28 @@ block_sync = "v0"
 retain_blocks = 10
 
 [node.validator04]
+abci_protocol = "builtin"
+snapshot_interval = 5
+database = "rocksdb"
+persistent_peers = ["validator01"]
+perturb = ["pause"]
+block_sync = "v0"
+
+[node.validator05]
 database = "cleveldb"
 block_sync = "v0"
 state_sync = "p2p"
 seeds = ["seed01"]
 start_at = 1005 # Becomes part of the validator set at 1010
 abci_protocol = "grpc"
-perturb = ["pause"]
+perturb = ["pause", "disconnect", "restart"]
 privval_protocol = "tcp"
 
 [node.full01]
 mode = "full"
 start_at = 1010
 block_sync = "v0"
+persistent_peers = ["validator01", "validator02", "validator03", "validator04"]
 perturb = ["restart"]
 retain_blocks = 10
 state_sync = "rpc"