fix: remove DefaultUpgradeHeightDelay override

pkg/appconsts/global_consts.go

@@ -30,10 +30,7 @@ const (
 	// DefaultUpgradeHeightDelay is the number of blocks after a quorum has been
 	// reached that the chain should upgrade to the new version. Assuming a block
 	// interval of 12 seconds, this is 7 days.
-	// DefaultUpgradeHeightDelay = int64(7 * 24 * 60 * 60 / 12)  // 7 days * 24 hours * 60 minutes * 60 seconds / 12 seconds per block = 50,400 blocks.
-
-	// HACKHACK: Override the default for the e2e test. Do not merge this as-is.
-	DefaultUpgradeHeightDelay = int64(1)
+	DefaultUpgradeHeightDelay = int64(7 * 24 * 60 * 60 / 12) // 7 days * 24 hours * 60 minutes * 60 seconds / 12 seconds per block = 50,400 blocks.
 )
 
 var (

test/e2e/major_upgrade_v3.go

@@ -25,8 +25,9 @@ func MajorUpgradeToV3(logger *log.Logger) error {
 	defer testNet.Cleanup(ctx)
 
 	// HACKHACK: use a version of celestia-app built from a commit on this PR.
-	// This can be removed after the PR is merged to main.
-	version := "pr-3910"
+	// This can be removed after the PR is merged to main and we override the
+	// upgrade height delay to one block in a new Docker image.
+	version := "1a20c01"
 
 	logger.Println("Running major upgrade to v3 test", "version", version)