Skip to content

Commit 7bc33fe

Browse files
committed
Revert the changes in CollectFoundationTax's signature
1 parent 98c3257 commit 7bc33fe

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

x/foundation/keeper/internal/abci.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import (
1313
func BeginBlocker(ctx sdk.Context, k Keeper) {
1414
defer telemetry.ModuleMeasureSince(foundation.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)
1515

16-
feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName).GetAddress()
17-
if err := k.CollectFoundationTax(ctx, feeCollector); err != nil {
16+
if err := k.CollectFoundationTax(ctx); err != nil {
1817
panic(err)
1918
}
2019
}

x/foundation/keeper/internal/treasury.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ import (
66
"github.com/line/lbm-sdk/x/foundation"
77
)
88

9-
func (k Keeper) CollectFoundationTax(ctx sdk.Context, from sdk.AccAddress) error {
10-
feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, from)
9+
func (k Keeper) CollectFoundationTax(ctx sdk.Context) error {
10+
feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName).GetAddress()
11+
feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, feeCollector)
1112
feesCollected := sdk.NewDecCoinsFromCoins(feesCollectedInt...)
1213

1314
// calculate the tax
1415
taxRatio := k.GetFoundationTax(ctx)
1516
tax, _ := feesCollected.MulDecTruncate(taxRatio).TruncateDecimal()
1617

1718
// collect the tax
18-
if err := k.FundTreasury(ctx, from, tax); err != nil {
19+
if err := k.FundTreasury(ctx, feeCollector, tax); err != nil {
1920
return err
2021
}
2122

0 commit comments

Comments
 (0)