refactor

cosmos · Jan 23, 2024 · 6a22eee · 6a22eee
1 parent 7f50252
commit 6a22eee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go
@@ -149,9 +149,13 @@ func ClawbackVestingFunds(ctx sdk.Context, address sdk.AccAddress, keepers *keep
 		return nil
 	}
 
-	// returns if no coins are vesting
-	_, vestingCoins := vestAccount.GetVestingCoins(ctx.BlockTime()).Find(sk.BondDenom(ctx))
-	if vestingCoins.IsNil() {
+	// returns if the account has no vesting coins of the bond denom
+	vestingCoinToClawback := sdk.Coin{}
+	if vc := vestAccount.GetVestingCoins(ctx.BlockTime()); !vc.Empty() {
+		_, vestingCoinToClawback = vc.Find(sk.BondDenom(ctx))
+	}
+
+	if vestingCoinToClawback.IsNil() {
 		ctx.Logger().Info(
 			"%s: %s",
 			"no vesting coins to migrate",
@@ -172,7 +176,7 @@ func ClawbackVestingFunds(ctx sdk.Context, address sdk.AccAddress, keepers *keep
 		dk,
 		bk,
 		ctx,
-		vestingCoins,
+		vestingCoinToClawback,
 		address,
 		keepers.GetKey(banktypes.StoreKey),
 	); err != nil {

diff --git a/app/upgrades/v15/upgrades_test.go b/app/upgrades/v15/upgrades_test.go
@@ -200,7 +200,7 @@ func TestClawbackVestingFunds(t *testing.T) {
 	require.Equal(t, vestingAccount.GetDelegatedVesting(), origCoins)
 	require.Empty(t, vestingAccount.GetDelegatedFree())
 
-	// check that migration succeeds when all coins are alreay vested
+	// check that migration succeeds when all coins are already vested
 	require.NoError(t, v15.ClawbackVestingFunds(ctx.WithBlockTime(endTime), addr, &gaiaApp.AppKeepers))
 
 	// vest half of the tokens