From 2a44a8b772e03ce53bf6dc15a9e722b9cdc708ae Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 4 Mar 2025 11:41:59 -0500 Subject: [PATCH 1/4] improve check for EnsureNoStaleBallots to ignore Pending Ballots --- e2e/runner/require.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/e2e/runner/require.go b/e2e/runner/require.go index 69d2386f2d..24c96e153b 100644 --- a/e2e/runner/require.go +++ b/e2e/runner/require.go @@ -74,6 +74,12 @@ func (r *E2ERunner) EnsureNoStaleBallots() { if len(ballotsRes.Ballots) < 1 { return } - firstBallotCreationHeight := ballotsRes.Ballots[0].BallotCreationHeight + firstBallotCreationHeight := int64(0) + + for _, ballot := range ballotsRes.Ballots { + if ballot.IsFinalized() { + firstBallotCreationHeight = ballot.BallotCreationHeight + } + } require.GreaterOrEqual(r, firstBallotCreationHeight, staleBlockStart, "there should be no stale ballots") } From e28c149071c04ccabef165b5e69e9152565c17e8 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 4 Mar 2025 12:32:20 -0500 Subject: [PATCH 2/4] break loop when ballot is found --- e2e/runner/require.go | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/runner/require.go b/e2e/runner/require.go index 9cc594afab..5afc142caf 100644 --- a/e2e/runner/require.go +++ b/e2e/runner/require.go @@ -79,6 +79,7 @@ func (r *E2ERunner) EnsureNoStaleBallots() { for _, ballot := range ballotsRes.Ballots { if ballot.IsFinalized() { firstBallotCreationHeight = ballot.BallotCreationHeight + break } } require.GreaterOrEqual(r, firstBallotCreationHeight, staleBlockStart, "there should be no stale ballots") From 889057eed9cc68e4107108d12f6239e807b88560 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 4 Mar 2025 12:34:08 -0500 Subject: [PATCH 3/4] ignore if no ballots are found --- e2e/runner/require.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/e2e/runner/require.go b/e2e/runner/require.go index 5afc142caf..9a650ddfd6 100644 --- a/e2e/runner/require.go +++ b/e2e/runner/require.go @@ -82,5 +82,9 @@ func (r *E2ERunner) EnsureNoStaleBallots() { break } } + + if firstBallotCreationHeight == 0 { + return + } require.GreaterOrEqual(r, firstBallotCreationHeight, staleBlockStart, "there should be no stale ballots") } From 4379fbd799625e3bb717a6f6b265507a04b7634d Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 4 Mar 2025 13:13:58 -0500 Subject: [PATCH 4/4] format code --- e2e/runner/require.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/runner/require.go b/e2e/runner/require.go index 9a650ddfd6..3861ee615d 100644 --- a/e2e/runner/require.go +++ b/e2e/runner/require.go @@ -7,12 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - emissionstypes "github.com/zeta-chain/node/x/emissions/types" - "github.com/zeta-chain/node/x/observer/types" "github.com/zeta-chain/protocol-contracts/pkg/zrc20.sol" "github.com/zeta-chain/node/testutil/sample" crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + "github.com/zeta-chain/node/x/observer/types" ) // EnsureNoTrackers ensures that there are no trackers left on zetacore