fix(staking): fix impossible conditions (#19621)

(cherry picked from commit b118a0a) # Conflicts: # x/staking/keeper/query_utils.go
cosmos · Mar 1, 2024 · 8325b02 · 8325b02
1 parent 7628592
commit 8325b02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go
@@ -850,7 +850,7 @@ func (k Keeper) Unbond(
 		}
 
 		valAddr, err1 := k.validatorAddressCodec.StringToBytes(delegation.GetValidatorAddr())
-		if err != nil {
+		if err1 != nil {
 			return amount, err1
 		}
 

diff --git a/x/staking/keeper/query_utils.go b/x/staking/keeper/query_utils.go
@@ -35,12 +35,15 @@ func (k Keeper) GetDelegatorValidators(
 		validators[i] = validator
 		i++
 
+<<<<<<< HEAD
 		return false, nil
 	})
 	if err != nil {
 		return types.Validators{}, err
 	}
 
+=======
+>>>>>>> b118a0ada (fix(staking): fix impossible conditions (#19621))
 	return types.Validators{Validators: validators[:i], ValidatorCodec: k.validatorAddressCodec}, nil // trim
 }