Merge pull request cosmos#404 from agoric-labs/jimlarson-lint

chore: silence some lint warnings

x/auth/vesting/cmd/vestcalc/vestcalc.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
 )
@@ -18,15 +19,15 @@ import (
 
 // divide returns the division of total as evenly as possible.
 // Divisor must be 1 or greater and total must be nonnegative.
-func divide(total sdk.Int, divisor int) ([]sdk.Int, error) {
+func divide(total sdkmath.Int, divisor int) ([]sdkmath.Int, error) {
 	if divisor < 1 {
 		return nil, fmt.Errorf("divisions must be 1 or greater")
 	}
 	div64 := int64(divisor)
 	if total.IsNegative() {
 		return nil, fmt.Errorf("total must be nonnegative")
 	}
-	divisions := make([]sdk.Int, divisor)
+	divisions := make([]sdkmath.Int, divisor)
 
 	// Ideally we could compute total of the first i divisions as
 	//     cumulative(i) = floor((total * i) / divisor)
@@ -68,7 +69,7 @@ func divideCoins(coins sdk.Coins, divisor int) ([]sdk.Coins, error) {
 		return nil, fmt.Errorf("divisor must be 1 or greater")
 	}
 	divisions := make([]sdk.Coins, divisor)
-	divisionsByDenom := make(map[string][]sdk.Int)
+	divisionsByDenom := make(map[string][]sdkmath.Int)
 	for _, coin := range coins {
 		dividedCoin, err := divide(coin.Amount, divisor)
 		if err != nil {

x/auth/vesting/types/vesting_account.go

@@ -1087,6 +1087,9 @@ func (va *BaseVestingAccount) forceTransfer(ctx sdk.Context, amt sdk.Coins, dest
 	gotCoins = gotCoins.Sub(decrVesting...)
 	ak.SetAccount(ctx, va)
 	// gotCoins should be zero at this point, unless DF+DV was not accurate
+	if !gotCoins.IsZero() {
+		ctx.Logger().Error("more staked than tracked in vesting delegation - %s undercounted by %s", va.Address, gotCoins)
+	}
 
 	// If we've transferred everything and still haven't transferred the desired clawback amount,
 	// then the account must have lost some unvested tokens from slashing.

x/staking/keeper/delegation.go

@@ -976,7 +976,7 @@ func (k Keeper) Undelegate(
 // TransferUnbonding changes the ownership of UnbondingDelegation entries
 // until the desired number of tokens have changed hands. Returns the actual
 // number of tokens transferred.
-func (k Keeper) TransferUnbonding(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, valAddr sdk.ValAddress, wantAmt sdk.Int) sdk.Int {
+func (k Keeper) TransferUnbonding(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, valAddr sdk.ValAddress, wantAmt math.Int) math.Int {
 	transferred := sdk.ZeroInt()
 	ubdFrom, found := k.GetUnbondingDelegation(ctx, fromAddr, valAddr)
 	if !found {