From 8325b02eebc5599b0ae7ba1c5d5b4b96644276b8 Mon Sep 17 00:00:00 2001
From: Tom <54514587+GAtom22@users.noreply.github.com>
Date: Fri, 1 Mar 2024 15:27:14 -0300
Subject: [PATCH] fix(staking): fix impossible conditions (#19621)

(cherry picked from commit b118a0adac76cb6478953a8528a192e3b21cab27)

# Conflicts:
#	x/staking/keeper/query_utils.go
---
 x/staking/keeper/delegation.go  | 2 +-
 x/staking/keeper/query_utils.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go
index c5dea74ea009..fc1061df8e83 100644
--- 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
index 625984dbd44a..9c0fffc15111 100644
--- 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
 }