Skip to content

chore(simapp): remove dead intra-tx counter and fix misleading comment in zero-height export #8685

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore(simapp): remove dead intra-tx counter and fix misleading comment in zero-height export #8685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
992b150
chore(simapp): remove dead intra-tx counter and fix misleading commen…
Forostovec Oct 27, 2025
99f7d67
chore(simapp): remove dead intra-tx counter and fix misleading commen…
Forostovec Oct 27, 2025
0310d21
chore(simapp): remove dead intra-tx counter and fix misleading commen…
Forostovec Oct 27, 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
5 changes: 1 addition & 4 deletions modules/apps/callbacks/testing/simapp/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,9 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
panic(err)
}

// Iterate through validators by power descending, reset bond heights, and
// update bond intra-tx counters.
// Iterate through validators by power descending and reset bond heights.
store := ctx.KVStore(app.keys[stakingtypes.StoreKey])
iter := storetypes.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey)
counter := int16(0)

for ; iter.Valid(); iter.Next() {
addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
Expand All @@ -213,7 +211,6 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
if err != nil {
panic(errors.New("couldn't set validator"))
}
counter++
}

iter.Close()
Expand Down
5 changes: 1 addition & 4 deletions modules/light-clients/08-wasm/testing/simapp/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,9 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
panic(err)
}

// Iterate through validators by power descending, reset bond heights, and
// update bond intra-tx counters.
// Iterate through validators by power descending and reset bond heights.
store := ctx.KVStore(app.keys[stakingtypes.StoreKey])
iter := storetypes.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey)
counter := int16(0)

for ; iter.Valid(); iter.Next() {
addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
Expand All @@ -214,7 +212,6 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
if err := app.StakingKeeper.SetValidator(ctx, validator); err != nil {
panic(err)
}
counter++
}

iter.Close()
Expand Down
5 changes: 1 addition & 4 deletions simapp/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,9 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
panic(err)
}

// Iterate through validators by power descending, reset bond heights, and
// update bond intra-tx counters.
// Iterate through validators by power descending and reset bond heights.
store := ctx.KVStore(app.keys[stakingtypes.StoreKey])
iter := storetypes.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey)
counter := int16(0)

for ; iter.Valid(); iter.Next() {
addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
Expand All @@ -216,7 +214,6 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
if err != nil {
panic(errors.New("couldn't set validator"))
}
counter++
}

iter.Close()
Expand Down