node,blocksync,config: remove support for running nodes with blocksync disabled (#7159)

We stopped testing these configurations a while ago, and it doesn't
really make sense to allow nodes to run in this configuration. This
drops support for non-blocksync nodes and cleans up the
configuration/tests accordingly.

Closes: #6908

test/e2e/generator/generate.go

@@ -278,7 +278,6 @@ func generateNode(
 		Database:         nodeDatabases.Choose(r),
 		PrivvalProtocol:  nodePrivvalProtocols.Choose(r),
 		Mempool:          nodeMempools.Choose(r),
-		BlockSync:        "v0",
 		StateSync:        e2e.StateSyncDisabled,
 		PersistInterval:  ptrUint64(uint64(nodePersistIntervals.Choose(r).(int))),
 		SnapshotInterval: uint64(nodeSnapshotIntervals.Choose(r).(int)),

test/e2e/generator/generate_test.go

@@ -43,9 +43,6 @@ func TestGenerator(t *testing.T) {
 						t.Run("PrivvalProtocol", func(t *testing.T) {
 							require.NotZero(t, node.PrivvalProtocol)
 						})
-						t.Run("BlockSync", func(t *testing.T) {
-							require.NotZero(t, node.BlockSync)
-						})
 					}
 				})
 			}

test/e2e/pkg/manifest.go

@@ -104,10 +104,6 @@ type ManifestNode struct {
 	// runner will wait for the network to reach at least this block height.
 	StartAt int64 `toml:"start_at"`
 
-	// BlockSync specifies the block sync mode: "" (disable), "v0" or "v2".
-	// Defaults to disabled.
-	BlockSync string `toml:"block_sync"`
-
 	// Mempool specifies which version of mempool to use. Either "v0" or "v1"
 	Mempool string `toml:"mempool_version"`
 

test/e2e/pkg/testnet.go

@@ -84,7 +84,6 @@ type Node struct {
 	IP               net.IP
 	ProxyPort        uint32
 	StartAt          int64
-	BlockSync        string
 	Mempool          string
 	StateSync        string
 	Database         string
@@ -177,7 +176,6 @@ func LoadTestnet(file string) (*Testnet, error) {
 			ABCIProtocol:     Protocol(testnet.ABCIProtocol),
 			PrivvalProtocol:  ProtocolFile,
 			StartAt:          nodeManifest.StartAt,
-			BlockSync:        "v0",
 			Mempool:          nodeManifest.Mempool,
 			StateSync:        nodeManifest.StateSync,
 			PersistInterval:  1,
@@ -335,11 +333,6 @@ func (n Node) Validate(testnet Testnet) error {
 			}
 		}
 	}
-	switch n.BlockSync {
-	case "", "v0", "v2":
-	default:
-		return fmt.Errorf("invalid block sync setting %q", n.BlockSync)
-	}
 	switch n.StateSync {
 	case StateSyncDisabled, StateSyncP2P, StateSyncRPC:
 	default:

test/e2e/runner/setup.go

@@ -294,11 +294,6 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) {
 		cfg.Mempool.Version = node.Mempool
 	}
 
-	cfg.BlockSync.Enable = true
-	if node.BlockSync == "" {
-		cfg.BlockSync.Enable = false
-	}
-
 	switch node.StateSync {
 	case e2e.StateSyncP2P:
 		cfg.StateSync.Enable = true