From 3c0475229686650a295378af0e0da8dff2131eb0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:05:05 +0100 Subject: [PATCH] fix(x/staking): avoid overriding error (backport #23076) (#23195) Co-authored-by: Marko --- x/staking/keeper/delegation.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go index fcb3faa643..4e0ed9268c 100644 --- a/x/staking/keeper/delegation.go +++ b/x/staking/keeper/delegation.go @@ -858,9 +858,9 @@ func (k Keeper) getBeginInfo( return completionTime, height, false, nil } headerInfo := k.HeaderService.HeaderInfo(ctx) - unbondingTime, err := k.UnbondingTime(ctx) - if err != nil { - return completionTime, height, false, err + unbondingTime, err2 := k.UnbondingTime(ctx) + if err2 != nil { + return completionTime, height, false, errors.Join(err, err2) } // TODO: When would the validator not be found?