From 9c8c6c4cffcb8990b8be372d0a63e4714c4852a0 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Wed, 30 Nov 2022 18:02:16 -0500
Subject: [PATCH] move agent socket dial to client connection creation

---
 test/e2e/pkg/ssh/ssh.go | 8 +++++++-
 test/e2e/runner/main.go | 9 +--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/e2e/pkg/ssh/ssh.go b/test/e2e/pkg/ssh/ssh.go
index ea74e23d5..07be10ccc 100644
--- a/test/e2e/pkg/ssh/ssh.go
+++ b/test/e2e/pkg/ssh/ssh.go
@@ -1,6 +1,7 @@
 package ssh
 
 import (
+	"net"
 	"os"
 	"path/filepath"
 
@@ -23,7 +24,12 @@ func Exec(cfg *ssh.ClientConfig, addr, cmd string) error {
 	return nil
 }
 
-func NewClientConfig(ac agent.ExtendedAgent) (*ssh.ClientConfig, error) {
+func NewClientConfig() (*ssh.ClientConfig, error) {
+	c, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))
+	if err != nil {
+		return nil, err
+	}
+	ac := agent.NewClient(c)
 	hkc, err := knownhosts.New(filepath.Join(os.Getenv("HOME"), ".ssh", "known_hosts"))
 	if err != nil {
 		return nil, err
diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index c2d0567f2..e599b7309 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -5,12 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"net"
 	"os"
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh/agent"
 
 	"github.com/tendermint/tendermint/libs/log"
 	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
@@ -95,12 +93,7 @@ func NewCLI() *CLI {
 			case "docker":
 				cli.infp = &docker.Provider{Testnet: testnet}
 			case "digital-ocean":
-				c, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK")) // TODO(williambanfield): Ensure this is a consistent location for the authentication socket of the agent.
-				if err != nil {
-					return err
-				}
-				ac := agent.NewClient(c)
-				cfg, err := e2essh.NewClientConfig(ac)
+				cfg, err := e2essh.NewClientConfig()
 				if err != nil {
 					return err
 				}