fix(x/distribution): fully deprecate distribution community pool (#18539)

Co-authored-by: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com>
This commit is contained in:
Julien Robert
2023-11-30 11:18:12 +00:00
committed by GitHub
co-authored by Likhita Polavarapu
parent 71876bb782
commit 7aa5635baa
32 changed files with 618 additions and 417 deletions
+5 -5
View File
@@ -75,9 +75,9 @@ func (k Keeper) FundCommunityPool(ctx context.Context, amount sdk.Coins, sender
return k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, amount)
}
// DistributeFromFeePool distributes funds from the protocolpool module account to
// DistributeFromCommunityPool distributes funds from the protocolpool module account to
// a receiver address.
func (k Keeper) DistributeFromFeePool(ctx context.Context, amount sdk.Coins, receiveAddr sdk.AccAddress) error {
func (k Keeper) DistributeFromCommunityPool(ctx context.Context, amount sdk.Coins, receiveAddr sdk.AccAddress) error {
return k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiveAddr, amount)
}
@@ -97,10 +97,10 @@ func (k Keeper) claimFunds(ctx context.Context, recipient sdk.AccAddress) (amoun
return sdk.Coin{}, fmt.Errorf("error getting claimable funds: %w", err)
}
// distribute amount from feepool
err = k.DistributeFromFeePool(ctx, sdk.NewCoins(amount), recipient)
// distribute amount from community pool
err = k.DistributeFromCommunityPool(ctx, sdk.NewCoins(amount), recipient)
if err != nil {
return sdk.Coin{}, fmt.Errorf("error distributing from fee pool: %w", err)
return sdk.Coin{}, fmt.Errorf("error distributing from community pool: %w", err)
}
return amount, nil
+2 -3
View File
@@ -93,12 +93,11 @@ func (k MsgServer) CommunityPoolSpend(ctx context.Context, msg *types.MsgCommuni
}
// distribute funds from community pool module account
if err := k.Keeper.DistributeFromFeePool(ctx, msg.Amount, recipient); err != nil {
if err := k.Keeper.DistributeFromCommunityPool(ctx, msg.Amount, recipient); err != nil {
return nil, err
}
logger := k.Logger(ctx)
logger.Info("transferred from the community pool to recipient", "amount", msg.Amount.String(), "recipient", msg.Recipient)
k.Logger(ctx).Info("transferred from the community pool to recipient", "amount", msg.Amount.String(), "recipient", msg.Recipient)
return &types.MsgCommunityPoolSpendResponse{}, nil
}