From a7426a2efb6c6ce53e86c309a27dcd5872adf99c Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 10 Jan 2025 18:37:37 +0800 Subject: [PATCH 1/2] fix(systemtests): align halt-height with comet in upgrade (#23306) (cherry picked from commit 8cc13ed2e2b4fca118b27cfaaaef71c2420aff06) --- tests/systemtests/upgrade_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/systemtests/upgrade_test.go b/tests/systemtests/upgrade_test.go index 76b0b5fa5759..14cdc45450b5 100644 --- a/tests/systemtests/upgrade_test.go +++ b/tests/systemtests/upgrade_test.go @@ -42,7 +42,7 @@ func TestChainUpgrade(t *testing.T) { upgradeName = "v050-to-v052" // must match UpgradeName in simapp/upgrades.go ) - systest.Sut.StartChain(t, fmt.Sprintf("--halt-height=%d", upgradeHeight+1)) + systest.Sut.StartChain(t, fmt.Sprintf("--comet.halt-height=%d", upgradeHeight+1)) cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose) govAddr := sdk.AccAddress(address.Module("gov")).String() From af4b3d66267d8a3cb2f9933ff337b84e404e32c7 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Fri, 10 Jan 2025 11:52:30 +0100 Subject: [PATCH 2/2] add if v2 --- tests/systemtests/upgrade_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/systemtests/upgrade_test.go b/tests/systemtests/upgrade_test.go index 14cdc45450b5..c54220271941 100644 --- a/tests/systemtests/upgrade_test.go +++ b/tests/systemtests/upgrade_test.go @@ -42,7 +42,12 @@ func TestChainUpgrade(t *testing.T) { upgradeName = "v050-to-v052" // must match UpgradeName in simapp/upgrades.go ) - systest.Sut.StartChain(t, fmt.Sprintf("--comet.halt-height=%d", upgradeHeight+1)) + // if v2 is enabled, we need to start the chain with a different flag + if systest.IsV2() { + systest.Sut.StartChain(t, fmt.Sprintf("--comet.halt-height=%d", upgradeHeight+1)) + } else { + systest.Sut.StartChain(t, fmt.Sprintf("--halt-height=%d", upgradeHeight+1)) + } cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose) govAddr := sdk.AccAddress(address.Module("gov")).String()