fix: return named error for write validators (backport cosmos#14919) (c…

…osmos#14921) Co-authored-by: mmsqe <[email protected]> Co-authored-by: Julien Robert <[email protected]>
agoric-labs · Sep 28, 2024 · e3b9ac1 · e3b9ac1
1 parent c6b7cff
commit e3b9ac1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (cli) [#14919](https://github.com/cosmos/cosmos-sdk/pull/#14919) Fix never assigned error when write validators.
 * (store) [#14798](https://github.com/cosmos/cosmos-sdk/pull/14798) Copy btree to avoid the problem of modify while iteration.
 * (cli) [#14799](https://github.com/cosmos/cosmos-sdk/pull/14799) Fix Evidence CLI query flag parsing (backport #13458)
 

diff --git a/x/staking/genesis.go b/x/staking/genesis.go
@@ -191,17 +191,18 @@ func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState {
 }
 
 // WriteValidators returns a slice of bonded genesis validators.
-func WriteValidators(ctx context.Context, keeper *keeper.Keeper) (vals []GenesisValidator, returnErr error) {
-	err := keeper.LastValidatorPower.Walk(ctx, nil, func(key []byte, _ gogotypes.Int64Value) (bool, error) {
-		validator, err := keeper.GetValidator(ctx, key)
+func WriteValidators(ctx sdk.Context, keeper keeper.Keeper) (vals []tmtypes.GenesisValidator, returnErr error) {
+	keeper.IterateLastValidators(ctx, func(_ int64, validator types.ValidatorI) (stop bool) {
+		pk, err := validator.ConsPubKey()
 		if err != nil {
-			return true, err
+			returnErr = err
+			return true
 		}
 
 		pk, err := validator.ConsPubKey()
 		if err != nil {
 			returnErr = err
-			return true, err
+			return true
 		}
 
 		vals = append(vals, GenesisValidator{