From 0cafe8930144eb1f676d9736487147dd4cf261da Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Wed, 30 Nov 2022 12:06:30 -0500
Subject: [PATCH] start and create calls replaced with infra provider

---
 test/e2e/runner/main.go  | 12 ++++++------
 test/e2e/runner/start.go | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 1c3840080..a2a8a3b10 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -112,7 +112,7 @@ func NewCLI() *CLI {
 				chLoadResult <- err
 			}()
 
-			if err := Start(cli.testnet); err != nil {
+			if err := Start(cli.testnet, cli.infp); err != nil {
 				return err
 			}
 
@@ -186,7 +186,7 @@ func NewCLI() *CLI {
 			if err != nil {
 				return err
 			}
-			return Start(cli.testnet)
+			return Start(cli.testnet, cli.infp)
 		},
 	})
 
@@ -211,7 +211,7 @@ func NewCLI() *CLI {
 		Short: "Stops the Docker testnet",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			logger.Info("Stopping testnet")
-			return docker.ExecCompose(context.Background(), cli.testnet.Dir, "down") 
+			return docker.ExecCompose(context.Background(), cli.testnet.Dir, "down")
 		},
 	})
 
@@ -266,7 +266,7 @@ func NewCLI() *CLI {
 		Use:   "logs",
 		Short: "Shows the testnet logs",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs") 
+			return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs")
 		},
 	})
 
@@ -274,7 +274,7 @@ func NewCLI() *CLI {
 		Use:   "tail",
 		Short: "Tails the testnet logs",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs", "--follow") 
+			return docker.ExecComposeVerbose(context.Background(), cli.testnet.Dir, "logs", "--follow")
 		},
 	})
 
@@ -309,7 +309,7 @@ Does not run any perturbations.
 				chLoadResult <- err
 			}()
 
-			if err := Start(cli.testnet); err != nil {
+			if err := Start(cli.testnet, cli.infp); err != nil {
 				return err
 			}
 
diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go
index 08dab035f..4a8a521bc 100644
--- a/test/e2e/runner/start.go
+++ b/test/e2e/runner/start.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/tendermint/tendermint/libs/log"
 	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
-	"github.com/tendermint/tendermint/test/e2e/pkg/infra/docker"
+	"github.com/tendermint/tendermint/test/e2e/pkg/infra"
 )
 
-func Start(testnet *e2e.Testnet) error {
+func Start(testnet *e2e.Testnet, p infra.Provider) error {
 	if len(testnet.Nodes) == 0 {
 		return fmt.Errorf("no nodes in testnet")
 	}
@@ -45,7 +45,12 @@ func Start(testnet *e2e.Testnet) error {
 	for len(nodeQueue) > 0 && nodeQueue[0].StartAt == 0 {
 		node := nodeQueue[0]
 		nodeQueue = nodeQueue[1:]
-		if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil {
+		err := p.CreateNode(context.Background(), node)
+		if err != nil {
+			return err
+		}
+		err = p.StartTendermint(context.Background(), node)
+		if err != nil {
 			return err
 		}
 		if _, err := waitForNode(node, 0, 15*time.Second); err != nil {
@@ -99,7 +104,12 @@ func Start(testnet *e2e.Testnet) error {
 
 		logger.Info("Starting catch up node", "node", node.Name, "height", node.StartAt)
 
-		if err := docker.ExecCompose(context.Background(), testnet.Dir, "up", "-d", node.Name); err != nil {
+		err := p.CreateNode(context.Background(), node)
+		if err != nil {
+			return err
+		}
+		err = p.StartTendermint(context.Background(), node)
+		if err != nil {
 			return err
 		}
 		status, err := waitForNode(node, node.StartAt, 3*time.Minute)