From ae45da4a70cb17a6640524d0a78fd6107f062fd9 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Tue, 8 Oct 2024 23:07:22 -0400 Subject: [PATCH] fix: remove DefaultUpgradeHeightDelay override --- pkg/appconsts/global_consts.go | 5 +---- test/e2e/major_upgrade_v3.go | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/appconsts/global_consts.go b/pkg/appconsts/global_consts.go index 46b715b7eb..2903da0414 100644 --- a/pkg/appconsts/global_consts.go +++ b/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 ( diff --git a/test/e2e/major_upgrade_v3.go b/test/e2e/major_upgrade_v3.go index 55dde9dfdc..22723125f2 100644 --- a/test/e2e/major_upgrade_v3.go +++ b/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)