From a04759c4f6b9d6092b2c6437352fba5057f10ffd Mon Sep 17 00:00:00 2001
From: tycho garen <garen@tychoish.com>
Date: Fri, 8 Jul 2022 12:22:10 -0400
Subject: [PATCH] force blocksync

---
 test/e2e/generator/generate.go | 2 +-
 test/e2e/networks/ci.toml      | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go
index 4a17ddf3a..93aeb29fc 100644
--- a/test/e2e/generator/generate.go
+++ b/test/e2e/generator/generate.go
@@ -397,7 +397,7 @@ func generateNode(
 		StartAt:          startAt,
 		Database:         nodeDatabases.Choose(r),
 		PrivvalProtocol:  nodePrivvalProtocols.Choose(r),
-		BlockSync:        nodeBlockSyncs.Choose(r).(string),
+		BlockSync:        "v0",
 		Mempool:          nodeMempools.Choose(r).(string),
 		StateSync:        e2e.StateSyncDisabled,
 		PersistInterval:  ptrUint64(uint64(nodePersistIntervals.Choose(r).(int))),
diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml
index 9931aee02..bf835df35 100644
--- a/test/e2e/networks/ci.toml
+++ b/test/e2e/networks/ci.toml
@@ -34,7 +34,6 @@ perturb = ["restart"]
 [node.validator01]
 perturb = ["disconnect"]
 seeds = ["seed01"]
-block_sync = "v0"
 snapshot_interval = 5
 
 [node.validator02]
@@ -44,7 +43,6 @@ persist_interval = 0
 perturb = ["restart"]
 privval_protocol = "tcp"
 seeds = ["seed01"]
-block_sync = "v0"
 
 [node.validator03]
 database = "badgerdb"
@@ -53,7 +51,6 @@ abci_protocol = "grpc"
 persist_interval = 3
 perturb = ["kill"]
 privval_protocol = "grpc"
-block_sync = "v0"
 retain_blocks = 10
 
 [node.validator04]
@@ -62,11 +59,9 @@ 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
@@ -77,7 +72,6 @@ privval_protocol = "tcp"
 [node.full01]
 mode = "full"
 start_at = 1010
-block_sync = "v0"
 persistent_peers = ["validator01", "validator02", "validator03", "validator04"]
 perturb = ["restart"]
 retain_blocks = 10