From aaf0855b5d4a2684e3b06a86c486346581f267b9 Mon Sep 17 00:00:00 2001
From: Adam Tucker <adamleetucker@outlook.com>
Date: Thu, 5 May 2022 03:02:13 +0000
Subject: [PATCH] address roman comments

---
 tests/e2e/e2e_setup_test.go | 8 ++++----
 tests/e2e/e2e_test.go       | 4 ++--
 tests/e2e/e2e_util_test.go  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go
index e6dffacb087..66aab265196 100644
--- a/tests/e2e/e2e_setup_test.go
+++ b/tests/e2e/e2e_setup_test.go
@@ -349,14 +349,14 @@ func (s *IntegrationTestSuite) initUpgrade() {
 	// wait till all chains halt at upgrade height
 	for _, chain := range s.chains {
 		for i := range chain.Validators {
-			s.T().Logf("waiting to reach upgrade height for chain-id: %s", chain.ChainMeta.Id)
+			s.T().Logf("waiting to reach upgrade height on %s validator container: %s", chain.ChainMeta.Id, s.valResources[chain.ChainMeta.Id][i].Container.ID)
 			s.Require().Eventually(
 				func() bool {
-					out := s.chainStatus(chain, i)
+					out := s.chainStatus(s.valResources[chain.ChainMeta.Id][i].Container.ID)
 					var syncInfo syncInfo
 					json.Unmarshal(out, &syncInfo)
 					if syncInfo.SyncInfo.LatestHeight != "75" {
-						fmt.Printf("current block height is %v, waiting for block 75\n", syncInfo.SyncInfo.LatestHeight)
+						s.T().Logf("current block height is %v, waiting for block 75 container: %s", syncInfo.SyncInfo.LatestHeight, s.valResources[chain.ChainMeta.Id][i].Container.ID)
 					}
 					return syncInfo.SyncInfo.LatestHeight == "75"
 				},
@@ -403,7 +403,7 @@ func (s *IntegrationTestSuite) upgrade() {
 		for i := range chain.Validators {
 			s.Require().Eventually(
 				func() bool {
-					out := s.chainStatus(chain, i)
+					out := s.chainStatus(s.valResources[chain.ChainMeta.Id][i].Container.ID)
 					var syncInfo syncInfo
 					json.Unmarshal(out, &syncInfo)
 					if syncInfo.SyncInfo.LatestHeight <= "75" {
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 9ac1153b6b0..bcb82702aae 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/osmosis-labs/osmosis/v7/tests/e2e/util"
 )
 
-func (s *IntegrationTestSuite) Test1IBCTokenTransfer() {
+func (s *IntegrationTestSuite) Test001IBCTokenTransfer() {
 	var ibcStakeDenom string
 
 	s.Run("send_uosmo_to_chainB", func() {
@@ -52,7 +52,7 @@ func (s *IntegrationTestSuite) Test1IBCTokenTransfer() {
 	})
 }
 
-func (s *IntegrationTestSuite) Test2QueryBalances() {
+func (s *IntegrationTestSuite) Test002QueryBalances() {
 	var (
 		expectedDenomsA   = []string{chain.OsmoDenom, chain.StakeDenom}
 		expectedDenomsB   = []string{chain.OsmoDenom, chain.StakeDenom, chain.IbcDenom}
diff --git a/tests/e2e/e2e_util_test.go b/tests/e2e/e2e_util_test.go
index 8a6d23a6dd2..3c9f4ba698b 100644
--- a/tests/e2e/e2e_util_test.go
+++ b/tests/e2e/e2e_util_test.go
@@ -238,7 +238,7 @@ func (s *IntegrationTestSuite) voteProposal(c *chain.Chain) {
 
 }
 
-func (s *IntegrationTestSuite) chainStatus(c *chain.Chain, i int) []byte {
+func (s *IntegrationTestSuite) chainStatus(containerId string) []byte {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
@@ -246,7 +246,7 @@ func (s *IntegrationTestSuite) chainStatus(c *chain.Chain, i int) []byte {
 		Context:      ctx,
 		AttachStdout: true,
 		AttachStderr: true,
-		Container:    s.valResources[c.ChainMeta.Id][i].Container.ID,
+		Container:    containerId,
 		User:         "root",
 		Cmd: []string{
 			"osmosisd", "status",