e2e: abci protocol should be consistent across networks (#7078)

It seems weird in retrospect that we allow networks to contain
applications that use different ABCI protocols.

test/e2e/pkg/testnet.go

@@ -71,6 +71,7 @@ type Testnet struct {
 	Evidence         int
 	LogLevel         string
 	TxSize           int64
+	ABCIProtocol     string
 }
 
 // Node represents a Tendermint node in a testnet.
@@ -140,6 +141,7 @@ func LoadTestnet(file string) (*Testnet, error) {
 		KeyType:          "ed25519",
 		LogLevel:         manifest.LogLevel,
 		TxSize:           manifest.TxSize,
+		ABCIProtocol:     manifest.ABCIProtocol,
 	}
 	if len(manifest.KeyType) != 0 {
 		testnet.KeyType = manifest.KeyType
@@ -150,6 +152,9 @@ func LoadTestnet(file string) (*Testnet, error) {
 	if manifest.InitialHeight > 0 {
 		testnet.InitialHeight = manifest.InitialHeight
 	}
+	if testnet.ABCIProtocol == "" {
+		testnet.ABCIProtocol = string(ProtocolBuiltin)
+	}
 
 	// Set up nodes, in alphabetical order (IPs and ports get same order).
 	nodeNames := []string{}
@@ -169,7 +174,7 @@ func LoadTestnet(file string) (*Testnet, error) {
 			ProxyPort:        proxyPortGen.Next(),
 			Mode:             ModeValidator,
 			Database:         "goleveldb",
-			ABCIProtocol:     ProtocolBuiltin,
+			ABCIProtocol:     Protocol(testnet.ABCIProtocol),
 			PrivvalProtocol:  ProtocolFile,
 			StartAt:          nodeManifest.StartAt,
 			BlockSync:        "v0",
@@ -192,9 +197,6 @@ func LoadTestnet(file string) (*Testnet, error) {
 		if nodeManifest.Database != "" {
 			node.Database = nodeManifest.Database
 		}
-		if nodeManifest.ABCIProtocol != "" {
-			node.ABCIProtocol = Protocol(nodeManifest.ABCIProtocol)
-		}
 		if nodeManifest.PrivvalProtocol != "" {
 			node.PrivvalProtocol = Protocol(nodeManifest.PrivvalProtocol)
 		}