Skip to content

Commit 170140a

Browse files
committed
Revert "fix: revert Finschia#952 (Finschia#984)"
This reverts commit ea50f75.
1 parent 2d437b0 commit 170140a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

client/grpc/tmservice/service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (s IntegrationTestSuite) TestQueryBlockResultsByHeight() {
152152
s.Require().Equal(0, len(txResult))
153153

154154
beginBlock := blockResultsRes.GetResBeginBlock()
155-
s.Require().Equal(11, len(beginBlock.Events)) // coinbase event (6) + transfer mintModule to feeCollectorName(5)
155+
s.Require().Equal(7, len(beginBlock.Events)) // coinbase event (6) + transfer mintModule to feeCollectorName(5) - foundation abci (4)
156156

157157
endBlock := blockResultsRes.GetResEndBlock()
158158
s.Require().Equal(0, len(endBlock.Events))

x/foundation/keeper/internal/treasury.go

+6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ import (
99
func (k Keeper) CollectFoundationTax(ctx sdk.Context) error {
1010
feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName).GetAddress()
1111
feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, feeCollector)
12+
if feesCollectedInt.Empty() {
13+
return nil
14+
}
1215
feesCollected := sdk.NewDecCoinsFromCoins(feesCollectedInt...)
1316

1417
// calculate the tax
1518
taxRatio := k.GetFoundationTax(ctx)
1619
tax, _ := feesCollected.MulDecTruncate(taxRatio).TruncateDecimal()
20+
if tax.Empty() {
21+
return nil
22+
}
1723

1824
// collect the tax
1925
if err := k.FundTreasury(ctx, feeCollector, tax); err != nil {

0 commit comments

Comments
 (0)