diff --git a/types/tokens.go b/types/tokens.go deleted file mode 100644 index 691501ba9..000000000 --- a/types/tokens.go +++ /dev/null @@ -1,5 +0,0 @@ -package types - -const ( - NativeToken = "aevmos" -) diff --git a/x/accumulator/keeper/keeper.go b/x/accumulator/keeper/keeper.go index d4d28ac15..be12adf75 100644 --- a/x/accumulator/keeper/keeper.go +++ b/x/accumulator/keeper/keeper.go @@ -21,7 +21,8 @@ type ( GetParams(c sdk.Context) types.Params SetParams(c sdk.Context, params types.Params) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) - DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error + DistributeToModule(ctx sdk.Context, pool string, amount sdk.Coins, receiverModule string) error + DistributeToAccount(ctx sdk.Context, pool string, amount sdk.Coins, receiver sdk.AccAddress) error } BaseKeeper struct { diff --git a/x/accumulator/keeper/token_distribution.go b/x/accumulator/keeper/token_distribution.go index d15635cd4..fadaf1a70 100644 --- a/x/accumulator/keeper/token_distribution.go +++ b/x/accumulator/keeper/token_distribution.go @@ -6,20 +6,28 @@ import ( "github.com/cosmos/cosmos-sdk/x/accumulator/types" ) -func (k BaseKeeper) DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error { - poolAddress := GetPoolAddress(fromPool) +func (k BaseKeeper) DistributeToModule(ctx sdk.Context, pool string, amount sdk.Coins, receiverModule string) error { + poolAddress := GetPoolAddress(pool) if poolAddress == nil { return types.ErrInvalidPool } - if isSentToModule { - return k.sendFromAddressToModule(ctx, poolAddress, receiverModule, amount) + return k.sendFromAddressToModule(ctx, poolAddress, receiverModule, amount) + +} + +func (k BaseKeeper) DistributeToAccount(ctx sdk.Context, pool string, amount sdk.Coins, receiver sdk.AccAddress) error { + + poolAddress := GetPoolAddress(pool) + if poolAddress == nil { + return types.ErrInvalidPool } - if receiverAddress == nil { + if receiver == nil { return types.ErrInvalidReceiver } - return k.sendFromAddressToAddress(ctx, poolAddress, *receiverAddress, amount) + + return k.sendFromAddressToAddress(ctx, poolAddress, receiver, amount) } @@ -32,7 +40,7 @@ func (k BaseKeeper) sendFromAddressToModule(ctx sdk.Context, poolAddress sdk.Acc ) if err != nil { - err = errors.Wrap(err, "sending native coins to address") + err = errors.Wrap(err, "sending native coins to account") k.Logger(ctx).Error(err.Error()) return err } @@ -62,7 +70,7 @@ func (k BaseKeeper) sendFromAddressToAddress(ctx sdk.Context, poolAddress sdk.Ac ) if err != nil { - err = errors.Wrap(err, "sending native coins to module") + err = errors.Wrap(err, "sending native coins to account") k.Logger(ctx).Error(err.Error()) return err } diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 449f2647d..5f962edc9 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -80,7 +80,7 @@ func (k Keeper) BondedRatio(ctx sdk.Context) sdk.Dec { } func (k Keeper) SendFromAccumulator(ctx sdk.Context, amount sdk.Coins) error { - err := k.accumulatorKeeper.DistributeTokens(ctx, accumulatortypes.ValidatorPoolName, true, amount, types.ModuleName, nil) + err := k.accumulatorKeeper.DistributeToModule(ctx, accumulatortypes.ValidatorPoolName, amount, types.ModuleName) if err != nil { err = errors.Wrap(err, "failed to call accumulator module") k.Logger(sdk.UnwrapSDKContext(ctx)).Error(err.Error()) diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index 3151060da..6a8ab6fac 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -30,5 +30,5 @@ type BankKeeper interface { } type AccumulatorKeeper interface { - DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error + DistributeToModule(ctx sdk.Context, pool string, amount sdk.Coins, receiverModule string) error }