Commit 170140a 1 parent 2d437b0 commit 170140a Copy full SHA for 170140a
File tree 2 files changed +7
-1
lines changed
x/foundation/keeper/internal
2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ func (s IntegrationTestSuite) TestQueryBlockResultsByHeight() {
152
152
s .Require ().Equal (0 , len (txResult ))
153
153
154
154
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 )
156
156
157
157
endBlock := blockResultsRes .GetResEndBlock ()
158
158
s .Require ().Equal (0 , len (endBlock .Events ))
Original file line number Diff line number Diff line change @@ -9,11 +9,17 @@ import (
9
9
func (k Keeper ) CollectFoundationTax (ctx sdk.Context ) error {
10
10
feeCollector := k .authKeeper .GetModuleAccount (ctx , k .feeCollectorName ).GetAddress ()
11
11
feesCollectedInt := k .bankKeeper .GetAllBalances (ctx , feeCollector )
12
+ if feesCollectedInt .Empty () {
13
+ return nil
14
+ }
12
15
feesCollected := sdk .NewDecCoinsFromCoins (feesCollectedInt ... )
13
16
14
17
// calculate the tax
15
18
taxRatio := k .GetFoundationTax (ctx )
16
19
tax , _ := feesCollected .MulDecTruncate (taxRatio ).TruncateDecimal ()
20
+ if tax .Empty () {
21
+ return nil
22
+ }
17
23
18
24
// collect the tax
19
25
if err := k .FundTreasury (ctx , feeCollector , tax ); err != nil {
You can’t perform that action at this time.
0 commit comments