From 856c42f30e881f8820710da8423437a456477b8e Mon Sep 17 00:00:00 2001
From: Callum Waters <cmwaters19@gmail.com>
Date: Tue, 21 Nov 2023 12:27:48 +0100
Subject: [PATCH] take 3

---
 Makefile                      |  2 +-
 cmd/celestia-appd/cmd/root.go | 14 +-------------
 test/e2e/simple_test.go       |  1 +
 test/e2e/upgrade_test.go      |  1 -
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 21fe85a1a4..fc5e807ea7 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ test-short:
 ## test-e2e: Run end to end tests via knuu. This command requires a kube/config file to configure kubernetes.
 test-e2e:
 	@echo "--> Running end to end tests"
-	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_LATEST_VERSION=ef40921 E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
+	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_LATEST_VERSION=b8d2449 E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
 .PHONY: test-e2e
 
 ## test-race: Run tests in race mode.
diff --git a/cmd/celestia-appd/cmd/root.go b/cmd/celestia-appd/cmd/root.go
index f24133df6a..8b55b09e7c 100644
--- a/cmd/celestia-appd/cmd/root.go
+++ b/cmd/celestia-appd/cmd/root.go
@@ -1,11 +1,9 @@
 package cmd
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"path/filepath"
-	"strconv"
 
 	bscmd "github.com/celestiaorg/celestia-app/x/blobstream/client"
 
@@ -238,21 +236,11 @@ func NewAppServer(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts se
 		panic(err)
 	}
 
-	var upgradeHeight int64
-	upgradeHeightStr, ok := appOpts.Get(UpgradeHeightFlag).(string)
-	if ok {
-		fmt.Println("upgrade flag detected")
-		upgradeHeight, err = strconv.ParseInt(upgradeHeightStr, 10, 64)
-		if err != nil {
-			panic(err)
-		}
-	}
-
 	return app.New(
 		logger, db, traceStore, true,
 		cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)),
 		encoding.MakeConfig(app.ModuleEncodingRegisters...), // Ideally, we would reuse the one created by NewRootCmd.
-		upgradeHeight,
+		cast.ToInt64(appOpts.Get(UpgradeHeightFlag)),
 		appOpts,
 		baseapp.SetPruning(pruningOpts),
 		baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))),
diff --git a/test/e2e/simple_test.go b/test/e2e/simple_test.go
index 2fe606d531..31f58f440c 100644
--- a/test/e2e/simple_test.go
+++ b/test/e2e/simple_test.go
@@ -23,6 +23,7 @@ var latestVersion = "latest"
 // and MsgSends over 30 seconds and then asserts that at least 10 transactions were
 // committed.
 func TestE2ESimple(t *testing.T) {
+	t.Skip()
 	if os.Getenv("E2E") != "true" {
 		t.Skip("skipping e2e test")
 	}
diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go
index 081590ba36..79ec158d15 100644
--- a/test/e2e/upgrade_test.go
+++ b/test/e2e/upgrade_test.go
@@ -177,7 +177,6 @@ func TestMajorUpgradeToV2(t *testing.T) {
 		require.NoError(t, err)
 		resp, err := client.Header(ctx, nil)
 		require.NoError(t, err)
-		// FIXME: we are not correctly setting the app version at genesis
 		require.Equal(t, v1.Version, resp.Header.Version.App, "version mismatch before upgrade")
 	}