Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
dimiandre committed Jul 7, 2024
1 parent 04eda81 commit b7c4914
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions app/upgrades/v23/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
"github.com/CosmosContracts/juno/v23/app/keepers"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

Check failure on line 17 in app/upgrades/v23/upgrades.go

View workflow job for this annotation

GitHub Actions / lint

File is not `gci`-ed with --skip-generated -s standard -s default -s blank -s dot -s prefix(github.com/cometbft/cometbft) -s prefix(github.com/cosmos) -s prefix(cosmossdk.io) -s prefix(github.com/cosmos/cosmos-sdk) -s prefix(github.com/CosmosContracts/juno) --custom-order (gci)


type IndividualAccount struct {
Owner string
Address string
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/v23/vesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -178,4 +178,4 @@ func unbondAllAndFinish(ctx sdk.Context, now time.Time, keepers *keepers.AppKeep
}

return unbondedAmt, nil
}
}

0 comments on commit b7c4914

Please sign in to comment.