From c98c61712e4e46ac6163333a74b3eba5bc1a48a1 Mon Sep 17 00:00:00 2001 From: Anh Minh <1phamminh0811@gmail.com> Date: Thu, 25 Jul 2024 16:15:14 +0700 Subject: [PATCH] lint --- tests/e2e/e2e_test.go | 4 +--- tests/e2e/initialization/config.go | 1 + x/tax2gas/ante/fee_test.go | 9 --------- x/tax2gas/types/expected_keeper.go | 2 +- x/tax2gas/utils/utils.go | 15 +++++++-------- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index c161c91c..0d35370f 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -272,8 +272,6 @@ func (s *IntegrationTestSuite) TestFeeTaxGrant() { s.Require().NoError(err) balanceTest2TerraBalance, err := node.QuerySpecificBalance(test2Addr, initialization.TerraDenom) s.Require().NoError(err) - balanceTest2UsdBalance, err := node.QuerySpecificBalance(test2Addr, initialization.UsdDenom) - s.Require().NoError(err) node.BankSendFeeGrantWithWallet(transferTerraCoin2.String(), test1Addr, validatorAddr, test2Addr, "test1", gasLimit, sdk.NewCoins(transferUsdCoin2, feeCoinTerraDenom)) @@ -285,7 +283,7 @@ func (s *IntegrationTestSuite) TestFeeTaxGrant() { s.Require().NoError(err) newBalanceTest2TerraBalance, err := node.QuerySpecificBalance(test2Addr, initialization.TerraDenom) s.Require().NoError(err) - balanceTest2UsdBalance, err = node.QuerySpecificBalance(test2Addr, initialization.UsdDenom) + balanceTest2UsdBalance, err := node.QuerySpecificBalance(test2Addr, initialization.UsdDenom) s.Require().NoError(err) // The fee grant msg only support to pay by one denom, so only uusd balance will change s.Require().Equal(newValidatorTerraBalance, validatorTerraBalance.Add(transferTerraCoin2)) diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go index d36c9355..5532c69d 100644 --- a/tests/e2e/initialization/config.go +++ b/tests/e2e/initialization/config.go @@ -329,6 +329,7 @@ func updateDistrGenesis(distrGenState *distrtypes.GenesisState) { distrGenState.Params.CommunityTax = sdk.NewDecWithPrec(2, 2) distrGenState.Params.WithdrawAddrEnabled = true } + func updateTreasuryGenesis(treasuryGenState *treasurytypes.GenesisState) { treasuryGenState.TaxRate = TaxRate treasuryGenState.Params.TaxPolicy = treasurytypes.PolicyConstraints{ diff --git a/x/tax2gas/ante/fee_test.go b/x/tax2gas/ante/fee_test.go index f352e69f..9ddffe64 100644 --- a/x/tax2gas/ante/fee_test.go +++ b/x/tax2gas/ante/fee_test.go @@ -262,7 +262,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Fail: Authz exec", simulation: false, checkTx: true, @@ -279,7 +278,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Bypass: ibc MsgRecvPacket", simulation: false, checkTx: true, @@ -298,7 +296,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Not Bypass: ibc MsgRecvPacket", simulation: false, checkTx: true, @@ -318,7 +315,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expErrMsg: "can't find coin", }, { - name: "Bypass: ibc MsgAcknowledgement", simulation: false, checkTx: true, @@ -338,7 +334,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Bypass: ibc MsgUpdateClient", simulation: false, checkTx: true, @@ -358,7 +353,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Bypass: ibc MsgTimeout", simulation: false, checkTx: true, @@ -378,7 +372,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Bypass: ibc MsgTimeoutOnClose", simulation: false, checkTx: true, @@ -399,7 +392,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expFail: false, }, { - name: "Other msgs must pay gas fee", simulation: false, checkTx: true, @@ -418,7 +410,6 @@ func (s *AnteTestSuite) TestDeductFeeDecorator() { expErrMsg: "can't find coin", }, { - name: "Oracle zero fee", simulation: false, checkTx: true, diff --git a/x/tax2gas/types/expected_keeper.go b/x/tax2gas/types/expected_keeper.go index 38f414f6..2b6e805c 100644 --- a/x/tax2gas/types/expected_keeper.go +++ b/x/tax2gas/types/expected_keeper.go @@ -3,8 +3,8 @@ package types import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + "github.com/cosmos/cosmos-sdk/x/feegrant" ) // TreasuryKeeper for tax charging & recording diff --git a/x/tax2gas/utils/utils.go b/x/tax2gas/utils/utils.go index c585384e..cc83df20 100644 --- a/x/tax2gas/utils/utils.go +++ b/x/tax2gas/utils/utils.go @@ -91,9 +91,8 @@ func CalculateTaxesAndPayableFee(gasPrices sdk.DecCoins, feeCoins sdk.Coins, tax case feeCoin.IsGTE(totalFeeRequired): taxes = taxes.Add(taxFeeRequired) payableFees = payableFees.Add(totalFeeRequired) - taxGasRemaining = 0 gasRemaining = 0 - return + return taxes, payableFees, gasRemaining case feeCoin.IsGTE(taxFeeRequired): taxes = taxes.Add(taxFeeRequired) taxGasRemaining = 0 @@ -105,21 +104,21 @@ func CalculateTaxesAndPayableFee(gasPrices sdk.DecCoins, feeCoins sdk.Coins, tax payableFees = payableFees.Add(feeCoin) taxFeeRemaining := sdk.NewDecCoinFromCoin(taxFeeRequired.Sub(feeCoin)) taxGasRemaining = uint64(taxFeeRemaining.Amount.Quo(gasPrice).Ceil().RoundInt64()) - gasRemaining = gasRemaining - (taxGas - taxGasRemaining) + gasRemaining -= taxGas - taxGasRemaining } case gasRemaining > 0: if feeCoin.IsGTE(totalFeeRequired) { payableFees = payableFees.Add(totalFeeRequired) gasRemaining = 0 - return + return taxes, payableFees, gasRemaining } else { payableFees = payableFees.Add(feeCoin) - totalFeeRemaining := sdk.NewDecCoinFromCoin(totalFeeRequired.Sub(feeCoin)) - gasRemaining = uint64(totalFeeRemaining.Amount.Quo(gasPrice).Ceil().RoundInt64()) + totalFeeRemaining := sdk.NewDecCoinFromCoin(totalFeeRequired.Sub(feeCoin)) + gasRemaining = uint64(totalFeeRemaining.Amount.Quo(gasPrice).Ceil().RoundInt64()) } default: - return + return taxes, payableFees, gasRemaining } } - return + return taxes, payableFees, gasRemaining }