allow e2e to work for out of process app

test/e2e/pkg/manifest.go

@@ -96,6 +96,8 @@ type ManifestNode struct {
 	// This defaults to v0.
 	Mempool string `toml:"mempool_version"`
 
+	ABCIProtocol string `toml:"abci_protocol"`
+
 	// StateSync enables state sync. The runner automatically configures trusted
 	// block hashes and RPC servers. At least one node in the network must have
 	// SnapshotInterval set to non-zero, and the state syncing node must have

test/e2e/pkg/testnet.go

@@ -145,6 +145,10 @@ func LoadTestnet(file string) (*Testnet, error) {
 
 	for _, name := range nodeNames {
 		nodeManifest := manifest.Nodes[name]
+		abciProtocol := "builtin"
+		if nodeManifest.ABCIProtocol != "" {
+			abciProtocol = nodeManifest.ABCIProtocol
+		}
 		node := &Node{
 			Name:             name,
 			Testnet:          testnet,
@@ -154,7 +158,7 @@ func LoadTestnet(file string) (*Testnet, error) {
 			ProxyPort:        proxyPortGen.Next(),
 			Mode:             ModeValidator,
 			Database:         "goleveldb",
-			ABCIProtocol:     Protocol(testnet.ABCIProtocol),
+			ABCIProtocol:     Protocol(abciProtocol),
 			PrivvalProtocol:  ProtocolFile,
 			StartAt:          nodeManifest.StartAt,
 			FastSync:         nodeManifest.FastSync,