Skip to content

test: improve check for EnsureNoStaleBallots to ignore Pending Ballots #3627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kingpinXD merged 5 commits into from
Mar 4, 2025
Merged

test: improve check for EnsureNoStaleBallots to ignore Pending Ballots #3627

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a44a8b
improve check for EnsureNoStaleBallots to ignore Pending Ballots
kingpinXD Mar 4, 2025
e91d42e
rebase develop
kingpinXD Mar 4, 2025
e28c149
break loop when ballot is found
kingpinXD Mar 4, 2025
889057e
ignore if no ballots are found
kingpinXD Mar 4, 2025
4379fbd
format code
kingpinXD Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions e2e/runner/require.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

"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
Expand Down Expand Up @@ -62,18 +64,27 @@ func ensureZRC20ZeroBalance(r *E2ERunner, zrc20 *zrc20.ZRC20, address ethcommon.

// EnsureNoStaleBallots ensures that there are no stale ballots left on the chain.
func (r *E2ERunner) EnsureNoStaleBallots() {
// TODO: fix
//https://github.com/zeta-chain/node/issues/3626
//ballotsRes, err := r.ObserverClient.Ballots(r.Ctx, &types.QueryBallotsRequest{})
//require.NoError(r, err)
//currentBlockHeight, err := r.Clients.Zetacore.GetBlockHeight(r.Ctx)
//require.NoError(r, err)
//emissionsParams, err := r.EmissionsClient.Params(r.Ctx, &emissionstypes.QueryParamsRequest{})
//require.NoError(r, err)
//staleBlockStart := currentBlockHeight - emissionsParams.Params.BallotMaturityBlocks
//if len(ballotsRes.Ballots) < 1 {
// return
//}
//firstBallotCreationHeight := ballotsRes.Ballots[0].BallotCreationHeight
//require.GreaterOrEqual(r, firstBallotCreationHeight, staleBlockStart, "there should be no stale ballots")
ballotsRes, err := r.ObserverClient.Ballots(r.Ctx, &types.QueryBallotsRequest{})
require.NoError(r, err)
currentBlockHeight, err := r.Clients.Zetacore.GetBlockHeight(r.Ctx)
require.NoError(r, err)
emissionsParams, err := r.EmissionsClient.Params(r.Ctx, &emissionstypes.QueryParamsRequest{})
require.NoError(r, err)
staleBlockStart := currentBlockHeight - emissionsParams.Params.BallotMaturityBlocks
if len(ballotsRes.Ballots) < 1 {
return
}
firstBallotCreationHeight := int64(0)

for _, ballot := range ballotsRes.Ballots {
if ballot.IsFinalized() {
firstBallotCreationHeight = ballot.BallotCreationHeight
break
}
}

if firstBallotCreationHeight == 0 {
return
}
require.GreaterOrEqual(r, firstBallotCreationHeight, staleBlockStart, "there should be no stale ballots")
}