remove v1 and v2 blocksync protocol impementations (#9146)

test/e2e/generator/generate.go

@@ -26,10 +26,9 @@ var (
 	nodeDatabases = uniformChoice{"goleveldb", "cleveldb", "rocksdb", "boltdb", "badgerdb"}
 	ipv6          = uniformChoice{false, true}
 	// FIXME: grpc disabled due to https://github.com/tendermint/tendermint/issues/5439
-	nodeABCIProtocols    = uniformChoice{"unix", "tcp", "builtin"} // "grpc"
-	nodePrivvalProtocols = uniformChoice{"file", "unix", "tcp"}
-	// FIXME: v2 disabled due to flake
-	nodeFastSyncs         = uniformChoice{"v0"} // "v2"
+	nodeABCIProtocols     = uniformChoice{"unix", "tcp", "builtin"} // "grpc"
+	nodePrivvalProtocols  = uniformChoice{"file", "unix", "tcp"}
+	nodeFastSyncs         = uniformChoice{false, true}
 	nodeStateSyncs        = uniformChoice{false, true}
 	nodeMempools          = uniformChoice{"v0", "v1"}
 	nodePersistIntervals  = uniformChoice{0, 1, 5}
@@ -202,7 +201,7 @@ func generateNode(
 		StartAt:          startAt,
 		Database:         nodeDatabases.Choose(r).(string),
 		PrivvalProtocol:  nodePrivvalProtocols.Choose(r).(string),
-		FastSync:         nodeFastSyncs.Choose(r).(string),
+		FastSync:         nodeFastSyncs.Choose(r).(bool),
 		Mempool:          nodeMempools.Choose(r).(string),
 		StateSync:        nodeStateSyncs.Choose(r).(bool) && startAt > 0,
 		PersistInterval:  ptrUint64(uint64(nodePersistIntervals.Choose(r).(int))),

test/e2e/networks/ci.toml

@@ -66,7 +66,7 @@ perturb = ["pause"]
 start_at = 1005 # Becomes part of the validator set at 1010
 seeds = ["seed02"]
 database = "cleveldb"
-fast_sync = "v0"
+fast_sync = true
 mempool_version = "v1"
 # FIXME: should be grpc, disabled due to https://github.com/tendermint/tendermint/issues/5439
 #abci_protocol = "grpc"
@@ -76,8 +76,7 @@ perturb = ["kill", "pause", "disconnect", "restart"]
 [node.full01]
 start_at = 1010
 mode = "full"
-# FIXME: should be v2, disabled due to flake
-fast_sync = "v0"
+fast_sync = true
 persistent_peers = ["validator01", "validator02", "validator03", "validator04", "validator05"]
 retain_blocks = 1
 perturb = ["restart"]
@@ -85,8 +84,7 @@ perturb = ["restart"]
 [node.full02]
 start_at = 1015
 mode = "full"
-# FIXME: should be v2, disabled due to flake
-fast_sync = "v0"
+fast_sync = true
 state_sync = true
 seeds = ["seed01"]
 perturb = ["restart"]

test/e2e/pkg/manifest.go

@@ -88,9 +88,8 @@ type ManifestNode struct {
 	// runner will wait for the network to reach at least this block height.
 	StartAt int64 `toml:"start_at"`
 
-	// FastSync specifies the fast sync mode: "" (disable), "v0", "v1", or "v2".
-	// Defaults to disabled.
-	FastSync string `toml:"fast_sync"`
+	// FastSync specifies whether to enable the fast sync protocol.
+	FastSync bool `toml:"fast_sync"`
 
 	// Mempool specifies which version of mempool to use. Either "v0" or "v1"
 	// This defaults to v0.

test/e2e/pkg/testnet.go

@@ -72,7 +72,7 @@ type Node struct {
 	IP               net.IP
 	ProxyPort        uint32
 	StartAt          int64
-	FastSync         string
+	FastSync         bool
 	StateSync        bool
 	Mempool          string
 	Database         string
@@ -297,12 +297,6 @@ func (n Node) Validate(testnet Testnet) error {
 			}
 		}
 	}
-	switch n.FastSync {
-	case "", "v0", "v1", "v2":
-	default:
-		return fmt.Errorf("invalid fast sync setting %q", n.FastSync)
-
-	}
 	switch n.Mempool {
 	case "", "v0", "v1":
 	default:

test/e2e/runner/setup.go

@@ -285,11 +285,7 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) {
 		cfg.Mempool.Version = node.Mempool
 	}
 
-	if node.FastSync == "" {
-		cfg.FastSyncMode = false
-	} else {
-		cfg.FastSync.Version = node.FastSync
-	}
+	cfg.FastSyncMode = node.FastSync
 
 	if node.StateSync {
 		cfg.StateSync.Enable = true