From b7c4914434183bb3be57211f536216bd469ecdc8 Mon Sep 17 00:00:00 2001 From: dimiandre Date: Sun, 7 Jul 2024 12:02:16 +0200 Subject: [PATCH] lint --- app/upgrades/v23/upgrades.go | 3 --- app/upgrades/v23/vesting.go | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/upgrades/v23/upgrades.go b/app/upgrades/v23/upgrades.go index 04a7b1ad8..db944cc15 100644 --- a/app/upgrades/v23/upgrades.go +++ b/app/upgrades/v23/upgrades.go @@ -15,8 +15,6 @@ import ( "github.com/CosmosContracts/juno/v23/app/keepers" "github.com/CosmosContracts/juno/v23/app/upgrades" ) - - type IndividualAccount struct { Owner string Address string @@ -111,7 +109,6 @@ func CreateV23UpgradeHandler( } } - // Migrate balances from the Core-1 vesting accounts to the Council SubDAO. func migrateCore1VestingAccounts(ctx sdk.Context, keepers *keepers.AppKeepers, bondDenom string) error { for _, account := range Core1VestingAccounts { diff --git a/app/upgrades/v23/vesting.go b/app/upgrades/v23/vesting.go index 37d9ea380..18b794f84 100644 --- a/app/upgrades/v23/vesting.go +++ b/app/upgrades/v23/vesting.go @@ -75,10 +75,10 @@ func MoveVestingCoinFromVestingAccount(ctx sdk.Context, keepers *keepers.AppKeep return err } -func postValidation(ctx sdk.Context, keepers *keepers.AppKeepers, bondDenom string, accAddr sdk.AccAddress, vestingCoins sdk.Coins, cpoolBeforeBal sdk.DecCoins) error { +func postValidation(ctx sdk.Context, keepers *keepers.AppKeepers, bondDenom string, accAddr sdk.AccAddress, vestingCoins sdk.Coins, cpoolBeforeBal sdk.DecCoins) error { // Community pool juno balance should only increase by exactly the vestedCoins cpoolAfterBal := keepers.DistrKeeper.GetFeePool(ctx).CommunityPool - + // only count vesting junos vestingJuno := vestingCoins.AmountOf(bondDenom) @@ -114,7 +114,7 @@ func postValidation(ctx sdk.Context, keepers *keepers.AppKeepers, bondDenom stri // Transfer funds from the vesting account to the Council SubDAO. func transferUnvestedTokensToCommunityPool(ctx sdk.Context, keepers *keepers.AppKeepers, accAddr sdk.AccAddress, vestingJuno sdk.Coin) error { fmt.Printf("Sending Vesting Juno to Community pool: %v\n", vestingJuno) - err := keepers.DistrKeeper.FundCommunityPool(ctx, sdk.NewCoins(vestingJuno), accAddr); + err := keepers.DistrKeeper.FundCommunityPool(ctx, sdk.NewCoins(vestingJuno), accAddr) return err } @@ -178,4 +178,4 @@ func unbondAllAndFinish(ctx sdk.Context, now time.Time, keepers *keepers.AppKeep } return unbondedAmt, nil -} \ No newline at end of file +}