From 37bd179c8e0bb481dbfa5804f27b6571c652f91e Mon Sep 17 00:00:00 2001 From: Kevin Davis Date: Thu, 10 Oct 2019 10:59:05 -0400 Subject: [PATCH] fix: get vesting status return values --- x/validator-vesting/internal/keeper/keeper.go | 6 +++--- x/validator-vesting/internal/keeper/keeper_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x/validator-vesting/internal/keeper/keeper.go b/x/validator-vesting/internal/keeper/keeper.go index bb0ed89e..bff59ee4 100644 --- a/x/validator-vesting/internal/keeper/keeper.go +++ b/x/validator-vesting/internal/keeper/keeper.go @@ -209,12 +209,12 @@ func (k Keeper) GetPeriodEndTimes(ctx sdk.Context, addr sdk.AccAddress) []int64 func (k Keeper) AccountIsVesting(ctx sdk.Context, addr sdk.AccAddress) bool { vv := k.GetAccountFromAuthKeeper(ctx, addr) if !vv.DebtAfterFailedVesting.IsZero() { - return false + return true } for _, p := range vv.VestingPeriodProgress { if !p.PeriodComplete { - return false + return true } } - return true + return false } diff --git a/x/validator-vesting/internal/keeper/keeper_test.go b/x/validator-vesting/internal/keeper/keeper_test.go index f304ddbd..cedf77d3 100644 --- a/x/validator-vesting/internal/keeper/keeper_test.go +++ b/x/validator-vesting/internal/keeper/keeper_test.go @@ -111,13 +111,13 @@ func TestAccountIsVesting(t *testing.T) { ak.SetAccount(ctx, vva) keeper.SetValidatorVestingAccountKey(ctx, vva.Address) - require.Equal(t, false, keeper.AccountIsVesting(ctx, vva.Address)) + require.Equal(t, true, keeper.AccountIsVesting(ctx, vva.Address)) for i := range vva.VestingPeriodProgress { vva.VestingPeriodProgress[i] = types.VestingProgress{true, true} ak.SetAccount(ctx, vva) } - require.Equal(t, true, keeper.AccountIsVesting(ctx, vva.Address)) + require.Equal(t, false, keeper.AccountIsVesting(ctx, vva.Address)) }