chore: remove unused local variables (backport #22340) (#22343)

Co-authored-by: zakir <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

.golangci.yml

@@ -119,3 +119,5 @@ linters-settings:
       - regexpMust
       - appendAssign
       - ifElseChain
+  unused:
+    local-variables-are-used: false

simapp/export.go

@@ -216,7 +216,6 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	// update bond intra-tx counters.
 	store := ctx.KVStore(app.GetKey(stakingtypes.StoreKey))
 	iter := storetypes.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey)
-	counter := int16(0)
 
 	for ; iter.Valid(); iter.Next() {
 		addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
@@ -238,7 +237,6 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 		if err = app.StakingKeeper.SetValidator(ctx, validator); err != nil {
 			panic(err)
 		}
-		counter++
 	}
 
 	if err := iter.Close(); err != nil {

types/mempool/priority_nonce_test.go

@@ -540,10 +540,8 @@ func (s *MempoolTestSuite) TestRandomTxOrderManyTimes() {
 // validateOrder checks that the txs are ordered by priority and nonce
 // in O(n^2) time by checking each tx against all the other txs
 func validateOrder(mtxs []sdk.Tx) error {
-	iterations := 0
 	var itxs []txSpec
 	for i, mtx := range mtxs {
-		iterations++
 		tx := mtx.(testTx)
 		itxs = append(itxs, txSpec{p: int(tx.priority), n: int(tx.nonce), a: tx.address, i: i})
 	}
@@ -556,7 +554,6 @@ func validateOrder(mtxs []sdk.Tx) error {
 
 	for _, a := range itxs {
 		for _, b := range itxs {
-			iterations++
 			// when b is before a
 
 			// when a is before b
@@ -574,7 +571,6 @@ func validateOrder(mtxs []sdk.Tx) error {
 					// find a tx with same sender as b and lower nonce
 					found := false
 					for _, c := range itxs {
-						iterations++
 						if c.a.Equals(b.a) && c.n < b.n && c.p <= a.p {
 							found = true
 							break
@@ -588,7 +584,6 @@ func validateOrder(mtxs []sdk.Tx) error {
 			}
 		}
 	}
-	// fmt.Printf("validation in iterations: %d\n", iterations)
 	return nil
 }
 

x/staking/keeper/query_utils.go

@@ -65,12 +65,9 @@ func (k Keeper) GetDelegatorValidator(
 func (k Keeper) GetAllDelegatorDelegations(ctx context.Context, delegator sdk.AccAddress) ([]types.Delegation, error) {
 	delegations := make([]types.Delegation, 0)
 
-	var i int64
 	rng := collections.NewPrefixedPairRange[sdk.AccAddress, sdk.ValAddress](delegator)
 	err := k.Delegations.Walk(ctx, rng, func(key collections.Pair[sdk.AccAddress, sdk.ValAddress], del types.Delegation) (stop bool, err error) {
 		delegations = append(delegations, del)
-		i++
-
 		return false, nil
 	})
 	if err != nil {