diff --git a/.golangci.yml b/.golangci.yml index 0da89721f2..3b28aff350 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,11 +1,10 @@ run: - tests: false - # timeout for analysis, e.g. 30s, 5m, default is 1m - # timeout: 5m + tests: true + timeout: 5m + concurrency: 4 linters: enable: - # - bodyclose - depguard - dogsled - dupl @@ -20,39 +19,22 @@ linters: - ineffassign # - lll TODO: enable - misspell - # - maligned - nakedret - prealloc - exportloopref - staticcheck - # - structcheck - stylecheck - typecheck - unconvert - # - unparam + - unparam - unused - # - nolintlint + - nolintlint - asciicheck - # - exhaustive - exportloopref - gofumpt - gomodguard - # - nestif - # - nlreturn - # - noctx - # - rowserrcheck - # - whitespace - # - wsl -issues: - exclude-rules: - - path: _test\.go - linters: - - gosec - - linters: - - lll - source: "https://" - max-same-issues: 50 + linters-settings: dogsled: @@ -72,10 +54,10 @@ linters-settings: lang-version: "1.19" gomodguard: blocked: - versions: # List of blocked module version constraints - - https://github.com/etcd-io/etcd: # Blocked module with version constraint - version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons - reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional) - - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint - version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons - reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional) + versions: # List of blocked module version constraints + - https://github.com/etcd-io/etcd: # Blocked module with version constraint + version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons + reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional) + - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint + version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons + reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdef6033ad..c5dc6d94ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +- (tests) [\1194](https://github.com/evmos/evmos/pull/1194) Lint tests so they are consistent with non-test code. - (deps) [\#1176](https://github.com/evmos/evmos/pull/1176) Bump Cosmos SDK to [`v0.46.7`](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.7) - (ci) [#1138](https://github.com/evmos/evmos/pull/1138) Add Golang dependency vulnerability checker. - (docs) [\#1090](https://github.com/evmos/evmos/pull/1090) Add audits page to documentation. diff --git a/app/ante/ante.go b/app/ante/ante.go index 72e2a37f14..285ce2fc1e 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -47,7 +47,7 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler { anteHandler = newEthAnteHandler(options) case "/ethermint.types.v1.ExtensionOptionsWeb3Tx": // handle as normal Cosmos SDK tx, except signature is checked for EIP712 representation - anteHandler = newLegacyCosmosAnteHandlerEip712(options) // nolint: staticcheck + anteHandler = newLegacyCosmosAnteHandlerEip712(options) default: return ctx, errorsmod.Wrapf( errortypes.ErrUnknownExtensionOptions, diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 1a384eab31..f5c9ceffca 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -134,7 +134,7 @@ func newLegacyCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler { ante.NewValidateSigCountDecorator(options.AccountKeeper), ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer), // Note: signature verification uses EIP instead of the cosmos signature validator - // nolint: staticcheck + //nolint: staticcheck ethante.NewLegacyEip712SigVerificationDecorator(options.AccountKeeper, options.SignModeHandler), ante.NewIncrementSequenceDecorator(options.AccountKeeper), ibcante.NewRedundantRelayDecorator(options.IBCKeeper), diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index 26f4d129cd..62cc8dfb3b 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -73,7 +73,7 @@ func (suite *AnteTestSuite) SetupTest(isCheckTx bool) { suite.denom = claimstypes.DefaultClaimsDenom evmParams := suite.app.EvmKeeper.GetParams(suite.ctx) evmParams.EvmDenom = suite.denom - suite.app.EvmKeeper.SetParams(suite.ctx, evmParams) + _ = suite.app.EvmKeeper.SetParams(suite.ctx, evmParams) } func TestAnteTestSuite(t *testing.T) { @@ -102,7 +102,7 @@ func (suite *AnteTestSuite) CommitAfter(t time.Duration) { suite.ctx = suite.app.BaseApp.NewContext(false, header) } -func (s *AnteTestSuite) CreateTestTxBuilder(gasPrice math.Int, denom string, msgs ...sdk.Msg) client.TxBuilder { +func (suite *AnteTestSuite) CreateTestTxBuilder(gasPrice math.Int, denom string, msgs ...sdk.Msg) client.TxBuilder { encodingConfig := encoding.MakeConfig(app.ModuleBasics) gasLimit := uint64(1000000) @@ -116,7 +116,7 @@ func (s *AnteTestSuite) CreateTestTxBuilder(gasPrice math.Int, denom string, msg return txBuilder } -func (s *AnteTestSuite) CreateEthTestTxBuilder(msgEthereumTx *evmtypes.MsgEthereumTx) client.TxBuilder { +func (suite *AnteTestSuite) CreateEthTestTxBuilder(msgEthereumTx *evmtypes.MsgEthereumTx) client.TxBuilder { encodingConfig := encoding.MakeConfig(app.ModuleBasics) option, err := codectypes.NewAnyWithValue(&evmtypes.ExtensionOptionsEthereumTx{}) s.Require().NoError(err) @@ -139,7 +139,7 @@ func (s *AnteTestSuite) CreateEthTestTxBuilder(msgEthereumTx *evmtypes.MsgEthere return txBuilder } -func (s *AnteTestSuite) BuildTestEthTx( +func (suite *AnteTestSuite) BuildTestEthTx( from common.Address, to common.Address, gasPrice *big.Int, diff --git a/app/export.go b/app/export.go index 0d97d0f21d..2ac622b4ac 100644 --- a/app/export.go +++ b/app/export.go @@ -143,7 +143,7 @@ func (app *Evmos) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []s app.DistrKeeper.SetFeePool(ctx, feePool) err := app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()) - if err != nil { // nolint:gosimple // this lets us stop in case there's an error + if err != nil { //nolint:gosimple // this lets us stop in case there's an error return true } return false diff --git a/app/sigverify_test.go b/app/sigverify_test.go index f14dcbe9ef..8432f6ff01 100644 --- a/app/sigverify_test.go +++ b/app/sigverify_test.go @@ -63,7 +63,7 @@ func TestConsumeSignatureVerificationGas(t *testing.T) { expectedCost1 := expectedGasCostByKeys(pkSet1) for i := 0; i < len(pkSet1); i++ { - stdSig := legacytx.StdSignature{PubKey: pkSet1[i], Signature: sigSet1[i]} + stdSig := legacytx.StdSignature{PubKey: pkSet1[i], Signature: sigSet1[i]} //nolint:staticcheck sigV2, err := legacytx.StdSignatureToSignatureV2(cdc, stdSig) require.NoError(t, err) err = multisig.AddSignatureV2(multisignature1, sigV2, pkSet1) diff --git a/app/tps_counter_test.go b/app/tps_counter_test.go index 71a19abb7c..c4ae11749f 100644 --- a/app/tps_counter_test.go +++ b/app/tps_counter_test.go @@ -23,7 +23,7 @@ func TestTPSCounter(t *testing.T) { tpc := newTPSCounter(wlog) tpc.reportPeriod = 5 * time.Millisecond ctx, cancel := context.WithCancel(context.Background()) - go tpc.start(ctx) + go tpc.start(ctx) //nolint:errcheck // Concurrently increment the counter. n := 50 diff --git a/app/upgrades/v11/upgrades_test.go b/app/upgrades/v11/upgrades_test.go index b7c47c78f4..9182672f35 100644 --- a/app/upgrades/v11/upgrades_test.go +++ b/app/upgrades/v11/upgrades_test.go @@ -156,7 +156,7 @@ func (suite *UpgradeTestSuite) TestDistributeRewards() { suite.Require().True(ok, "error converting rewards") var validatorAddresses []string - validatorDelegations := make(map[string]sdk.Int) + validatorDelegations := make(map[string]math.Int) actualRewards := math.ZeroInt() for _, allocation := range v11.Allocations { diff --git a/app/upgrades/v9/upgrades_test.go b/app/upgrades/v9/upgrades_test.go index 8cfc4ec237..48b8c1bf4d 100644 --- a/app/upgrades/v9/upgrades_test.go +++ b/app/upgrades/v9/upgrades_test.go @@ -85,8 +85,10 @@ func (suite *UpgradeTestSuite) TestReturnFundsFromCommunityPool() { sender := sdk.AccAddress(address.Bytes()) res, _ := sdk.NewIntFromString(v9.MaxRecover) coins := sdk.NewCoins(sdk.NewCoin("aevmos", res)) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err = suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) err = suite.app.DistrKeeper.FundCommunityPool(suite.ctx, coins, sender) suite.Require().NoError(err) diff --git a/app/upgrades/v9_1/upgrades_test.go b/app/upgrades/v9_1/upgrades_test.go index 6ccb4ee571..1d159e578c 100644 --- a/app/upgrades/v9_1/upgrades_test.go +++ b/app/upgrades/v9_1/upgrades_test.go @@ -87,7 +87,7 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { expectedSuccess bool }{ { - "Mainnet - sucess", + "Mainnet - success", evmostypes.MainnetChainID + "-4", func() { // send funds to the community pool @@ -97,8 +97,10 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { sender := sdk.AccAddress(address.Bytes()) res, _ := sdk.NewIntFromString(v9.MaxRecover) coins := sdk.NewCoins(sdk.NewCoin("aevmos", res)) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err = suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) err = suite.app.DistrKeeper.FundCommunityPool(suite.ctx, coins, sender) suite.Require().NoError(err) @@ -107,7 +109,7 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { }, true, }, - { + { //nolint:dupl "Mainnet - first account > MaxRecover", evmostypes.MainnetChainID + "-4", func() { @@ -118,8 +120,10 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { sender := sdk.AccAddress(address.Bytes()) res, _ := sdk.NewIntFromString(v9.MaxRecover) coins := sdk.NewCoins(sdk.NewCoin("aevmos", res)) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err = suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) err = suite.app.DistrKeeper.FundCommunityPool(suite.ctx, coins, sender) suite.Require().NoError(err) @@ -130,7 +134,7 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { }, false, }, - { + { //nolint:dupl "Mainnet - middle account > MaxRecover", evmostypes.MainnetChainID + "-4", func() { @@ -141,8 +145,10 @@ func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { sender := sdk.AccAddress(address.Bytes()) res, _ := sdk.NewIntFromString(v9.MaxRecover) coins := sdk.NewCoins(sdk.NewCoin("aevmos", res)) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err = suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) err = suite.app.DistrKeeper.FundCommunityPool(suite.ctx, coins, sender) suite.Require().NoError(err) diff --git a/client/docs/statik/init.go b/client/docs/statik/init.go index b527422193..67cb2ff7eb 100644 --- a/client/docs/statik/init.go +++ b/client/docs/statik/init.go @@ -18,7 +18,7 @@ package statik // unnamed import of statik for swagger UI support // override ethermint statik by importing it -// nolint +//nolint import _ "github.com/evmos/ethermint/client/docs/statik" // This just for fixing the error in importing empty github.com/evmos/ethermint/client/docs/statik diff --git a/cmd/config/config.go b/cmd/config/config.go index 0a5afb4aee..c6df8d5927 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -58,7 +58,7 @@ func SetBech32Prefixes(config *sdk.Config) { func SetBip44CoinType(config *sdk.Config) { config.SetCoinType(ethermint.Bip44CoinType) config.SetPurpose(sdk.Purpose) // Shared - config.SetFullFundraiserPath(ethermint.BIP44HDPath) // nolint: staticcheck + config.SetFullFundraiserPath(ethermint.BIP44HDPath) //nolint: staticcheck } // RegisterDenoms registers the base and display denominations to the SDK. diff --git a/contracts/erc20.go b/contracts/erc20.go index 640bf731bc..8caca4f996 100644 --- a/contracts/erc20.go +++ b/contracts/erc20.go @@ -28,7 +28,7 @@ import ( var ( //go:embed compiled_contracts/ERC20MinterBurnerDecimals.json - ERC20MinterBurnerDecimalsJSON []byte // nolint: golint + ERC20MinterBurnerDecimalsJSON []byte //nolint: golint // ERC20MinterBurnerDecimalsContract is the compiled erc20 contract ERC20MinterBurnerDecimalsContract evmtypes.CompiledContract diff --git a/contracts/erc20DirectBalanceManipulation.go b/contracts/erc20DirectBalanceManipulation.go index 5b16246a33..e238e57796 100644 --- a/contracts/erc20DirectBalanceManipulation.go +++ b/contracts/erc20DirectBalanceManipulation.go @@ -14,7 +14,7 @@ import ( // a predefined C is given a massive allowance on B. var ( //go:embed compiled_contracts/ERC20DirectBalanceManipulation.json - ERC20DirectBalanceManipulationJSON []byte // nolint: golint + ERC20DirectBalanceManipulationJSON []byte //nolint: golint // ERC20DirectBalanceManipulationContract is the compiled erc20 contract ERC20DirectBalanceManipulationContract evmtypes.CompiledContract diff --git a/contracts/erc20maliciousdelayed.go b/contracts/erc20maliciousdelayed.go index 295c664e07..27e487007d 100644 --- a/contracts/erc20maliciousdelayed.go +++ b/contracts/erc20maliciousdelayed.go @@ -14,7 +14,7 @@ import ( // a predefined C is given a massive allowance on B. var ( //go:embed compiled_contracts/ERC20MaliciousDelayed.json - ERC20MaliciousDelayedJSON []byte // nolint: golint + ERC20MaliciousDelayedJSON []byte //nolint: golint // ERC20MaliciousDelayedContract is the compiled erc20 contract ERC20MaliciousDelayedContract evmtypes.CompiledContract diff --git a/ibc/module_test.go b/ibc/module_test.go index 02bcfc604a..e48e82abbc 100644 --- a/ibc/module_test.go +++ b/ibc/module_test.go @@ -25,7 +25,7 @@ type MockIBCModule struct { // OnChanOpenInit implements the Module interface // It calls the underlying app's OnChanOpenInit callback. -func (m MockIBCModule) OnChanOpenInit( +func (m MockIBCModule) OnChanOpenInit( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, order channeltypes.Order, connectionHops []string, @@ -41,7 +41,7 @@ func (m MockIBCModule) OnChanOpenInit( // OnChanOpenTry implements the Module interface. // It calls the underlying app's OnChanOpenTry callback. -func (m MockIBCModule) OnChanOpenTry( +func (m MockIBCModule) OnChanOpenTry( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, order channeltypes.Order, connectionHops []string, @@ -57,7 +57,7 @@ func (m MockIBCModule) OnChanOpenTry( // OnChanOpenAck implements the Module interface. // It calls the underlying app's OnChanOpenAck callback. -func (m MockIBCModule) OnChanOpenAck( +func (m MockIBCModule) OnChanOpenAck( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, portID, channelID, @@ -70,7 +70,7 @@ func (m MockIBCModule) OnChanOpenAck( // OnChanOpenConfirm implements the Module interface. // It calls the underlying app's OnChanOpenConfirm callback. -func (m MockIBCModule) OnChanOpenConfirm( +func (m MockIBCModule) OnChanOpenConfirm( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, portID, channelID string, @@ -81,7 +81,7 @@ func (m MockIBCModule) OnChanOpenConfirm( // OnChanCloseInit implements the Module interface // It calls the underlying app's OnChanCloseInit callback. -func (m MockIBCModule) OnChanCloseInit( +func (m MockIBCModule) OnChanCloseInit( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, portID, channelID string, @@ -92,7 +92,7 @@ func (m MockIBCModule) OnChanCloseInit( // OnChanCloseConfirm implements the Module interface. // It calls the underlying app's OnChanCloseConfirm callback. -func (m MockIBCModule) OnChanCloseConfirm( +func (m MockIBCModule) OnChanCloseConfirm( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, portID, channelID string, @@ -103,7 +103,7 @@ func (m MockIBCModule) OnChanCloseConfirm( // OnRecvPacket implements the Module interface. // It calls the underlying app's OnRecvPacket callback. -func (m MockIBCModule) OnRecvPacket( +func (m MockIBCModule) OnRecvPacket( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress, @@ -114,7 +114,7 @@ func (m MockIBCModule) OnRecvPacket( // OnAcknowledgementPacket implements the Module interface. // It calls the underlying app's OnAcknowledgementPacket callback. -func (m MockIBCModule) OnAcknowledgementPacket( +func (m MockIBCModule) OnAcknowledgementPacket( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, @@ -126,7 +126,7 @@ func (m MockIBCModule) OnAcknowledgementPacket( // OnTimeoutPacket implements the Module interface. // It calls the underlying app's OnTimeoutPacket callback. -func (m MockIBCModule) OnTimeoutPacket( +func (m MockIBCModule) OnTimeoutPacket( //nolint:govet // we can copy locks here because it is a test ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress, diff --git a/tests/e2e/e2e_suite_test.go b/tests/e2e/e2e_suite_test.go index e710dd54e8..e80ba01309 100644 --- a/tests/e2e/e2e_suite_test.go +++ b/tests/e2e/e2e_suite_test.go @@ -80,7 +80,7 @@ func (s *IntegrationTestSuite) runInitialNode() { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - // wait untill node starts and produce some blocks + // wait until node starts and produce some blocks err = s.upgradeManager.WaitForHeight(ctx, 5) s.Require().NoError(err) diff --git a/x/claims/genesis_test.go b/x/claims/genesis_test.go index 2614105f16..60a7e34cb7 100644 --- a/x/claims/genesis_test.go +++ b/x/claims/genesis_test.go @@ -62,7 +62,8 @@ func (suite *GenesisTestSuite) SetupTest() { params := types.DefaultParams() params.AirdropStartTime = suite.ctx.BlockTime() - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) stakingParams.BondDenom = params.GetClaimsDenom() @@ -77,7 +78,6 @@ func TestGenesisTestSuite(t *testing.T) { } var ( - now = time.Now().UTC() acc1 = sdk.MustAccAddressFromBech32("evmos1qxx0fdsmruzuar2fay88lfw6sce6emamyu2s8h4d") acc2 = sdk.MustAccAddressFromBech32("evmos1nsrs4t7dngkdltehkm3p6n8dp22sz3mct9uhc8") ) diff --git a/x/claims/keeper/abci_test.go b/x/claims/keeper/abci_test.go index b10fec39f9..9e402418ef 100644 --- a/x/claims/keeper/abci_test.go +++ b/x/claims/keeper/abci_test.go @@ -26,7 +26,7 @@ func (suite *KeeperTestSuite) TestEndBlock() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, }, { @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestEndBlock() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = true - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, }, { @@ -45,7 +45,7 @@ func (suite *KeeperTestSuite) TestEndBlock() { params.AirdropStartTime = time.Time{} params.DurationUntilDecay = time.Hour params.DurationOfDecay = time.Hour - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, }, } diff --git a/x/claims/keeper/claim_test.go b/x/claims/keeper/claim_test.go index c88b1d60e6..457128aea4 100644 --- a/x/claims/keeper/claim_test.go +++ b/x/claims/keeper/claim_test.go @@ -132,7 +132,8 @@ func (suite *KeeperTestSuite) TestGetUserTotalClaimable() { cr := types.NewClaimsRecord(sdk.NewInt(100)) params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.AirdropStartTime = suite.ctx.BlockTime().Add(-time.Minute) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, cr) }, sdk.NewInt(100), @@ -143,7 +144,7 @@ func (suite *KeeperTestSuite) TestGetUserTotalClaimable() { cr := types.NewClaimsRecord(sdk.NewInt(100)) params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, cr) }, sdk.ZeroInt(), @@ -156,7 +157,7 @@ func (suite *KeeperTestSuite) TestGetUserTotalClaimable() { params.AirdropStartTime = params.AirdropStartTime.Add(-time.Hour) params.DurationUntilDecay = 30 * time.Minute params.DurationOfDecay = time.Hour - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, cr) }, sdk.NewInt(100), @@ -578,10 +579,11 @@ func (suite *KeeperTestSuite) TestMergeClaimRecords() { DurationOfDecay: time.Hour, ClaimsDenom: types.DefaultClaimsDenom, } - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) coins := sdk.Coins{sdk.NewCoin(params.ClaimsDenom, sdk.NewInt(50))} - err := testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) + err = testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) _, err = suite.app.ClaimsKeeper.MergeClaimsRecords(suite.ctx, recipient, senderClaimsRecord, recipientClaimsRecord, params) @@ -594,7 +596,7 @@ func (suite *KeeperTestSuite) TestMergeClaimRecords() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck // this will run through many test cases and we don't know if we want error or not tc.test() }) @@ -625,7 +627,8 @@ func (suite *KeeperTestSuite) TestHookBeforeAirdropStart() { airdropStartTime := suite.ctx.BlockTime().Add(time.Hour) params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.AirdropStartTime = airdropStartTime - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) addr1 := sdk.AccAddress(tests.GenerateAddress().Bytes()) @@ -754,7 +757,8 @@ func (suite *KeeperTestSuite) TestDelegationAutoWithdrawAndDelegateMore() { validator, err := stakingtypes.NewValidator(sdk.ValAddress(addrs[0]), pub1.PubKey(), stakingtypes.Description{}) suite.Require().NoError(err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + suite.Require().NoError(err) validator, _ = validator.AddTokensFromDel(sdk.TokensFromConsensusPower(1, ethermint.PowerReduction)) delAmount := sdk.TokensFromConsensusPower(1, ethermint.PowerReduction) @@ -887,7 +891,8 @@ func (suite *KeeperTestSuite) TestClaimOfDecayed() { params.AirdropStartTime = airdropStartTime params.DurationUntilDecay = durationUntilDecay params.DurationOfDecay = durationOfDecay - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) var claimsRecord types.ClaimsRecord @@ -963,7 +968,7 @@ func (suite *KeeperTestSuite) TestClaimOfDecayed() { ActionsCompleted: []bool{false, false, false, false}, } - suite.app.ClaimsKeeper.SetParams(suite.ctx, types.Params{ + suite.app.ClaimsKeeper.SetParams(suite.ctx, types.Params{ //nolint:errcheck AirdropStartTime: airdropStartTime, DurationUntilDecay: durationUntilDecay, DurationOfDecay: durationOfDecay, @@ -1013,7 +1018,8 @@ func (suite *KeeperTestSuite) TestClawbackEscrowedTokens() { suite.Require().Equal(coins.AmountOf(params.GetClaimsDenom()), escrow.Sub(claimedCoins)) // End the airdrop - suite.app.ClaimsKeeper.EndAirdrop(ctx, params) + err = suite.app.ClaimsKeeper.EndAirdrop(ctx, params) + suite.Require().NoError(err) // Make sure no one can claim after airdrop ends claimedCoinsAfter, err := suite.app.ClaimsKeeper.ClaimCoinsForAction(ctx, addr1, claimsRecord, types.ActionDelegate, params) diff --git a/x/claims/keeper/grpc_query_test.go b/x/claims/keeper/grpc_query_test.go index a15ff96d40..4398257f06 100644 --- a/x/claims/keeper/grpc_query_test.go +++ b/x/claims/keeper/grpc_query_test.go @@ -112,7 +112,7 @@ func (suite *KeeperTestSuite) TestClaimsRecords() { if tc.expErr { suite.Require().Error(err) } else { - if tc.recordsAmount == 0 { + if tc.recordsAmount == 0 { //nolint:gocritic suite.Require().NoError(err) } else if tc.recordsAmount == 1 { suite.Require().NoError(err) @@ -190,7 +190,7 @@ func (suite *KeeperTestSuite) TestClaimsRecord() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck claimsRecord := types.NewClaimsRecord(sdk.NewInt(1_000_000_000_000)) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimsRecord) req = &types.QueryClaimsRecordRequest{ @@ -204,7 +204,8 @@ func (suite *KeeperTestSuite) TestClaimsRecord() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.AirdropStartTime = time.Now().Add(time.Hour * 24) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) claimsRecord := types.NewClaimsRecord(sdk.NewInt(1_000_000_000_000)) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimsRecord) req = &types.QueryClaimsRecordRequest{ diff --git a/x/claims/keeper/hooks_test.go b/x/claims/keeper/hooks_test.go index d84cc10934..b511d222b6 100644 --- a/x/claims/keeper/hooks_test.go +++ b/x/claims/keeper/hooks_test.go @@ -30,7 +30,7 @@ func (suite *KeeperTestSuite) TestAfterProposalVote() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, types.ClaimsRecord{}) suite.app.ClaimsKeeper.AfterProposalVote(suite.ctx, 1, addr) @@ -49,7 +49,7 @@ func (suite *KeeperTestSuite) TestAfterProposalVote() { claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) claimRecord.MarkClaimed(types.ActionVote) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) @@ -76,7 +76,7 @@ func (suite *KeeperTestSuite) TestAfterProposalVote() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) @@ -108,7 +108,7 @@ func (suite *KeeperTestSuite) TestAfterProposalVote() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) @@ -145,7 +145,7 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { { "no claim record", func() { - suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) //nolint:errcheck }, }, { @@ -160,10 +160,10 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) - suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) //nolint:errcheck }, }, { @@ -180,10 +180,10 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) claimRecord.MarkClaimed(types.ActionDelegate) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) - suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) //nolint:errcheck }, }, { @@ -197,7 +197,8 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { ClaimsDenom: types.DefaultClaimsDenom, } - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) @@ -205,10 +206,11 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) coins := sdk.Coins{sdk.NewCoin(params.ClaimsDenom, sdk.NewInt(250))} - err := testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) + err = testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) - suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + err = suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + suite.Require().NoError(err) newClaimRec, found := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, addr) suite.Require().True(found) @@ -232,12 +234,12 @@ func (suite *KeeperTestSuite) TestAfterDelegation() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.app.ClaimsKeeper.SetParams(suite.ctx, params) //nolint:errcheck suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) - suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) + suite.app.ClaimsKeeper.AfterDelegationModified(suite.ctx, addr, addr2) //nolint:errcheck newClaimRec, found := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, addr) suite.Require().True(found) @@ -290,10 +292,11 @@ func (suite *KeeperTestSuite) TestAfterEVMStateTransition() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) - err := suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) + err = suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) suite.Require().NoError(err) }, }, @@ -311,10 +314,11 @@ func (suite *KeeperTestSuite) TestAfterEVMStateTransition() { claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) claimRecord.MarkClaimed(types.ActionEVM) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) - err := suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) + err = suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) suite.Require().NoError(err) }, }, @@ -329,7 +333,8 @@ func (suite *KeeperTestSuite) TestAfterEVMStateTransition() { ClaimsDenom: types.DefaultClaimsDenom, } - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) @@ -337,7 +342,7 @@ func (suite *KeeperTestSuite) TestAfterEVMStateTransition() { expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) coins := sdk.Coins{sdk.NewCoin(params.ClaimsDenom, sdk.NewInt(250))} - err := testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) + err = testutil.FundModuleAccount(suite.ctx, suite.app.BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) err = suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) @@ -365,12 +370,13 @@ func (suite *KeeperTestSuite) TestAfterEVMStateTransition() { } claimRecord := types.NewClaimsRecord(sdk.NewInt(1000)) - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, addr, claimRecord) expBalance := suite.app.BankKeeper.GetBalance(suite.ctx, addr, params.ClaimsDenom) - err := suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) + err = suite.app.ClaimsKeeper.PostTxProcessing(suite.ctx, msg, &receipt) suite.Require().NoError(err) newClaimRec, found := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, addr) diff --git a/x/claims/keeper/ibc_callbacks.go b/x/claims/keeper/ibc_callbacks.go index 3a60c03f42..95c459d1a8 100644 --- a/x/claims/keeper/ibc_callbacks.go +++ b/x/claims/keeper/ibc_callbacks.go @@ -192,7 +192,7 @@ func (k Keeper) OnRecvPacket( // case 2: only the sender has a claims record // -> migrate the sender record to the recipient address and claim IBC action - claimedAmt := sdk.ZeroInt() // nolint + claimedAmt := sdk.ZeroInt() //nolint claimedAmt, err = k.ClaimCoinsForAction(ctx, recipient, senderClaimsRecord, types.ActionIBCTransfer, params) // if the transfer fails or the claimable amount is 0 (eg: action already diff --git a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go index 90bf31d8a4..97a5a47816 100644 --- a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go +++ b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go @@ -59,8 +59,10 @@ func (suite *IBCTestingSuite) SetupTest() { params := types.DefaultParams() params.AirdropStartTime = suite.chainA.GetContext().BlockTime() params.EnableClaims = true - suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) - suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) + err = suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) + suite.Require().NoError(err) + err = suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) + suite.Require().NoError(err) suite.pathEVM = ibctesting.NewTransferPath(suite.chainA, suite.chainB) // clientID, connectionID, channelID empty suite.coordinator.Setup(suite.pathEVM) // clientID, connectionID, channelID filled @@ -80,8 +82,8 @@ func TestIBCTestingSuite(t *testing.T) { } func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { - sender := "evmos1sv9m0g7ycejwr3s369km58h5qe7xj77hvcxrms" - receiver := "evmos1hf0468jjpe6m6vx38s97z2qqe8ldu0njdyf625" + sender := "evmos1sv9m0g7ycejwr3s369km58h5qe7xj77hvcxrms" //nolint:goconst + receiver := "evmos1hf0468jjpe6m6vx38s97z2qqe8ldu0njdyf625" //nolint:goconst senderAddr, err := sdk.AccAddressFromBech32(sender) suite.Require().NoError(err) @@ -98,8 +100,8 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { func(_ int64) { params := types.DefaultParams() params.EnableClaims = false - suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) - suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) + suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck + suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck }, 4, 0, @@ -198,8 +200,8 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { func(_ int64) { params := types.DefaultParams() params.EnableClaims = false - suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) - suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) + suite.chainA.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck + suite.chainB.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck }, func() {}, 4, @@ -391,14 +393,15 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { packet := channeltypes.NewPacket(bz, 1, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, timeoutHeight, 0) // send on endpointA - path.EndpointA.SendPacket( + _, err = path.EndpointA.SendPacket( packet.TimeoutHeight, packet.TimeoutTimestamp, packet.Data, ) + suite.Require().NoError(err) // receive on endpointB - err := path.EndpointB.RecvPacket(packet) + err = path.EndpointB.RecvPacket(packet) suite.Require().NoError(err) coin := suite.chainB.App.(*app.Evmos).BankKeeper.GetBalance(suite.chainB.GetContext(), receiverAddr, "aevmos") diff --git a/x/claims/keeper/ibc_callbacks_test.go b/x/claims/keeper/ibc_callbacks_test.go index b3305e4609..06783161de 100644 --- a/x/claims/keeper/ibc_callbacks_test.go +++ b/x/claims/keeper/ibc_callbacks_test.go @@ -36,9 +36,10 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) - err := suite.app.ClaimsKeeper.OnAcknowledgementPacket(suite.ctx, mockpacket, ack.Acknowledgement()) + err = suite.app.ClaimsKeeper.OnAcknowledgementPacket(suite.ctx, mockpacket, ack.Acknowledgement()) suite.Require().NoError(err) }, }, @@ -59,9 +60,9 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { { "no-op: error Ack", func() { - err := errorsmod.Wrapf(errortypes.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data") - err = suite.app.ClaimsKeeper.OnAcknowledgementPacket(suite.ctx, mockpacket, ackFail.Acknowledgement()) + err := suite.app.ClaimsKeeper.OnAcknowledgementPacket(suite.ctx, mockpacket, ackFail.Acknowledgement()) suite.Require().NoError(err) + _ = suite.app.ClaimsKeeper.OnAcknowledgementPacket(suite.ctx, mockpacket, ackFail.Acknowledgement()) }, }, { @@ -171,7 +172,8 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { params := suite.app.ClaimsKeeper.GetParams(suite.ctx) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) resAck := suite.app.ClaimsKeeper.OnRecvPacket(suite.ctx, mockpacket, ack) suite.Require().Equal(ack, resAck) @@ -450,7 +452,8 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { params.AuthorizedChannels = []string{ "channel-2", // Injective } - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err = suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) transfer := transfertypes.NewFungibleTokenPacketData("aevmos", "100", secpAddrCosmos, secpAddrEvmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) @@ -480,7 +483,8 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { "channel-0", // Osmosis "channel-3", // Cosmos Hub } - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) transfer := transfertypes.NewFungibleTokenPacketData("aevmos", "100", secpAddrCosmos, secpAddrEvmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index 2a9be493a1..8643813ac0 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -24,7 +24,6 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" - evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/evmos/evmos/v11/app" "github.com/evmos/evmos/v11/testutil" incentivestypes "github.com/evmos/evmos/v11/x/incentives/types" @@ -56,7 +55,7 @@ var _ = Describe("Claiming", Ordered, func() { delegateAmount := sdk.NewCoin(claimsDenom, sdk.NewInt(1)) initBalance := sdk.NewCoins( sdk.NewCoin(claimsDenom, initClaimsAmount), - sdk.NewCoin(evmtypes.DefaultEVMDenom, initEvmAmount), + sdk.NewCoin(evm.DefaultEVMDenom, initEvmAmount), ) // account for creating the governance proposals @@ -64,7 +63,7 @@ var _ = Describe("Claiming", Ordered, func() { initBalance0 := sdk.NewCoins( sdk.NewCoin(stakeDenom, initStakeAmount), sdk.NewCoin(claimsDenom, initClaimsAmount0), - sdk.NewCoin(evmtypes.DefaultEVMDenom, initEvmAmount), + sdk.NewCoin(evm.DefaultEVMDenom, initEvmAmount), ) var ( @@ -73,7 +72,7 @@ var _ = Describe("Claiming", Ordered, func() { addr0 sdk.AccAddress claimsRecords []types.ClaimsRecord params types.Params - proposalId uint64 + proposalID uint64 totalClaimed sdk.Coin remainderUnclaimed sdk.Coin ) @@ -84,12 +83,13 @@ var _ = Describe("Claiming", Ordered, func() { params = s.app.ClaimsKeeper.GetParams(s.ctx) params.EnableClaims = true params.AirdropStartTime = s.ctx.BlockTime() - s.app.ClaimsKeeper.SetParams(s.ctx, params) + err := s.app.ClaimsKeeper.SetParams(s.ctx, params) + s.Require().NoError(err) // mint coins for claiming and send them to the claims module coins := sdk.NewCoins(totalClaimsAmount) - err := testutil.FundModuleAccount(s.ctx, s.app.BankKeeper, inflationtypes.ModuleName, coins) + err = testutil.FundModuleAccount(s.ctx, s.app.BankKeeper, inflationtypes.ModuleName, coins) s.Require().NoError(err) err = s.app.BankKeeper.SendCoinsFromModuleToModule(s.ctx, inflationtypes.ModuleName, types.ModuleName, coins) s.Require().NoError(err) @@ -97,13 +97,15 @@ var _ = Describe("Claiming", Ordered, func() { // fund testing accounts and create claim records priv0, _ = ethsecp256k1.GenerateKey() addr0 = getAddr(priv0) - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr0, initBalance0) + err = testutil.FundAccount(s.ctx, s.app.BankKeeper, addr0, initBalance0) + s.Require().NoError(err) for i := 0; i < accountCount; i++ { priv, _ := ethsecp256k1.GenerateKey() privs = append(privs, priv) addr := getAddr(priv) - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr, initBalance) + err = testutil.FundAccount(s.ctx, s.app.BankKeeper, addr, initBalance) + s.Require().NoError(err) claimsRecord := types.NewClaimsRecord(claimValue) s.app.ClaimsKeeper.SetClaimsRecord(s.ctx, addr, claimsRecord) acc := s.app.AccountKeeper.NewAccountWithAddress(s.ctx, addr) @@ -124,7 +126,7 @@ var _ = Describe("Claiming", Ordered, func() { s.Commit() - proposalId = govProposal(priv0) + proposalID = govProposal(priv0) }) Context("before decay duration", func() { @@ -152,7 +154,7 @@ var _ = Describe("Claiming", Ordered, func() { It("can claim ActionVote", func() { addr := getAddr(privs[1]) prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) - vote(privs[1], proposalId) + vote(privs[1], proposalID) balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) Expect(balance).To(Equal(prebalance.Add(actionV))) }) @@ -183,7 +185,7 @@ var _ = Describe("Claiming", Ordered, func() { // create another proposal to vote for testTime := s.ctx.BlockHeader().Time.Add(duration) s.CommitAfter(duration - time.Hour) - proposalId = govProposal(priv0) + proposalID = govProposal(priv0) s.CommitAfter(testTime.Sub(s.ctx.BlockHeader().Time)) }) @@ -208,7 +210,7 @@ var _ = Describe("Claiming", Ordered, func() { It("can claim ActionVote", func() { addr := getAddr(privs[0]) prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) - vote(privs[0], proposalId) + vote(privs[0], proposalID) balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) Expect(balance).To(Equal(prebalance.Add(actionV))) }) @@ -232,7 +234,7 @@ var _ = Describe("Claiming", Ordered, func() { It("cannot claim ActionVote a second time", func() { addr := getAddr(privs[0]) prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) - vote(privs[0], proposalId) + vote(privs[0], proposalID) balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) Expect(balance).To(Equal(prebalance)) }) @@ -331,7 +333,7 @@ func govProposal(priv *ethsecp256k1.PrivKey) uint64 { "test", "description", contractAddress.String(), - sdk.DecCoins{sdk.NewDecCoinFromDec(evmtypes.DefaultEVMDenom, sdk.NewDecWithPrec(5, 2))}, + sdk.DecCoins{sdk.NewDecCoinFromDec(evm.DefaultEVMDenom, sdk.NewDecWithPrec(5, 2))}, 1000, ) @@ -344,10 +346,10 @@ func govProposal(priv *ethsecp256k1.PrivKey) uint64 { Expect(submitEvent.Type).To(Equal("submit_proposal")) Expect(string(submitEvent.Attributes[0].Key)).To(Equal("proposal_id")) - proposalId, err := strconv.ParseUint(string(submitEvent.Attributes[0].Value), 10, 64) + proposalID, err := strconv.ParseUint(string(submitEvent.Attributes[0].Value), 10, 64) s.Require().NoError(err) - return proposalId + return proposalID } func vote(priv *ethsecp256k1.PrivKey, proposalID uint64) { @@ -362,7 +364,7 @@ func sendEthToSelf(priv *ethsecp256k1.PrivKey) { from := common.BytesToAddress(priv.PubKey().Address().Bytes()) nonce := s.app.EvmKeeper.GetNonce(s.ctx, from) - msgEthereumTx := evmtypes.NewTx(chainID, nonce, &from, nil, 100000, nil, s.app.FeeMarketKeeper.GetBaseFee(s.ctx), big.NewInt(1), nil, ðtypes.AccessList{}) + msgEthereumTx := evm.NewTx(chainID, nonce, &from, nil, 100000, nil, s.app.FeeMarketKeeper.GetBaseFee(s.ctx), big.NewInt(1), nil, ðtypes.AccessList{}) msgEthereumTx.From = from.String() performEthTx(priv, msgEthereumTx) } @@ -375,7 +377,7 @@ func deployContract(priv *ethsecp256k1.PrivKey) common.Address { ctorArgs, err := contracts.ERC20MinterBurnerDecimalsContract.ABI.Pack("", "Test", "TTT", uint8(18)) s.Require().NoError(err) - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &s.address, Data: (*hexutil.Bytes)(&data), @@ -385,11 +387,11 @@ func deployContract(priv *ethsecp256k1.PrivKey) common.Address { ctx := sdk.WrapSDKContext(s.ctx) res, err := s.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) s.Require().NoError(err) - msgEthereumTx := evmtypes.NewTxContract(chainID, nonce, nil, res.Gas, nil, s.app.FeeMarketKeeper.GetBaseFee(s.ctx), big.NewInt(1), data, ðtypes.AccessList{}) + msgEthereumTx := evm.NewTxContract(chainID, nonce, nil, res.Gas, nil, s.app.FeeMarketKeeper.GetBaseFee(s.ctx), big.NewInt(1), data, ðtypes.AccessList{}) msgEthereumTx.From = from.String() performEthTx(priv, msgEthereumTx) @@ -402,7 +404,7 @@ func deployContract(priv *ethsecp256k1.PrivKey) common.Address { return contractAddress } -func performEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evmtypes.MsgEthereumTx) { +func performEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evm.MsgEthereumTx) { // Sign transaction err := msgEthereumTx.Sign(s.ethSigner, tests.NewSigner(priv)) s.Require().NoError(err) @@ -410,7 +412,7 @@ func performEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evmtypes.MsgEthereu // Assemble transaction from fields encodingConfig := encoding.MakeConfig(app.ModuleBasics) txBuilder := encodingConfig.TxConfig.NewTxBuilder() - tx, err := msgEthereumTx.BuildTx(txBuilder, evmtypes.DefaultEVMDenom) + tx, err := msgEthereumTx.BuildTx(txBuilder, evm.DefaultEVMDenom) s.Require().NoError(err) // Encode transaction by default Tx encoder and broadcasted over the network diff --git a/x/claims/keeper/invariants_test.go b/x/claims/keeper/invariants_test.go index d1d9a57f5e..bea5181287 100644 --- a/x/claims/keeper/invariants_test.go +++ b/x/claims/keeper/invariants_test.go @@ -18,7 +18,7 @@ func (suite *KeeperTestSuite) TestClaimsInvariant() { { "claims inactive", func() { - suite.app.ClaimsKeeper.SetParams(suite.ctx, types.DefaultParams()) + suite.app.ClaimsKeeper.SetParams(suite.ctx, types.DefaultParams()) //nolint:errcheck }, false, }, diff --git a/x/claims/keeper/keeper_test.go b/x/claims/keeper/keeper_test.go index 910262b674..a150c29b16 100644 --- a/x/claims/keeper/keeper_test.go +++ b/x/claims/keeper/keeper_test.go @@ -108,7 +108,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { params := types.DefaultParams() params.AirdropStartTime = suite.ctx.BlockTime().UTC() - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err = suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + require.NoError(t, err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) stakingParams.BondDenom = params.GetClaimsDenom() @@ -119,7 +120,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { validator, err := stakingtypes.NewValidator(valAddr, privCons.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) validators := s.app.StakingKeeper.GetValidators(s.ctx, 1) @@ -148,7 +150,7 @@ func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { suite.app.EndBlocker(suite.ctx, abci.RequestEndBlock{Height: header.Height}) _ = suite.app.Commit() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, diff --git a/x/claims/keeper/params_test.go b/x/claims/keeper/params_test.go index 727041fbba..efde7ac993 100644 --- a/x/claims/keeper/params_test.go +++ b/x/claims/keeper/params_test.go @@ -10,7 +10,8 @@ func (suite *KeeperTestSuite) TestParams() { expParams.AirdropStartTime = suite.ctx.BlockTime() suite.Require().Equal(expParams, params) params.EnableClaims = false - suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) newParams := suite.app.ClaimsKeeper.GetParams(suite.ctx) suite.Require().Equal(newParams, params) } diff --git a/x/claims/migrations/v3/migrate_test.go b/x/claims/migrations/v3/migrate_test.go index bddb10c401..bf52487836 100644 --- a/x/claims/migrations/v3/migrate_test.go +++ b/x/claims/migrations/v3/migrate_test.go @@ -1,9 +1,10 @@ package v3_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "testing" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index db2a3756fb..5085c50042 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -77,7 +77,7 @@ func (suite *KeeperTestSuite) TestEpochInfoChangesBeginBlockerAndInitGenesis() { suite.Require().True(found) }, }, - { + { //nolint:dupl expCurrentEpochStartHeight: 3, expCurrentEpochStartTime: now.Add(time.Hour * 24 * 31), expCurrentEpoch: 2, @@ -93,7 +93,7 @@ func (suite *KeeperTestSuite) TestEpochInfoChangesBeginBlockerAndInitGenesis() { suite.Require().True(found) }, }, - { + { //nolint:dupl expCurrentEpochStartHeight: 3, expCurrentEpochStartTime: now.Add(time.Hour * 24 * 31), expCurrentEpoch: 2, diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index c3ea002df7..181f547280 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -23,8 +23,6 @@ import ( "github.com/evmos/evmos/v11/x/epochs/types" ) -var denomMint = evm.DefaultEVMDenom - type KeeperTestSuite struct { suite.Suite @@ -106,7 +104,7 @@ func (suite *KeeperTestSuite) Commit() { func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { _ = suite.app.Commit() header := suite.ctx.BlockHeader() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, diff --git a/x/erc20/client/cli/tx.go b/x/erc20/client/cli/tx.go index c132195b3a..3ab548abf7 100644 --- a/x/erc20/client/cli/tx.go +++ b/x/erc20/client/cli/tx.go @@ -152,7 +152,8 @@ func NewConvertERC20Cmd() *cobra.Command { } // NewRegisterCoinProposalCmd implements the command to submit a community-pool-spend proposal -// nolint:staticcheck +// +//nolint:staticcheck func NewRegisterCoinProposalCmd() *cobra.Command { cmd := &cobra.Command{ Use: "register-coin METADATA_FILE", @@ -250,7 +251,8 @@ Where metadata.json contains (example): } // NewRegisterERC20ProposalCmd implements the command to submit a community-pool-spend proposal -// nolint:staticcheck +// +//nolint:staticcheck func NewRegisterERC20ProposalCmd() *cobra.Command { cmd := &cobra.Command{ Use: "register-erc20 ERC20_ADDRESS...", @@ -317,7 +319,8 @@ func NewRegisterERC20ProposalCmd() *cobra.Command { } // NewToggleTokenConversionProposalCmd implements the command to submit a community-pool-spend proposal -// nolint:staticcheck +// +//nolint:staticcheck func NewToggleTokenConversionProposalCmd() *cobra.Command { cmd := &cobra.Command{ Use: "toggle-token-conversion TOKEN", diff --git a/x/erc20/keeper/evm_hooks.go b/x/erc20/keeper/evm_hooks.go index 57a98fb797..507b8913df 100644 --- a/x/erc20/keeper/evm_hooks.go +++ b/x/erc20/keeper/evm_hooks.go @@ -18,7 +18,6 @@ package keeper import ( "bytes" - // nolint: typecheck "math/big" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index b88af099b1..b93d8a7371 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -157,8 +157,10 @@ func (suite *KeeperTestSuite) TestEvmHooksRegisteredCoin() { contractAddr := common.HexToAddress(pair.Erc20Address) coins := sdk.NewCoins(sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.mint))) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err, tc.name) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err, tc.name) convertCoin := types.NewMsgConvertCoin( sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.burn)), @@ -167,7 +169,7 @@ func (suite *KeeperTestSuite) TestEvmHooksRegisteredCoin() { ) ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, convertCoin) + _, err = suite.app.Erc20Keeper.ConvertCoin(ctx, convertCoin) suite.Require().NoError(err, tc.name) suite.Commit() @@ -183,6 +185,7 @@ func (suite *KeeperTestSuite) TestEvmHooksRegisteredCoin() { cosmosBalance = suite.app.BankKeeper.GetBalance(suite.ctx, sender, metadataCoin.Base) if tc.result { + suite.Require().Equal(balance, big.NewInt(tc.burn-tc.reconvert)) // Check if the execution was successful suite.Require().NoError(err) suite.Require().Equal(cosmosBalance.Amount, sdk.NewInt(tc.mint-tc.burn+tc.reconvert)) diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index ea311d7ee3..c44d3c3cc7 100644 --- a/x/erc20/keeper/evm_test.go +++ b/x/erc20/keeper/evm_test.go @@ -202,7 +202,7 @@ func (suite *KeeperTestSuite) TestCallEVMWithData() { types.ModuleAddress, func() ([]byte, *common.Address) { ctorArgs, _ := contracts.ERC20MinterBurnerDecimalsContract.ABI.Pack("", "test", "test", uint8(18)) - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic return data, nil }, true, @@ -213,9 +213,9 @@ func (suite *KeeperTestSuite) TestCallEVMWithData() { func() ([]byte, *common.Address) { params := suite.app.EvmKeeper.GetParams(suite.ctx) params.EnableCreate = false - suite.app.EvmKeeper.SetParams(suite.ctx, params) + _ = suite.app.EvmKeeper.SetParams(suite.ctx, params) ctorArgs, _ := contracts.ERC20MinterBurnerDecimalsContract.ABI.Pack("", "test", "test", uint8(18)) - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic return data, nil }, false, diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 2b43c4ef75..33bf37ba1b 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -127,7 +127,7 @@ func (suite *KeeperTestSuite) TestTokenPair() { true, }, { - "token pair not found - with erc20 existant", + "token pair not found - with erc20 existent", func() { addr := tests.GenerateAddress() pair := types.NewTokenPair(addr, "coin", true, types.OWNER_MODULE) diff --git a/x/erc20/keeper/ibc_callbacks_integration_test.go b/x/erc20/keeper/ibc_callbacks_integration_test.go index cd4f6383fb..aa03ae51d3 100644 --- a/x/erc20/keeper/ibc_callbacks_integration_test.go +++ b/x/erc20/keeper/ibc_callbacks_integration_test.go @@ -69,7 +69,8 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = false - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() receiver = s.EvmosChain.SenderAccount.GetAddress().String() @@ -99,7 +100,8 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() receiver = s.EvmosChain.SenderAccount.GetAddress().String() @@ -107,7 +109,6 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { receiverAcc = sdk.MustAccAddressFromBech32(receiver) // Register uosmo pair - var err error pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvmosChain.GetContext(), osmoMeta) s.Require().NoError(err) }) @@ -188,7 +189,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { // 1. Send 'uosmo' from Osmosis to Evmos s.SendAndReceiveMessage(s.pathOsmosisEvmos, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") - // validate 'uosmo' was transfered successfully and converted to ERC20 + // validate 'uosmo' was transferred successfully and converted to ERC20 balanceERC20Token := s.app.Erc20Keeper.BalanceOf(s.EvmosChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(amount, balanceERC20Token.Int64()) @@ -213,17 +214,17 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() // receiver address is on Osmosis Chain also, - // but funds are transfered to this address in Evmos chain + // but funds are transferred to this address in Evmos chain receiver = sender senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) // Register uosmo pair - var err error pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvmosChain.GetContext(), osmoMeta) s.Require().NoError(err) }) @@ -257,11 +258,11 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { Describe("Performing claims with registered coin", func() { BeforeEach(func() { - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), types.DefaultParams()) + s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), types.DefaultParams()) //nolint:errcheck sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() // receiver address is on Osmosis Chain also, - // but funds are transfered to this address in Evmos chain + // but funds are transferred to this address in Evmos chain receiver = s.EvmosChain.SenderAccount.GetAddress().String() senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) @@ -276,7 +277,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { params.AuthorizedChannels = []string{ "channel-0", } - s.app.ClaimsKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.app.ClaimsKeeper.SetParams(s.EvmosChain.GetContext(), params) //nolint:errcheck }) It("it should perform the claim and convert the received tokens", func() { // Register claims record @@ -303,7 +304,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { // should trigger claims logic and send aevmos coins from claims to receiver - // ERC-20 balance should be the transfered amount + // ERC-20 balance should be the transferred amount balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvmosChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(amount, balanceTokenAfter.Int64()) @@ -321,10 +322,11 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { }) }) Describe("registered erc20", func() { - BeforeEach(func() { + BeforeEach(func() { //nolint:dupl erc20params := types.DefaultParams() erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() sender = s.EvmosChain.SenderAccount.GetAddress().String() @@ -332,7 +334,6 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair - var err error addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvmosChain.GetContext(), addr) @@ -343,7 +344,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BaseDenom: pair.Denom, } - s.EvmosChain.SenderAccount.SetSequence(s.EvmosChain.SenderAccount.GetSequence() + 1) + s.EvmosChain.SenderAccount.SetSequence(s.EvmosChain.SenderAccount.GetSequence() + 1) //nolint:errcheck }) It("should convert erc20 ibc voucher to original erc20", func() { // Mint tokens and send to receiver @@ -513,7 +514,8 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() sender = s.EvmosChain.SenderAccount.GetAddress().String() @@ -521,14 +523,14 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair - var err error addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvmosChain.GetContext(), addr) s.Require().NoError(err) s.EvmosChain.Coordinator.CommitBlock() erc20params.EnableErc20 = false - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err = s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) }) It("should fail transfer and not convert to IBC", func() { // Mint tokens and send to receiver @@ -579,10 +581,11 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { }) }) Describe("registered erc20", func() { - BeforeEach(func() { + BeforeEach(func() { //nolint:dupl erc20params := types.DefaultParams() erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() sender = s.EvmosChain.SenderAccount.GetAddress().String() @@ -590,7 +593,6 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair - var err error addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvmosChain.GetContext(), addr) @@ -601,7 +603,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { BaseDenom: pair.Denom, } - s.EvmosChain.SenderAccount.SetSequence(s.EvmosChain.SenderAccount.GetSequence() + 1) + s.EvmosChain.SenderAccount.SetSequence(s.EvmosChain.SenderAccount.GetSequence() + 1) //nolint:errcheck }) It("should transfer available balance", func() { // Mint tokens and send to receiver @@ -719,16 +721,17 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = false - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) // Send from osmosis to Evmos s.SendAndReceiveMessage(s.pathOsmosisEvmos, s.IBCOsmosisChain, "uosmo", amount, receiver, sender, 1, "") s.EvmosChain.Coordinator.CommitBlock(s.EvmosChain) erc20params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + err = s.app.Erc20Keeper.SetParams(s.EvmosChain.GetContext(), erc20params) + s.Require().NoError(err) // Register uosmo pair - var err error pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvmosChain.GetContext(), osmoMeta) s.Require().NoError(err) }) @@ -816,6 +819,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { []uint64{originChain.SenderAccount.GetSequence()}, true, true, originChain.SenderPrivKey, ) + s.Require().NoError(err) // check ERC20 balance was converted to ibc and sent balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvmosChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) @@ -826,6 +830,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { // increment sequence for successful transaction execution err = originChain.SenderAccount.SetSequence(originChain.SenderAccount.GetSequence() + 1) + s.Require().NoError(err) // Increment time so packet will timeout originChain.Coordinator.IncrementTime() diff --git a/x/erc20/keeper/ibc_callbacks_test.go b/x/erc20/keeper/ibc_callbacks_test.go index aba5d568e3..36232e239b 100644 --- a/x/erc20/keeper/ibc_callbacks_test.go +++ b/x/erc20/keeper/ibc_callbacks_test.go @@ -153,7 +153,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { checkBalances: true, }, { - name: "no-op - reciever is module account", + name: "no-op - receiver is module account", malleate: func() { secpAddr = suite.app.AccountKeeper.GetModuleAccount(suite.ctx, "erc20").GetAddress() transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", secpAddrCosmos, secpAddr.String(), "") @@ -248,7 +248,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { malleate: func() { claimsParams := suite.app.ClaimsKeeper.GetParams(suite.ctx) claimsParams.EVMChannels = []string{evmosChannel} - suite.app.ClaimsKeeper.SetParams(suite.ctx, claimsParams) + suite.app.ClaimsKeeper.SetParams(suite.ctx, claimsParams) //nolint:errcheck sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + registeredDenom @@ -362,7 +362,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { if tc.disableERC20 { params := suite.app.Erc20Keeper.GetParams(suite.ctx) params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck } if tc.disableTokenPair { @@ -424,7 +424,7 @@ func (suite *KeeperTestSuite) TestConvertCoinToERC20FromPacket() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + _ = suite.app.Erc20Keeper.SetParams(suite.ctx, params) return transfertypes.NewFungibleTokenPacketData(pair.Denom, "10", senderAddr, "", "") }, expPass: true, diff --git a/x/erc20/keeper/integration_test.go b/x/erc20/keeper/integration_test.go index 240653b270..a4c1e11e36 100644 --- a/x/erc20/keeper/integration_test.go +++ b/x/erc20/keeper/integration_test.go @@ -30,7 +30,8 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableEVMHook = true params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(s.ctx, params) + err := s.app.Erc20Keeper.SetParams(s.ctx, params) + Expect(err).To(BeNil()) }) // Epoch mechanism for triggering allocation and distribution @@ -39,7 +40,7 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableEVMHook = false params.EnableErc20 = false - s.app.Erc20Keeper.SetParams(s.ctx, params) + s.app.Erc20Keeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should be successful", func() { _, err := s.DeployContract("coin", "token", erc20Decimals) @@ -51,7 +52,7 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { BeforeEach(func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableErc20 = false - s.app.Erc20Keeper.SetParams(s.ctx, params) + s.app.Erc20Keeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should be successful", func() { _, err := s.DeployContract("coin", "token", erc20Decimals) @@ -63,7 +64,7 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { BeforeEach(func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableEVMHook = false - s.app.Erc20Keeper.SetParams(s.ctx, params) + s.app.Erc20Keeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should be successful", func() { _, err := s.DeployContract("coin", "token", erc20Decimals) diff --git a/x/erc20/keeper/keeper_test.go b/x/erc20/keeper/keeper_test.go index 2d43df4b60..280a5e4ee6 100644 --- a/x/erc20/keeper/keeper_test.go +++ b/x/erc20/keeper/keeper_test.go @@ -41,7 +41,6 @@ import ( "github.com/evmos/ethermint/tests" "github.com/evmos/ethermint/x/evm/statedb" evm "github.com/evmos/ethermint/x/evm/types" - evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" "github.com/evmos/evmos/v11/app" @@ -68,7 +67,7 @@ type KeeperTestSuite struct { queryClient types.QueryClient address common.Address consAddress sdk.ConsAddress - clientCtx client.Context + clientCtx client.Context //nolint:unused ethSigner ethtypes.Signer validator stakingtypes.Validator signer keyring.Signer @@ -163,7 +162,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { validator, err := stakingtypes.NewValidator(valAddr, privCons.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) @@ -218,7 +218,7 @@ func (suite *KeeperTestSuite) SendAndReceiveMessage(path *ibcgotesting.Path, ori } // Send back coins (from path endpoint B to A). In case of IBC coins need to provide ibcCoinMetadata (//, e.g.: "transfer/channel-0/aevmos") as input parameter. -// We need this to instanciate properly a FungibleTokenPacketData https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-001-coin-source-tracing.md +// We need this to instantiate properly a FungibleTokenPacketData https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-001-coin-source-tracing.md func (suite *KeeperTestSuite) SendBackCoins(path *ibcgotesting.Path, origin *ibcgotesting.TestChain, coin string, amount int64, sender, receiver string, seq uint64, ibcCoinMetadata string) { // Send coin from B to A suite.sendAndReceiveMessage(path, path.EndpointB, path.EndpointA, origin, coin, amount, sender, receiver, seq, ibcCoinMetadata) @@ -256,7 +256,8 @@ func (suite *KeeperTestSuite) SetupIBCTest() { s.app = suite.EvmosChain.App.(*app.Evmos) evmParams := s.app.EvmKeeper.GetParams(s.EvmosChain.GetContext()) evmParams.EvmDenom = "aevmos" - s.app.EvmKeeper.SetParams(s.EvmosChain.GetContext(), evmParams) + err := s.app.EvmKeeper.SetParams(s.EvmosChain.GetContext(), evmParams) + suite.Require().NoError(err) // Increase max gas ibcgotestinghelpers.DefaultGenTxGas = uint64(1000000000) @@ -307,11 +308,13 @@ func (suite *KeeperTestSuite) SetupIBCTest() { claimparams := claimstypes.DefaultParams() claimparams.AirdropStartTime = suite.EvmosChain.GetContext().BlockTime() claimparams.EnableClaims = true - s.app.ClaimsKeeper.SetParams(suite.EvmosChain.GetContext(), claimparams) + err = s.app.ClaimsKeeper.SetParams(suite.EvmosChain.GetContext(), claimparams) + suite.Require().NoError(err) params := types.DefaultParams() params.EnableErc20 = true - s.app.Erc20Keeper.SetParams(suite.EvmosChain.GetContext(), params) + err = s.app.Erc20Keeper.SetParams(suite.EvmosChain.GetContext(), params) + suite.Require().NoError(err) suite.pathOsmosisEvmos = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.EvmosChain) // clientID, connectionID, channelID empty suite.pathCosmosEvmos = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.EvmosChain) @@ -352,7 +355,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return common.Address{}, err } - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -363,7 +366,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) if err != nil { return common.Address{}, err @@ -398,14 +401,14 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return crypto.CreateAddress(suite.address, nonce), nil } -func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol string) common.Address { +func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol string) common.Address { //nolint:dupl ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.ERC20MaliciousDelayedContract.ABI.Pack("", big.NewInt(1000000000000000000)) suite.Require().NoError(err) - data := append(contracts.ERC20MaliciousDelayedContract.Bin, ctorArgs...) + data := append(contracts.ERC20MaliciousDelayedContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -414,7 +417,7 @@ func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) suite.Require().NoError(err) @@ -441,14 +444,14 @@ func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol return crypto.CreateAddress(suite.address, nonce) } -func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name string, symbol string) common.Address { +func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name string, symbol string) common.Address { //nolint:dupl ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.ERC20DirectBalanceManipulationContract.ABI.Pack("", big.NewInt(1000000000000000000)) suite.Require().NoError(err) - data := append(contracts.ERC20DirectBalanceManipulationContract.Bin, ctorArgs...) + data := append(contracts.ERC20DirectBalanceManipulationContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -457,7 +460,7 @@ func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name strin res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) suite.Require().NoError(err) @@ -499,7 +502,7 @@ func (suite *KeeperTestSuite) CommitAndBeginBlockAfter(t time.Duration) { header := suite.ctx.BlockHeader() _ = suite.app.Commit() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, @@ -525,9 +528,9 @@ func (suite *KeeperTestSuite) TransferERC20TokenToModule(contractAddr, from comm return suite.sendTx(contractAddr, from, transferData) } -func (suite *KeeperTestSuite) GrantERC20Token(contractAddr, from, to common.Address, role_string string) *evm.MsgEthereumTx { +func (suite *KeeperTestSuite) GrantERC20Token(contractAddr, from, to common.Address, roleString string) *evm.MsgEthereumTx { // 0xCc508cD0818C85b8b8a1aB4cEEef8d981c8956A6 MINTER_ROLE - role := crypto.Keccak256([]byte(role_string)) + role := crypto.Keccak256([]byte(roleString)) // needs to be an array not a slice var v [32]byte copy(v[:], role) @@ -545,7 +548,7 @@ func (suite *KeeperTestSuite) sendTx(contractAddr, from common.Address, transfer suite.Require().NoError(err) res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) suite.Require().NoError(err) @@ -585,6 +588,9 @@ func (suite *KeeperTestSuite) BalanceOf(contract, account common.Address) interf } unpacked, err := erc20.Unpack("balanceOf", res.Ret) + if err != nil { + return nil + } if len(unpacked) == 0 { return nil } @@ -618,9 +624,9 @@ type MockEVMKeeper struct { mock.Mock } -func (m *MockEVMKeeper) GetParams(ctx sdk.Context) evmtypes.Params { +func (m *MockEVMKeeper) GetParams(ctx sdk.Context) evm.Params { args := m.Called(mock.Anything) - return args.Get(0).(evmtypes.Params) + return args.Get(0).(evm.Params) } func (m *MockEVMKeeper) GetAccountWithoutBalance(ctx sdk.Context, addr common.Address) *statedb.Account { @@ -631,21 +637,21 @@ func (m *MockEVMKeeper) GetAccountWithoutBalance(ctx sdk.Context, addr common.Ad return args.Get(0).(*statedb.Account) } -func (m *MockEVMKeeper) EstimateGas(c context.Context, req *evmtypes.EthCallRequest) (*evmtypes.EstimateGasResponse, error) { +func (m *MockEVMKeeper) EstimateGas(c context.Context, req *evm.EthCallRequest) (*evm.EstimateGasResponse, error) { args := m.Called(mock.Anything, mock.Anything) if args.Get(0) == nil { return nil, args.Error(1) } - return args.Get(0).(*evmtypes.EstimateGasResponse), args.Error(1) + return args.Get(0).(*evm.EstimateGasResponse), args.Error(1) } -func (m *MockEVMKeeper) ApplyMessage(ctx sdk.Context, msg core.Message, tracer vm.EVMLogger, commit bool) (*evmtypes.MsgEthereumTxResponse, error) { +func (m *MockEVMKeeper) ApplyMessage(ctx sdk.Context, msg core.Message, tracer vm.EVMLogger, commit bool) (*evm.MsgEthereumTxResponse, error) { args := m.Called(mock.Anything, mock.Anything, mock.Anything, mock.Anything) if args.Get(0) == nil { return nil, args.Error(1) } - return args.Get(0).(*evmtypes.MsgEthereumTxResponse), args.Error(1) + return args.Get(0).(*evm.MsgEthereumTxResponse), args.Error(1) } var _ types.BankKeeper = &MockBankKeeper{} @@ -713,7 +719,7 @@ func (suite *KeeperTestSuite) DeployContractToChain(name, symbol string, decimal return common.Address{}, err } - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic nonce := s.app.EvmKeeper.GetNonce(s.EvmosChain.GetContext(), from) erc20DeployTx := evm.NewTxContract( diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index 23495d7d21..ee698649ab 100644 --- a/x/erc20/keeper/mint_test.go +++ b/x/erc20/keeper/mint_test.go @@ -26,7 +26,7 @@ func (suite *KeeperTestSuite) TestMintingEnabled() { func() { params := types.DefaultParams() params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck }, false, }, diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index 397abbfc4b..6b0f23e552 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -19,7 +19,7 @@ import ( ) func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { - testCases := []struct { + testCases := []struct { //nolint:dupl name string mint int64 burn int64 @@ -51,10 +51,10 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { 10, 10, func(erc20 common.Address) { - stateDb := suite.StateDB() - ok := stateDb.Suicide(erc20) + stateDB := suite.StateDB() + ok := stateDB.Suicide(erc20) suite.Require().True(ok) - suite.Require().NoError(stateDb.Commit()) + suite.Require().NoError(stateDB.Commit()) }, func() {}, true, @@ -76,7 +76,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { func(common.Address) { params := types.DefaultParams() params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck }, func() {}, false, @@ -89,9 +89,9 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { suite.app.AccountKeeper.RemoveAccount(suite.ctx, acc) }, false, false, }, - { + { //nolint:dupl "fail - force evm fail", 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -108,7 +108,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { }, { "fail - force evm balance error", 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -165,8 +165,10 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { sender, ) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err, tc.name) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err, tc.name) tc.extra() res, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) @@ -223,9 +225,9 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { }, false, }, - { + { //nolint:dupl "fail - force evm fail", 100, 10, 5, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -243,7 +245,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { }, { "fail - force fail second balance", 100, 10, 5, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -321,7 +323,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { false, }, } - for _, tc := range testCases { + for _, tc := range testCases { //nolint:dupl suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.mintFeeCollector = true suite.SetupTest() @@ -332,8 +334,10 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { // Precondition: Convert Coin to ERC20 coins := sdk.NewCoins(sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.mint))) sender := sdk.AccAddress(suite.address.Bytes()) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err, tc.name) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err, tc.name) msg := types.NewMsgConvertCoin( sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.burn)), suite.address, @@ -341,7 +345,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { ) ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err = suite.app.Erc20Keeper.ConvertCoin(ctx, msg) suite.Require().NoError(err, tc.name) suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) @@ -427,10 +431,10 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeERC20() { 10, 10, func(erc20 common.Address) { - stateDb := suite.StateDB() - ok := stateDb.Suicide(erc20) + stateDB := suite.StateDB() + ok := stateDB.Suicide(erc20) suite.Require().True(ok) - suite.Require().NoError(stateDb.Commit()) + suite.Require().NoError(stateDB.Commit()) }, func() {}, contractMinterBurner, @@ -454,7 +458,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeERC20() { func(common.Address) { params := types.DefaultParams() params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck }, func() {}, contractMinterBurner, @@ -510,7 +514,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeERC20() { 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -533,7 +537,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeERC20() { 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -557,7 +561,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeERC20() { 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -792,12 +796,12 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { contractMinterBurner, false, }, - { + { //nolint:dupl "fail - force evm fail", 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -819,7 +823,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -841,7 +845,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -895,8 +899,10 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { sender := sdk.AccAddress(suite.address.Bytes()) // Precondition: Mint Coins to convert on sender account - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) cosmosBalance := suite.app.BankKeeper.GetBalance(suite.ctx, sender, coinName) suite.Require().Equal(sdk.NewInt(tc.mint), cosmosBalance.Amount) @@ -959,8 +965,10 @@ func (suite *KeeperTestSuite) TestWrongPairOwnerERC20NativeCoin() { // Precondition: Convert Coin to ERC20 coins := sdk.NewCoins(sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.mint))) sender := sdk.AccAddress(suite.address.Bytes()) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err) msg := types.NewMsgConvertCoin( sdk.NewCoin(cosmosTokenBase, sdk.NewInt(tc.burn)), suite.address, @@ -971,7 +979,7 @@ func (suite *KeeperTestSuite) TestWrongPairOwnerERC20NativeCoin() { suite.app.Erc20Keeper.SetTokenPair(suite.ctx, *pair) ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err = suite.app.Erc20Keeper.ConvertCoin(ctx, msg) suite.Require().Error(err, tc.name) // Convert ERC20s back to Coins @@ -991,7 +999,7 @@ func (suite *KeeperTestSuite) TestWrongPairOwnerERC20NativeCoin() { } func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { - testCases := []struct { + testCases := []struct { //nolint:dupl name string mint int64 burn int64 @@ -1023,10 +1031,10 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { 10, 10, func(erc20 common.Address) { - stateDb := suite.StateDB() - ok := stateDb.Suicide(erc20) + stateDB := suite.StateDB() + ok := stateDB.Suicide(erc20) suite.Require().True(ok) - suite.Require().NoError(stateDb.Commit()) + suite.Require().NoError(stateDB.Commit()) }, func() {}, true, @@ -1048,7 +1056,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { func(common.Address) { params := types.DefaultParams() params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck }, func() {}, false, @@ -1061,9 +1069,9 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { suite.app.AccountKeeper.RemoveAccount(suite.ctx, acc) }, false, false, }, - { + { //nolint:dupl "fail - force evm fail", 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -1080,7 +1088,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { }, { "fail - force evm balance error", 100, 10, func(common.Address) {}, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -1137,7 +1145,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { sender, ) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) //nolint:errcheck suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) tc.extra() @@ -1195,9 +1203,9 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { }, false, }, - { + { //nolint:dupl "fail - force evm fail", 100, 10, 5, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -1215,7 +1223,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { }, { "fail - force fail second balance", 100, 10, 5, - func() { + func() { //nolint:dupl mockEVMKeeper := &MockEVMKeeper{} suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey("erc20"), suite.app.AppCodec(), @@ -1294,7 +1302,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { false, }, } - for _, tc := range testCases { + for _, tc := range testCases { //nolint:dupl suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.mintFeeCollector = true suite.SetupTest() @@ -1305,8 +1313,10 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { // Precondition: Convert Coin to ERC20 coins := sdk.NewCoins(sdk.NewCoin(ibcBase, sdk.NewInt(tc.mint))) sender := sdk.AccAddress(suite.address.Bytes()) - suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) - suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + err := suite.app.BankKeeper.MintCoins(suite.ctx, types.ModuleName, coins) + suite.Require().NoError(err, tc.name) + err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) + suite.Require().NoError(err, tc.name) msg := types.NewMsgConvertCoin( sdk.NewCoin(ibcBase, sdk.NewInt(tc.burn)), suite.address, @@ -1314,7 +1324,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { ) ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err = suite.app.Erc20Keeper.ConvertCoin(ctx, msg) suite.Require().NoError(err, tc.name) suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) diff --git a/x/erc20/keeper/params_test.go b/x/erc20/keeper/params_test.go index 765cdd7eb5..ee0bbb5df5 100644 --- a/x/erc20/keeper/params_test.go +++ b/x/erc20/keeper/params_test.go @@ -8,7 +8,7 @@ import ( func (suite *KeeperTestSuite) TestParams() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck testCases := []struct { name string diff --git a/x/erc20/keeper/proposals_test.go b/x/erc20/keeper/proposals_test.go index e6a4fe57ef..92d892c161 100644 --- a/x/erc20/keeper/proposals_test.go +++ b/x/erc20/keeper/proposals_test.go @@ -103,7 +103,7 @@ func (suite *KeeperTestSuite) setupRegisterCoin(metadata banktypes.Metadata) *ty return pair } -func (suite KeeperTestSuite) TestRegisterCoin() { +func (suite KeeperTestSuite) TestRegisterCoin() { //nolint:govet // we can copy locks here because it is a test metadata := banktypes.Metadata{ Description: "description", Base: cosmosTokenBase, @@ -133,7 +133,7 @@ func (suite KeeperTestSuite) TestRegisterCoin() { func() { params := types.DefaultParams() params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.app.Erc20Keeper.SetParams(suite.ctx, params) //nolint:errcheck }, false, }, @@ -248,7 +248,7 @@ func (suite KeeperTestSuite) TestRegisterCoin() { } } -func (suite KeeperTestSuite) TestRegisterERC20() { +func (suite KeeperTestSuite) TestRegisterERC20() { //nolint:govet // we can copy locks here because it is a test var ( contractAddr common.Address pair types.TokenPair @@ -275,7 +275,7 @@ func (suite KeeperTestSuite) TestRegisterERC20() { { "meta data already stored", func() { - suite.app.Erc20Keeper.CreateCoinMetadata(suite.ctx, contractAddr) + suite.app.Erc20Keeper.CreateCoinMetadata(suite.ctx, contractAddr) //nolint:errcheck }, false, }, @@ -326,7 +326,7 @@ func (suite KeeperTestSuite) TestRegisterERC20() { // Denom units suite.Require().Equal(len(metadata.DenomUnits), 2) suite.Require().Equal(coinName, metadata.DenomUnits[0].Denom) - suite.Require().Equal(uint32(zeroExponent), metadata.DenomUnits[0].Exponent) + suite.Require().Equal(zeroExponent, metadata.DenomUnits[0].Exponent) suite.Require().Equal(types.SanitizeERC20Name(erc20Name), metadata.DenomUnits[1].Denom) // Custom exponent at contract creation matches coin with token suite.Require().Equal(metadata.DenomUnits[1].Exponent, uint32(cosmosDecimals)) @@ -337,7 +337,7 @@ func (suite KeeperTestSuite) TestRegisterERC20() { } } -func (suite KeeperTestSuite) TestToggleConverision() { +func (suite KeeperTestSuite) TestToggleConverision() { //nolint:govet // we can copy locks here because it is a test var ( contractAddr common.Address id []byte diff --git a/x/erc20/keeper/token_pairs_test.go b/x/erc20/keeper/token_pairs_test.go index 453ebba894..565dac5d79 100644 --- a/x/erc20/keeper/token_pairs_test.go +++ b/x/erc20/keeper/token_pairs_test.go @@ -60,7 +60,7 @@ func (suite *KeeperTestSuite) TestGetTokenPairID() { testCases := []struct { name string token string - expId []byte + expID []byte }{ {"nil token", "", nil}, {"valid hex token", tests.GenerateAddress().Hex(), []byte{}}, @@ -69,7 +69,7 @@ func (suite *KeeperTestSuite) TestGetTokenPairID() { for _, tc := range testCases { id := suite.app.Erc20Keeper.GetTokenPairID(suite.ctx, tc.token) if id != nil { - suite.Require().Equal(tc.expId, id, tc.name) + suite.Require().Equal(tc.expID, id, tc.name) } else { suite.Require().Nil(id) } diff --git a/x/erc20/migrations/v3/migration_test.go b/x/erc20/migrations/v3/migration_test.go index 973cae2b4b..3b81a01c31 100644 --- a/x/erc20/migrations/v3/migration_test.go +++ b/x/erc20/migrations/v3/migration_test.go @@ -1,11 +1,12 @@ package v3_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/evmos/ethermint/encoding" "github.com/evmos/evmos/v11/app" - "testing" v3types "github.com/evmos/evmos/v11/x/erc20/migrations/v3/types" diff --git a/x/erc20/types/evm_test.go b/x/erc20/types/evm_test.go index 83605b6d06..8fd2aef846 100644 --- a/x/erc20/types/evm_test.go +++ b/x/erc20/types/evm_test.go @@ -8,6 +8,6 @@ import ( func TestNewERC20Data(t *testing.T) { data := NewERC20Data("test", "ERC20", uint8(18)) - exp := ERC20Data(ERC20Data{Name: "test", Symbol: "ERC20", Decimals: 0x12}) + exp := ERC20Data{Name: "test", Symbol: "ERC20", Decimals: 0x12} require.Equal(t, exp, data) } diff --git a/x/erc20/types/msg.go b/x/erc20/types/msg.go index 1e99c940d6..a85770e175 100644 --- a/x/erc20/types/msg.go +++ b/x/erc20/types/msg.go @@ -38,7 +38,7 @@ const ( ) // NewMsgConvertCoin creates a new instance of MsgConvertCoin -func NewMsgConvertCoin(coin sdk.Coin, receiver common.Address, sender sdk.AccAddress) *MsgConvertCoin { // nolint: interfacer +func NewMsgConvertCoin(coin sdk.Coin, receiver common.Address, sender sdk.AccAddress) *MsgConvertCoin { //nolint: interfacer return &MsgConvertCoin{ Coin: coin, Receiver: receiver.Hex(), @@ -85,7 +85,7 @@ func (msg MsgConvertCoin) GetSigners() []sdk.AccAddress { } // NewMsgConvertERC20 creates a new instance of MsgConvertERC20 -func NewMsgConvertERC20(amount math.Int, receiver sdk.AccAddress, contract, sender common.Address) *MsgConvertERC20 { // nolint: interfacer +func NewMsgConvertERC20(amount math.Int, receiver sdk.AccAddress, contract, sender common.Address) *MsgConvertERC20 { //nolint: interfacer return &MsgConvertERC20{ ContractAddress: contract.String(), Amount: amount, diff --git a/x/erc20/types/proposal_test.go b/x/erc20/types/proposal_test.go index 41fa4c2f63..07fd18c7bc 100644 --- a/x/erc20/types/proposal_test.go +++ b/x/erc20/types/proposal_test.go @@ -172,7 +172,7 @@ func createFullMetadata(denom, symbol, name string) banktypes.Metadata { } } -func createMetadata(denom, symbol string) banktypes.Metadata { +func createMetadata(denom, symbol string) banktypes.Metadata { //nolint:unparam return createFullMetadata(denom, symbol, denom) } @@ -249,7 +249,7 @@ func (suite *ProposalTestSuite) TestToggleTokenConversionProposal() { expectPass bool }{ {msg: "Enable token conversion proposal - valid denom", title: "test", description: "test desc", token: "test", expectPass: true}, - {msg: "Enable token conversion proposal - valid address", title: "test", description: "test desc", token: "0x5dCA2483280D9727c80b5518faC4556617fb194F", expectPass: true}, + {msg: "Enable token conversion proposal - valid address", title: "test", description: "test desc", token: "0x5dCA2483280D9727c80b5518faC4556617fb194F", expectPass: true}, //gitleaks:allow {msg: "Enable token conversion proposal - invalid address", title: "test", description: "test desc", token: "0x123", expectPass: false}, // Invalid missing params diff --git a/x/ibc/transfer/keeper/keeper_test.go b/x/ibc/transfer/keeper/keeper_test.go index 33b5e0a489..a4809cc1f6 100644 --- a/x/ibc/transfer/keeper/keeper_test.go +++ b/x/ibc/transfer/keeper/keeper_test.go @@ -58,7 +58,7 @@ type KeeperTestSuite struct { queryClient types.QueryClient address common.Address consAddress sdk.ConsAddress - clientCtx client.Context + clientCtx client.Context //nolint:unused ethSigner ethtypes.Signer validator stakingtypes.Validator signer keyring.Signer @@ -140,7 +140,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { validator, err := stakingtypes.NewValidator(valAddr, privCons.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) @@ -184,7 +185,7 @@ func (suite *KeeperTestSuite) CommitAndBeginBlockAfter(t time.Duration) { header := suite.ctx.BlockHeader() _ = suite.app.Commit() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, @@ -251,7 +252,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return common.Address{}, err } - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -262,7 +263,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) if err != nil { return common.Address{}, err @@ -311,7 +312,7 @@ func (suite *KeeperTestSuite) sendTx(contractAddr, from common.Address, transfer suite.Require().NoError(err) res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) suite.Require().NoError(err) diff --git a/x/ibc/transfer/keeper/msg_server_test.go b/x/ibc/transfer/keeper/msg_server_test.go index a91863e7c9..81d2f1a88f 100644 --- a/x/ibc/transfer/keeper/msg_server_test.go +++ b/x/ibc/transfer/keeper/msg_server_test.go @@ -85,7 +85,8 @@ func (suite *KeeperTestSuite) TestTransfer() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + err = suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.Commit() transferMsg := types.NewMsgTransfer("transfer", "channel-0", sdk.NewCoin(pair.Denom, sdk.NewInt(10)), senderAcc.String(), "", timeoutHeight, 0, "") @@ -111,7 +112,8 @@ func (suite *KeeperTestSuite) TestTransfer() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) params.EnableErc20 = false - suite.app.Erc20Keeper.SetParams(suite.ctx, params) + err = suite.app.Erc20Keeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) suite.Commit() transferMsg := types.NewMsgTransfer("transfer", "channel-0", sdk.NewCoin(pair.Denom, sdk.NewInt(10)), senderAcc.String(), "", timeoutHeight, 0, "") @@ -157,7 +159,7 @@ func (suite *KeeperTestSuite) TestTransfer() { senderAcc := sdk.AccAddress(suite.address.Bytes()) transferMsg := types.NewMsgTransfer("transfer", "channel-0", coin, senderAcc.String(), "", timeoutHeight, 0, "") - // mint coins to perform the regular transfer without converison + // mint coins to perform the regular transfer without conversions err = suite.app.BankKeeper.MintCoins(suite.ctx, erc20types.ModuleName, sdk.NewCoins(coin)) suite.Require().NoError(err) diff --git a/x/incentives/keeper/evm_hooks_test.go b/x/incentives/keeper/evm_hooks_test.go index a510c95681..0da3734db0 100644 --- a/x/incentives/keeper/evm_hooks_test.go +++ b/x/incentives/keeper/evm_hooks_test.go @@ -43,7 +43,7 @@ func (suite *KeeperTestSuite) TestEvmHooksStoreTxGasUsed() { func(_ common.Address) { params := types.DefaultParams() params.EnableIncentives = false - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.app.IncentivesKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, false, }, diff --git a/x/incentives/keeper/integration_test.go b/x/incentives/keeper/integration_test.go index c4a5bead8b..f7678c8d30 100644 --- a/x/incentives/keeper/integration_test.go +++ b/x/incentives/keeper/integration_test.go @@ -24,7 +24,7 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableEVMHook = false - s.app.Erc20Keeper.SetParams(s.ctx, params) + s.app.Erc20Keeper.SetParams(s.ctx, params) //nolint:errcheck }) // Epoch mechanism for triggering allocation and distribution @@ -39,7 +39,8 @@ var _ = Describe("Performing EVM transactions", Ordered, func() { BeforeEach(func() { params := s.app.Erc20Keeper.GetParams(s.ctx) params.EnableEVMHook = true - s.app.Erc20Keeper.SetParams(s.ctx, params) + err := s.app.Erc20Keeper.SetParams(s.ctx, params) + Expect(err).To(BeNil()) }) It("should be successful", func() { _, err := s.DeployContract("coin", "token", erc20Decimals) @@ -62,7 +63,8 @@ var _ = Describe("Distribution", Ordered, func() { // Enable Inflation params := s.app.InflationKeeper.GetParams(s.ctx) params.EnableInflation = true - s.app.InflationKeeper.SetParams(s.ctx, params) + err := s.app.InflationKeeper.SetParams(s.ctx, params) + s.Require().NoError(err) // set a EOA account for the address eoa := ðermint.EthAccount{ @@ -83,7 +85,7 @@ var _ = Describe("Distribution", Ordered, func() { moduleAcc = s.app.AccountKeeper.GetModuleAddress(types.ModuleName) participantAcc = acc.GetAddress() // Create incentive - _, err := s.app.IncentivesKeeper.RegisterIncentive( + _, err = s.app.IncentivesKeeper.RegisterIncentive( s.ctx, contractAddr, mintAllocations, @@ -105,7 +107,7 @@ var _ = Describe("Distribution", Ordered, func() { }) // Epoch mechanism for triggering allocation and distribution - Describe("Commiting a block", func() { + Describe("Committing a block", func() { Context("before a weekly epoch ends", func() { BeforeEach(func() { s.CommitAfter(time.Minute) // Start Epoch diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 1be34da3d2..3f1b5dd605 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -173,7 +173,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { validator, err := stakingtypes.NewValidator(valAddr, priv.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) @@ -195,7 +196,7 @@ func (suite *KeeperTestSuite) Commit() { func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { _ = suite.app.Commit() header := suite.ctx.BlockHeader() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, @@ -228,7 +229,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return common.Address{}, err } - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -239,7 +240,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) if err != nil { return common.Address{}, err @@ -300,10 +301,10 @@ func (suite *KeeperTestSuite) BurnERC20Token( func (suite *KeeperTestSuite) GrantERC20Token( contractAddr, from, to common.Address, - role_string string, + roleString string, ) *evm.MsgEthereumTx { // 0xCc508cD0818C85b8b8a1aB4cEEef8d981c8956A6 MINTER_ROLE - role := crypto.Keccak256([]byte(role_string)) + role := crypto.Keccak256([]byte(roleString)) // needs to be an array not a slice var v [32]byte copy(v[:], role) @@ -338,7 +339,7 @@ func (suite *KeeperTestSuite) sendTx( res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) suite.Require().NoError(err) diff --git a/x/incentives/keeper/params_test.go b/x/incentives/keeper/params_test.go index 3a9aff1322..afc87b660e 100644 --- a/x/incentives/keeper/params_test.go +++ b/x/incentives/keeper/params_test.go @@ -6,7 +6,8 @@ func (suite *KeeperTestSuite) TestParams() { params := suite.app.IncentivesKeeper.GetParams(suite.ctx) suite.Require().Equal(types.DefaultParams(), params) params.EnableIncentives = false - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + err := suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) newParams := suite.app.IncentivesKeeper.GetParams(suite.ctx) suite.Require().Equal(newParams, params) } diff --git a/x/incentives/keeper/proposals_test.go b/x/incentives/keeper/proposals_test.go index c67ca57533..337ff3af45 100644 --- a/x/incentives/keeper/proposals_test.go +++ b/x/incentives/keeper/proposals_test.go @@ -9,7 +9,7 @@ import ( "github.com/evmos/evmos/v11/x/incentives/types" ) -func (suite KeeperTestSuite) TestRegisterIncentive() { +func (suite KeeperTestSuite) TestRegisterIncentive() { //nolint:govet // we can copy locks here because it is a test testCases := []struct { name string malleate func() @@ -21,7 +21,7 @@ func (suite KeeperTestSuite) TestRegisterIncentive() { func() { params := types.DefaultParams() params.EnableIncentives = false - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.app.IncentivesKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, []sdk.DecCoin{}, false, @@ -65,7 +65,7 @@ func (suite KeeperTestSuite) TestRegisterIncentive() { // decrease allocation limit params := types.DefaultParams() params.AllocationLimit = sdk.NewDecWithPrec(1, 2) - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.app.IncentivesKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, []sdk.DecCoin{}, false, @@ -84,7 +84,8 @@ func (suite KeeperTestSuite) TestRegisterIncentive() { // increase allocation limit params := types.DefaultParams() params.AllocationLimit = sdk.NewDecWithPrec(100, 2) - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + err = suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) // Add incentive which takes up 100% of the allocation _, err = suite.app.IncentivesKeeper.RegisterIncentive( @@ -150,7 +151,7 @@ func (suite KeeperTestSuite) TestRegisterIncentive() { } } -func (suite KeeperTestSuite) TestCancelIncentive() { +func (suite KeeperTestSuite) TestCancelIncentive() { //nolint:govet // we can copy locks here because it is a test testCases := []struct { name string malleate func() @@ -162,7 +163,7 @@ func (suite KeeperTestSuite) TestCancelIncentive() { func() { params := types.DefaultParams() params.EnableIncentives = false - suite.app.IncentivesKeeper.SetParams(suite.ctx, params) + suite.app.IncentivesKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, []sdk.DecCoin{}, false, diff --git a/x/incentives/migrations/v2/migrate_test.go b/x/incentives/migrations/v2/migrate_test.go index 65c4d483b8..1c5c07d341 100644 --- a/x/incentives/migrations/v2/migrate_test.go +++ b/x/incentives/migrations/v2/migrate_test.go @@ -1,9 +1,10 @@ package v2_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "testing" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/inflation/keeper/grpc_query_test.go b/x/inflation/keeper/grpc_query_test.go index 6fb4cfe6d0..d163bfdb1a 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -9,7 +9,7 @@ import ( "github.com/evmos/evmos/v11/x/inflation/types" ) -func (suite *KeeperTestSuite) TestPeriod() { +func (suite *KeeperTestSuite) TestPeriod() { //nolint:dupl var ( req *types.QueryPeriodRequest expRes *types.QueryPeriodResponse @@ -106,7 +106,7 @@ func (suite *KeeperTestSuite) TestEpochMintProvision() { } } -func (suite *KeeperTestSuite) TestSkippedEpochs() { +func (suite *KeeperTestSuite) TestSkippedEpochs() { //nolint:dupl var ( req *types.QuerySkippedEpochsRequest expRes *types.QuerySkippedEpochsResponse diff --git a/x/inflation/keeper/hooks_test.go b/x/inflation/keeper/hooks_test.go index 54e1b9e650..3cb17191f6 100644 --- a/x/inflation/keeper/hooks_test.go +++ b/x/inflation/keeper/hooks_test.go @@ -31,7 +31,8 @@ func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() { params := suite.app.InflationKeeper.GetParams(suite.ctx) params.EnableInflation = true - suite.app.InflationKeeper.SetParams(suite.ctx, params) + err := suite.app.InflationKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) futureCtx := suite.ctx.WithBlockTime(time.Now().Add(time.Hour)) newHeight := suite.app.LastBlockHeight() + 1 @@ -186,12 +187,14 @@ func (suite *KeeperTestSuite) TestPeriodChangesSkippedEpochsAfterEpochEnd() { params := suite.app.InflationKeeper.GetParams(suite.ctx) params.EnableInflation = true - suite.app.InflationKeeper.SetParams(suite.ctx, params) + err := suite.app.InflationKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) // Before hook if !tc.enableInflation { params.EnableInflation = false - suite.app.InflationKeeper.SetParams(suite.ctx, params) + err = suite.app.InflationKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) } suite.app.InflationKeeper.SetSkippedEpochs(suite.ctx, tc.skippedEpochs) diff --git a/x/inflation/keeper/integration_test.go b/x/inflation/keeper/integration_test.go index 9caa5f83cc..f3fc4ad688 100644 --- a/x/inflation/keeper/integration_test.go +++ b/x/inflation/keeper/integration_test.go @@ -2,9 +2,10 @@ package keeper_test import ( "fmt" - "github.com/evmos/evmos/v11/x/inflation/types" "time" + "github.com/evmos/evmos/v11/x/inflation/types" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -17,7 +18,6 @@ var ( epochNumber int64 skipped uint64 provision sdk.Dec - found bool ) var _ = Describe("Inflation", Ordered, func() { @@ -39,7 +39,7 @@ var _ = Describe("Inflation", Ordered, func() { BondingTarget: sdk.NewDecWithPrec(66, 2), // 66% MaxVariance: sdk.ZeroDec(), // 0% } - s.app.InflationKeeper.SetParams(s.ctx, params) + _ = s.app.InflationKeeper.SetParams(s.ctx, params) }) Context("before an epoch ends", func() { @@ -58,7 +58,7 @@ var _ = Describe("Inflation", Ordered, func() { }) }) - Context("after an epoch ends", func() { + Context("after an epoch ends", func() { //nolint:dupl BeforeEach(func() { s.CommitAfter(time.Minute) // Start Epoch s.CommitAfter(time.Hour * 25) // End Epoch @@ -99,7 +99,7 @@ var _ = Describe("Inflation", Ordered, func() { StakingRewards: sdk.NewDecWithPrec(333333333, 9), // 0.33 = 25% / (1 - 25%) CommunityPool: sdk.NewDecWithPrec(133333333, 9), // 0.13 = 10% / (1 - 25%) } - s.app.InflationKeeper.SetParams(s.ctx, params) + _ = s.app.InflationKeeper.SetParams(s.ctx, params) }) Context("before an epoch ends", func() { @@ -119,7 +119,7 @@ var _ = Describe("Inflation", Ordered, func() { }) }) - Context("after an epoch ends", func() { + Context("after an epoch ends", func() { //nolint:dupl BeforeEach(func() { s.CommitAfter(time.Minute) // Start Epoch s.CommitAfter(time.Hour * 25) // End Epoch @@ -155,7 +155,7 @@ var _ = Describe("Inflation", Ordered, func() { BeforeEach(func() { params := s.app.InflationKeeper.GetParams(s.ctx) params.EnableInflation = true - s.app.InflationKeeper.SetParams(s.ctx, params) + s.app.InflationKeeper.SetParams(s.ctx, params) //nolint:errcheck }) Context("before an epoch ends", func() { @@ -174,7 +174,7 @@ var _ = Describe("Inflation", Ordered, func() { }) }) - Context("after an epoch ends", func() { + Context("after an epoch ends", func() { //nolint:dupl BeforeEach(func() { s.CommitAfter(time.Minute) // Start Epoch s.CommitAfter(time.Hour * 25) // End Epoch @@ -209,7 +209,7 @@ var _ = Describe("Inflation", Ordered, func() { BeforeEach(func() { params := s.app.InflationKeeper.GetParams(s.ctx) params.EnableInflation = false - s.app.InflationKeeper.SetParams(s.ctx, params) + s.app.InflationKeeper.SetParams(s.ctx, params) //nolint:errcheck }) Context("after the network was offline for several days/epochs", func() { @@ -273,7 +273,7 @@ var _ = Describe("Inflation", Ordered, func() { BeforeEach(func() { params := s.app.InflationKeeper.GetParams(s.ctx) params.EnableInflation = true - s.app.InflationKeeper.SetParams(s.ctx, params) + s.app.InflationKeeper.SetParams(s.ctx, params) //nolint:errcheck epochInfo, _ := s.app.EpochsKeeper.GetEpochInfo(s.ctx, epochstypes.DayEpochID) epochNumber := epochInfo.CurrentEpoch // 6 diff --git a/x/inflation/keeper/keeper_test.go b/x/inflation/keeper/keeper_test.go index 86766a62b7..a3d86d22a0 100644 --- a/x/inflation/keeper/keeper_test.go +++ b/x/inflation/keeper/keeper_test.go @@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) Commit() { func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { _ = suite.app.Commit() header := suite.ctx.BlockHeader() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, diff --git a/x/inflation/migrations/v2/migrate_test.go b/x/inflation/migrations/v2/migrate_test.go index 87b90f1634..89a0fa0b08 100644 --- a/x/inflation/migrations/v2/migrate_test.go +++ b/x/inflation/migrations/v2/migrate_test.go @@ -1,9 +1,10 @@ package v2_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "testing" v2 "github.com/evmos/evmos/v11/x/inflation/migrations/v2" "github.com/evmos/evmos/v11/x/inflation/types" diff --git a/x/inflation/migrations/v3/migrate_test.go b/x/inflation/migrations/v3/migrate_test.go index 058c2516bc..61516043e0 100644 --- a/x/inflation/migrations/v3/migrate_test.go +++ b/x/inflation/migrations/v3/migrate_test.go @@ -1,12 +1,13 @@ package v3_test import ( + "testing" + "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" v3 "github.com/evmos/evmos/v11/x/inflation/migrations/v3" "github.com/evmos/evmos/v11/x/inflation/types" "github.com/stretchr/testify/require" - "testing" ) func TestMigrate(t *testing.T) { @@ -23,5 +24,4 @@ func TestMigrate(t *testing.T) { epochMintProvision = store.Get(v3.KeyPrefixEpochMintProvision) require.Equal(t, len(epochMintProvision), 0) - } diff --git a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go index 34adfaa917..0a5d0431f4 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go @@ -86,11 +86,13 @@ func (suite *IBCTestingSuite) SetupTest() { claimparams := claimstypes.DefaultParams() claimparams.AirdropStartTime = suite.EvmosChain.GetContext().BlockTime() claimparams.EnableClaims = true - suite.EvmosChain.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.EvmosChain.GetContext(), claimparams) + err = suite.EvmosChain.App.(*app.Evmos).ClaimsKeeper.SetParams(suite.EvmosChain.GetContext(), claimparams) + suite.Require().NoError(err) params := types.DefaultParams() params.EnableRecovery = true - suite.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(suite.EvmosChain.GetContext(), params) + err = suite.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(suite.EvmosChain.GetContext(), params) + suite.Require().NoError(err) suite.pathOsmosisEvmos = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.EvmosChain) // clientID, connectionID, channelID empty suite.pathCosmosEvmos = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.EvmosChain) diff --git a/x/recovery/keeper/ibc_callbacks_integration_test.go b/x/recovery/keeper/ibc_callbacks_integration_test.go index 831698c0b6..a0d99e8121 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_test.go @@ -36,7 +36,8 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := claimstypes.DefaultParams() params.AuthorizedChannels = []string{} - s.EvmosChain.App.(*app.Evmos).ClaimsKeeper.SetParams(s.EvmosChain.GetContext(), params) + err := s.EvmosChain.App.(*app.Evmos).ClaimsKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() receiver = s.EvmosChain.SenderAccount.GetAddress().String() @@ -84,7 +85,7 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) //nolint:errcheck }) It("should not transfer or recover tokens", func() { @@ -214,13 +215,13 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) //nolint:errcheck // Send uatom from Cosmos to Evmos s.SendAndReceiveMessage(s.pathCosmosEvmos, s.IBCCosmosChain, coinAtom.Denom, coinAtom.Amount.Int64(), s.IBCCosmosChain.SenderAccount.GetAddress().String(), receiver, 1) params.EnableRecovery = true - s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) //nolint:errcheck }) It("should not recover tokens that originated from other chains", func() { // Send uosmo from Osmosis to Evmos @@ -277,13 +278,13 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) - + err := s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.Require().NoError(err) s.SendAndReceiveMessage(s.pathOsmosisCosmos, s.IBCCosmosChain, coinAtom.Denom, coinAtom.Amount.Int64(), s.IBCCosmosChain.SenderAccount.GetAddress().String(), receiver, 1) // Send IBC transaction of 10 ibc/uatom transferMsg := transfertypes.NewMsgTransfer(s.pathOsmosisEvmos.EndpointA.ChannelConfig.PortID, s.pathOsmosisEvmos.EndpointA.ChannelID, sdk.NewCoin(teststypes.UatomIbcdenom, sdk.NewInt(10)), sender, receiver, timeoutHeight, 0, "") - _, err := s.IBCOsmosisChain.SendMsgs(transferMsg) + _, err = s.IBCOsmosisChain.SendMsgs(transferMsg) s.Require().NoError(err) // message committed transfer := transfertypes.NewFungibleTokenPacketData("transfer/channel-1/uatom", "10", sender, receiver, "") packet := channeltypes.NewPacket(transfer.GetBytes(), 1, s.pathOsmosisEvmos.EndpointA.ChannelConfig.PortID, s.pathOsmosisEvmos.EndpointA.ChannelID, s.pathOsmosisEvmos.EndpointB.ChannelConfig.PortID, s.pathOsmosisEvmos.EndpointB.ChannelID, timeoutHeight, 0) @@ -296,7 +297,7 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { s.Require().Equal(osmoIBCAtom.Amount, coinAtom.Amount) params.EnableRecovery = true - s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) + s.EvmosChain.App.(*app.Evmos).RecoveryKeeper.SetParams(s.EvmosChain.GetContext(), params) //nolint:errcheck }) It("should not recover tokens that originated from other chains", func() { s.SendAndReceiveMessage(s.pathOsmosisEvmos, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 2) diff --git a/x/recovery/keeper/ibc_callbacks_test.go b/x/recovery/keeper/ibc_callbacks_test.go index 1ff31a9228..32ffbd4ca5 100644 --- a/x/recovery/keeper/ibc_callbacks_test.go +++ b/x/recovery/keeper/ibc_callbacks_test.go @@ -71,7 +71,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { params := suite.app.RecoveryKeeper.GetParams(suite.ctx) params.EnableRecovery = false - suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + suite.app.RecoveryKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, true, false, @@ -284,7 +284,8 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { // Enable Recovery params := suite.app.RecoveryKeeper.GetParams(suite.ctx) params.EnableRecovery = true - suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + err := suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) tc.malleate() @@ -308,7 +309,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, transfertypes.PortID, evmosChannel, 1) // Mock the Transferkeeper to always return nil on SendTransfer(), as this - // method requires a successfull handshake with the counterparty chain. + // method requires a successful handshake with the counterparty chain. // This, however, exceeds the requirements of the unit tests. mockTransferKeeper := &MockTransferKeeper{ Keeper: suite.app.BankKeeper, @@ -324,7 +325,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.IBCKeeper.ChannelKeeper, mockTransferKeeper, suite.app.ClaimsKeeper) // Fund receiver account with EVMOS, ERC20 coins and IBC vouchers - err := testutil.FundAccount(suite.ctx, suite.app.BankKeeper, secpAddr, coins) + err = testutil.FundAccount(suite.ctx, suite.app.BankKeeper, secpAddr, coins) suite.Require().NoError(err) // Perform IBC callback @@ -564,7 +565,8 @@ func (suite *KeeperTestSuite) TestOnRecvPacketFailTransfer() { // Enable Recovery params := suite.app.RecoveryKeeper.GetParams(suite.ctx) params.EnableRecovery = true - suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + err := suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpAddrEvmos, "") packet := channeltypes.NewPacket(transfer.GetBytes(), 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evmosChannel, timeoutHeight, 0) @@ -586,7 +588,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacketFailTransfer() { sdk.NewCoin("aevmos", sdk.NewInt(1000)), sdk.NewCoin(ibcAtomDenom, sdk.NewInt(1000)), ) - err := testutil.FundAccount(suite.ctx, suite.app.BankKeeper, secpAddr, coins) + err = testutil.FundAccount(suite.ctx, suite.app.BankKeeper, secpAddr, coins) suite.Require().NoError(err) // Perform IBC callback diff --git a/x/recovery/keeper/keeper_test.go b/x/recovery/keeper/keeper_test.go index bff07062c1..da0ea7646e 100644 --- a/x/recovery/keeper/keeper_test.go +++ b/x/recovery/keeper/keeper_test.go @@ -73,7 +73,8 @@ func (suite *KeeperTestSuite) SetupTest() { claimsParams := claimstypes.DefaultParams() claimsParams.AirdropStartTime = suite.ctx.BlockTime() - suite.app.ClaimsKeeper.SetParams(suite.ctx, claimsParams) + err := suite.app.ClaimsKeeper.SetParams(suite.ctx, claimsParams) + suite.Require().NoError(err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) stakingParams.BondDenom = claimsParams.GetClaimsDenom() diff --git a/x/recovery/keeper/params_test.go b/x/recovery/keeper/params_test.go index 9cd9e270c1..a9a36185a4 100644 --- a/x/recovery/keeper/params_test.go +++ b/x/recovery/keeper/params_test.go @@ -3,7 +3,8 @@ package keeper_test func (suite *KeeperTestSuite) TestParams() { params := suite.app.RecoveryKeeper.GetParams(suite.ctx) params.EnableRecovery = false - suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + err := suite.app.RecoveryKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) newParams := suite.app.RecoveryKeeper.GetParams(suite.ctx) suite.Require().Equal(newParams, params) } diff --git a/x/recovery/migrations/v2/migrate_test.go b/x/recovery/migrations/v2/migrate_test.go index 6b5361ac0b..211e072fdd 100644 --- a/x/recovery/migrations/v2/migrate_test.go +++ b/x/recovery/migrations/v2/migrate_test.go @@ -1,9 +1,10 @@ package v2_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "testing" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/revenue/keeper/grpc_query.go b/x/revenue/keeper/grpc_query.go index 5c75c17abc..031d17fcb1 100644 --- a/x/revenue/keeper/grpc_query.go +++ b/x/revenue/keeper/grpc_query.go @@ -116,7 +116,7 @@ func (k Keeper) Params( // DeployerRevenues returns all contracts that have been registered for fee // distribution by a given deployer -func (k Keeper) DeployerRevenues( // nolint: dupl +func (k Keeper) DeployerRevenues( //nolint: dupl c context.Context, req *types.QueryDeployerRevenuesRequest, ) (*types.QueryDeployerRevenuesResponse, error) { @@ -162,7 +162,7 @@ func (k Keeper) DeployerRevenues( // nolint: dupl } // WithdrawerRevenues returns all fees for a given withdraw address -func (k Keeper) WithdrawerRevenues( // nolint: dupl +func (k Keeper) WithdrawerRevenues( //nolint: dupl c context.Context, req *types.QueryWithdrawerRevenuesRequest, ) (*types.QueryWithdrawerRevenuesResponse, error) { diff --git a/x/revenue/keeper/integration_test.go b/x/revenue/keeper/integration_test.go index 247001fa91..bb580bbbbd 100644 --- a/x/revenue/keeper/integration_test.go +++ b/x/revenue/keeper/integration_test.go @@ -62,15 +62,17 @@ var _ = Describe("Fee distribution:", Ordered, func() { params = s.app.RevenueKeeper.GetParams(s.ctx) params.EnableRevenue = true - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck // setup deployer account deployerKey, deployerAddress = generateKey() - testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress, initBalance) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress, initBalance) + Expect(err).To(BeNil()) // setup account interacting with registered contracts userKey, userAddress = generateKey() - testutil.FundAccount(s.ctx, s.app.BankKeeper, userAddress, initBalance) + err = testutil.FundAccount(s.ctx, s.app.BankKeeper, userAddress, initBalance) + Expect(err).To(BeNil()) acc := s.app.AccountKeeper.NewAccountWithAddress(s.ctx, userAddress) s.app.AccountKeeper.SetAccount(s.ctx, acc) s.Commit() @@ -101,7 +103,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { // Disable revenue module params = s.app.RevenueKeeper.GetParams(s.ctx) params.EnableRevenue = false - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should not allow new contract registrations", func() { @@ -167,7 +169,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { BeforeEach(func() { params = types.DefaultParams() params.EnableRevenue = true - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck }) Describe("Registering a contract for receiving tx fees", func() { @@ -198,7 +200,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { res := contractInteract(userKey, &contractAddress, gasPrice, nil, nil, nil) s.Commit() - developerCoins, _ := calculateFees(denom, params, res, gasPrice, 14) + developerCoins, _ := calculateFees(denom, params, res, gasPrice) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(developerCoins.IsPositive()).To(BeTrue()) Expect(balance).To(Equal(preBalance.Add(developerCoins))) @@ -265,7 +267,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { res := contractInteract(userKey, &contractAddress, gasPrice, nil, nil, nil) s.Commit() - developerCoins, _ := calculateFees(denom, params, res, gasPrice, 14) + developerCoins, _ := calculateFees(denom, params, res, gasPrice) balance := s.app.BankKeeper.GetBalance(s.ctx, withdrawerAddress, denom) Expect(developerCoins.IsPositive()).To(BeTrue()) Expect(balance).To(Equal(preBalance.Add(developerCoins))) @@ -288,7 +290,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { BeforeEach(func() { params = s.app.RevenueKeeper.GetParams(s.ctx) params.DeveloperShares = sdk.NewDecWithPrec(50, 2) - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should transfer legacy tx fees to validators and contract developer evenly", func() { @@ -297,7 +299,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { gasPrice := big.NewInt(2000000000) res := contractInteract(userKey, &contractAddress, gasPrice, nil, nil, nil) - developerCoins, validatorCoins := calculateFees(denom, params, res, gasPrice, 14) + developerCoins, validatorCoins := calculateFees(denom, params, res, gasPrice) feeColectorBalance := s.app.BankKeeper.GetBalance(s.ctx, feeCollectorAddr, denom) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) @@ -322,7 +324,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { ðtypes.AccessList{}, ) - developerCoins, validatorCoins := calculateFees(denom, params, res, gasFeeCap, 14) + developerCoins, validatorCoins := calculateFees(denom, params, res, gasFeeCap) feeColectorBalance := s.app.BankKeeper.GetBalance(s.ctx, feeCollectorAddr, denom) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(balance).To(Equal(preBalance.Add(developerCoins))) @@ -335,7 +337,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { BeforeEach(func() { params = s.app.RevenueKeeper.GetParams(s.ctx) params.DeveloperShares = sdk.NewDec(0) - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should transfer all tx fees to validators", func() { @@ -352,7 +354,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { ðtypes.AccessList{}, ) - _, validatorCoins := calculateFees(denom, params, res, gasFeeCap, 10) + _, validatorCoins := calculateFees(denom, params, res, gasFeeCap) feeColectorBalance := s.app.BankKeeper.GetBalance(s.ctx, feeCollectorAddr, denom) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(balance).To(Equal(preBalance)) @@ -365,7 +367,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { BeforeEach(func() { params = s.app.RevenueKeeper.GetParams(s.ctx) params.DeveloperShares = sdk.NewDec(1) - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck }) It("should transfer all tx fees to developers", func() { @@ -382,7 +384,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { ðtypes.AccessList{}, ) - developerCoins, _ := calculateFees(denom, params, res, gasFeeCap, 14) + developerCoins, _ := calculateFees(denom, params, res, gasFeeCap) feeColectorBalance := s.app.BankKeeper.GetBalance(s.ctx, feeCollectorAddr, denom) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(balance).To(Equal(preBalance.Add(developerCoins))) @@ -441,7 +443,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { res := contractInteract(userKey, &contractAddress, gasPrice, nil, nil, nil) s.Commit() - developerCoins, _ := calculateFees(denom, params, res, gasPrice, 14) + developerCoins, _ := calculateFees(denom, params, res, gasPrice) balanceD := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) balanceW := s.app.BankKeeper.GetBalance(s.ctx, withdrawerAddress, denom) Expect(balanceW).To(Equal(preBalanceW.Add(developerCoins))) @@ -560,7 +562,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { res := deliverTx(deployerKey, nil, msg) Expect(res.IsOK()).To( Equal(false), - "cancelling failed: "+res.GetLog(), + "canceling failed: "+res.GetLog(), ) Expect( strings.Contains(res.GetLog(), @@ -607,7 +609,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { gasPrice := big.NewInt(2000000000) res := contractInteract(userKey, &contractAddress, gasPrice, nil, nil, nil) - developerCoins, _ := calculateFees(denom, params, res, gasPrice, 14) + developerCoins, _ := calculateFees(denom, params, res, gasPrice) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(balance).To(Equal(preBalance.Add(developerCoins))) s.Commit() @@ -628,7 +630,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { ðtypes.AccessList{}, ) - developerCoins, _ := calculateFees(denom, params, res, gasFeeCap, 14) + developerCoins, _ := calculateFees(denom, params, res, gasFeeCap) balance := s.app.BankKeeper.GetBalance(s.ctx, deployerAddress, denom) Expect(balance).To(Equal(preBalance.Add(developerCoins))) s.Commit() @@ -649,8 +651,10 @@ var _ = Describe("Fee distribution:", Ordered, func() { deployerKey2, deployerAddress2 := generateKey() BeforeEach(func() { - testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress1, initBalance) - testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress2, initBalance) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress1, initBalance) + s.Require().NoError(err) + err = testutil.FundAccount(s.ctx, s.app.BankKeeper, deployerAddress2, initBalance) + s.Require().NoError(err) // Create contract: deployerKey1 -> factory1 -> factory2 -> contract // Create factory1 @@ -670,7 +674,7 @@ var _ = Describe("Fee distribution:", Ordered, func() { func(gasCost int) { params = s.app.RevenueKeeper.GetParams(s.ctx) params.AddrDerivationCostCreate = uint64(gasCost) - s.app.RevenueKeeper.SetParams(s.ctx, params) + s.app.RevenueKeeper.SetParams(s.ctx, params) //nolint:errcheck // Cost for registration with one address derivation // We use another deployer, to have the same storage cost for @@ -724,7 +728,6 @@ func calculateFees( params types.Params, res abci.ResponseDeliverTx, gasPrice *big.Int, - logIndex int64, ) (sdk.Coin, sdk.Coin) { feeDistribution := sdk.NewInt(res.GasUsed).Mul(sdk.NewIntFromBigInt(gasPrice)) developerFee := sdk.NewDecFromInt(feeDistribution).Mul(params.DeveloperShares) @@ -912,13 +915,6 @@ func deliverEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evmtypes.MsgEthereu return res } -func checkEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evmtypes.MsgEthereumTx) abci.ResponseCheckTx { - bz := prepareEthTx(priv, msgEthereumTx) - req := abci.RequestCheckTx{Tx: bz} - res := s.app.BaseApp.CheckTx(req) - return res -} - func prepareCosmosTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg) []byte { encodingConfig := encoding.MakeConfig(app.ModuleBasics) accountAddress := sdk.AccAddress(priv.PubKey().Address().Bytes()) @@ -979,16 +975,9 @@ func prepareCosmosTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ... return bz } -func deliverTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg) abci.ResponseDeliverTx { +func deliverTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg) abci.ResponseDeliverTx { //nolint:unparam bz := prepareCosmosTx(priv, gasPrice, msgs...) req := abci.RequestDeliverTx{Tx: bz} res := s.app.BaseApp.DeliverTx(req) return res } - -func checkTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg) abci.ResponseCheckTx { - bz := prepareCosmosTx(priv, gasPrice, msgs...) - req := abci.RequestCheckTx{Tx: bz} - res := s.app.BaseApp.CheckTx(req) - return res -} diff --git a/x/revenue/keeper/keeper_test.go b/x/revenue/keeper/keeper_test.go index ab2ac1e02d..c34bf3565b 100644 --- a/x/revenue/keeper/keeper_test.go +++ b/x/revenue/keeper/keeper_test.go @@ -117,7 +117,8 @@ func (suite *KeeperTestSuite) SetupApp() { params := types.DefaultParams() params.EnableRevenue = true - suite.app.RevenueKeeper.SetParams(suite.ctx, params) + err = suite.app.RevenueKeeper.SetParams(suite.ctx, params) + require.NoError(t, err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) stakingParams.BondDenom = suite.denom @@ -125,18 +126,21 @@ func (suite *KeeperTestSuite) SetupApp() { evmParams := suite.app.EvmKeeper.GetParams(suite.ctx) evmParams.EvmDenom = suite.denom - suite.app.EvmKeeper.SetParams(suite.ctx, evmParams) + err = suite.app.EvmKeeper.SetParams(suite.ctx, evmParams) + require.NoError(t, err) inflationParams := suite.app.InflationKeeper.GetParams(suite.ctx) inflationParams.EnableInflation = false - suite.app.InflationKeeper.SetParams(suite.ctx, inflationParams) + err = suite.app.InflationKeeper.SetParams(suite.ctx, inflationParams) + require.NoError(t, err) // Set Validator valAddr := sdk.ValAddress(suite.address.Bytes()) validator, err := stakingtypes.NewValidator(valAddr, privCons.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) validators := s.app.StakingKeeper.GetValidators(s.ctx, 1) @@ -156,7 +160,7 @@ func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { suite.app.EndBlock(abci.RequestEndBlock{Height: header.Height}) _ = suite.app.Commit() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, diff --git a/x/revenue/keeper/msg_server_test.go b/x/revenue/keeper/msg_server_test.go index def27f085f..4774191882 100644 --- a/x/revenue/keeper/msg_server_test.go +++ b/x/revenue/keeper/msg_server_test.go @@ -155,7 +155,7 @@ func (suite *KeeperTestSuite) TestRegisterRevenue() { []uint64{1}, ) ctx := sdk.WrapSDKContext(suite.ctx) - suite.app.RevenueKeeper.RegisterRevenue(ctx, msg) + suite.app.RevenueKeeper.RegisterRevenue(ctx, msg) //nolint:errcheck }, false, types.ErrRevenueAlreadyRegistered.Error(), @@ -323,7 +323,7 @@ func (suite *KeeperTestSuite) TestUpdateRevenue() { params := types.DefaultParams() params.EnableRevenue = false - suite.app.RevenueKeeper.SetParams(suite.ctx, params) + suite.app.RevenueKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, false, "", @@ -391,7 +391,7 @@ func (suite *KeeperTestSuite) TestUpdateRevenue() { "", }, { - "fail - previously cancelled contract", + "fail - previously canceled contract", deployerAddr, withdrawer, withdrawer, @@ -486,7 +486,7 @@ func (suite *KeeperTestSuite) TestCancelRevenue() { errorMessage string }{ { - "ok - cancelled", + "ok - canceled", deployerAddr, contract1, []uint64{1}, @@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestCancelRevenue() { "", }, { - "ok - cancelled - no withdrawer", + "ok - canceled - no withdrawer", deployerAddr, contract1, []uint64{1}, @@ -549,7 +549,7 @@ func (suite *KeeperTestSuite) TestCancelRevenue() { params := types.DefaultParams() params.EnableRevenue = false - suite.app.RevenueKeeper.SetParams(suite.ctx, params) + suite.app.RevenueKeeper.SetParams(suite.ctx, params) //nolint:errcheck }, false, "", diff --git a/x/revenue/keeper/params_test.go b/x/revenue/keeper/params_test.go index e862abf201..d94d9695a8 100644 --- a/x/revenue/keeper/params_test.go +++ b/x/revenue/keeper/params_test.go @@ -7,7 +7,8 @@ func (suite *KeeperTestSuite) TestParams() { params.EnableRevenue = true suite.Require().Equal(types.DefaultParams(), params) params.EnableRevenue = false - suite.app.RevenueKeeper.SetParams(suite.ctx, params) + err := suite.app.RevenueKeeper.SetParams(suite.ctx, params) + suite.Require().NoError(err) newParams := suite.app.RevenueKeeper.GetParams(suite.ctx) suite.Require().Equal(newParams, params) } diff --git a/x/revenue/migrations/v2/migrate_test.go b/x/revenue/migrations/v2/migrate_test.go index c118224b10..46498bda6d 100644 --- a/x/revenue/migrations/v2/migrate_test.go +++ b/x/revenue/migrations/v2/migrate_test.go @@ -1,9 +1,10 @@ package v2_test import ( + "testing" + storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "testing" "github.com/evmos/ethermint/encoding" v2 "github.com/evmos/evmos/v11/x/revenue/migrations/v2" diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index 2422b0e687..283922a789 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -264,7 +264,8 @@ var _ = Describe("Clawback Vesting Accounts - claw back tokens", Ordered, func() // Create and fund periodic vesting account vestingStart := s.ctx.BlockTime() - testutil.FundAccount(s.ctx, s.app.BankKeeper, funder, vestingAmtTotal) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, funder, vestingAmtTotal) + s.Require().NoError(err) balanceFunder := s.app.BankKeeper.GetBalance(s.ctx, funder, stakeDenom) balanceGrantee := s.app.BankKeeper.GetBalance(s.ctx, grantee, stakeDenom) @@ -275,7 +276,7 @@ var _ = Describe("Clawback Vesting Accounts - claw back tokens", Ordered, func() msg := types.NewMsgCreateClawbackVestingAccount(funder, grantee, vestingStart, lockupPeriods, vestingPeriods, true) - _, err := s.app.VestingKeeper.CreateClawbackVestingAccount(ctx, msg) + _, err = s.app.VestingKeeper.CreateClawbackVestingAccount(ctx, msg) s.Require().NoError(err) acc := s.app.AccountKeeper.GetAccount(s.ctx, grantee) @@ -527,7 +528,8 @@ func delegate(clawbackAccount *types.ClawbackVestingAccount, amount int64) error val, err := sdk.ValAddressFromBech32("evmosvaloper1z3t55m0l9h0eupuz3dp5t5cypyv674jjn4d6nn") s.Require().NoError(err) delegateMsg := stakingtypes.NewMsgDelegate(addr, val, sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, sdk.NewInt(amount))) - txBuilder.SetMsgs(delegateMsg) + err = txBuilder.SetMsgs(delegateMsg) + s.Require().NoError(err) tx := txBuilder.GetTx() dec := ante.NewVestingDelegationDecorator(s.app.AccountKeeper, s.app.StakingKeeper, types.ModuleCdc) @@ -547,7 +549,9 @@ func performEthTx(clawbackAccount *types.ClawbackVestingAccount) error { encodingConfig := encoding.MakeConfig(app.ModuleBasics) txBuilder := encodingConfig.TxConfig.NewTxBuilder() - txBuilder.SetMsgs(msgEthereumTx) + err = txBuilder.SetMsgs(msgEthereumTx) + s.Require().NoError(err) + tx := txBuilder.GetTx() // Call Ante decorator diff --git a/x/vesting/keeper/keeper_test.go b/x/vesting/keeper/keeper_test.go index 2d17255378..3656f2b100 100644 --- a/x/vesting/keeper/keeper_test.go +++ b/x/vesting/keeper/keeper_test.go @@ -47,19 +47,6 @@ var ( ) var ( - participant = tests.GenerateAddress() - participant2 = tests.GenerateAddress() - denomMint = evm.DefaultEVMDenom - denomCoin = "acoin" - allocationRate = int64(5) - mintAllocations = sdk.DecCoins{ - sdk.NewDecCoinFromDec(denomMint, sdk.NewDecWithPrec(allocationRate, 2)), - } - allocations = sdk.DecCoins{ - sdk.NewDecCoinFromDec(denomMint, sdk.NewDecWithPrec(allocationRate, 2)), - sdk.NewDecCoinFromDec(denomCoin, sdk.NewDecWithPrec(allocationRate, 2)), - } - epochs = uint32(10) erc20Name = "Coin Token" erc20Symbol = "CTKN" erc20Name2 = "Coin Token 2" @@ -70,17 +57,16 @@ var ( type KeeperTestSuite struct { suite.Suite - ctx sdk.Context - app *app.Evmos - queryClientEvm evm.QueryClient - queryClient types.QueryClient - address common.Address - consAddress sdk.ConsAddress - validator stakingtypes.Validator - clientCtx client.Context - ethSigner ethtypes.Signer - signer keyring.Signer - mintFeeCollector bool + ctx sdk.Context + app *app.Evmos + queryClientEvm evm.QueryClient + queryClient types.QueryClient + address common.Address + consAddress sdk.ConsAddress + validator stakingtypes.Validator + clientCtx client.Context + ethSigner ethtypes.Signer + signer keyring.Signer } var s *KeeperTestSuite @@ -174,7 +160,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { validator, err := stakingtypes.NewValidator(valAddr, priv.PubKey(), stakingtypes.Description{}) require.NoError(t, err) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + err = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + require.NoError(t, err) err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) require.NoError(t, err) validators := s.app.StakingKeeper.GetValidators(s.ctx, 1) @@ -200,7 +187,7 @@ func (suite *KeeperTestSuite) Commit() { func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { _ = suite.app.Commit() header := suite.ctx.BlockHeader() - header.Height += 1 + header.Height++ header.Time = header.Time.Add(t) suite.app.BeginBlock(abci.RequestBeginBlock{ Header: header, @@ -236,7 +223,7 @@ func (suite *KeeperTestSuite) DeployContract( return common.Address{}, err } - data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) + data := append(contracts.ERC20MinterBurnerDecimalsContract.Bin, ctorArgs...) //nolint:gocritic args, err := json.Marshal(&evm.TransactionArgs{ From: &suite.address, Data: (*hexutil.Bytes)(&data), @@ -247,7 +234,7 @@ func (suite *KeeperTestSuite) DeployContract( res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ Args: args, - GasCap: uint64(config.DefaultGasCap), + GasCap: config.DefaultGasCap, }) if err != nil { return common.Address{}, err diff --git a/x/vesting/keeper/msg_server_test.go b/x/vesting/keeper/msg_server_test.go index c8d7bdf97e..ffb8e7b98f 100644 --- a/x/vesting/keeper/msg_server_test.go +++ b/x/vesting/keeper/msg_server_test.go @@ -101,7 +101,7 @@ func (suite *KeeperTestSuite) TestMsgCreateClawbackVestingAccount() { baseAccount := authtypes.NewBaseAccountWithAddress(addr2) funder := sdk.AccAddress(types.ModuleName) clawbackAccount := types.NewClawbackVestingAccount(baseAccount, funder, balances, vestingStart, lockupPeriods, vestingPeriods) - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) + testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) //nolint:errcheck s.app.AccountKeeper.SetAccount(s.ctx, clawbackAccount) }, addr, @@ -145,7 +145,7 @@ func (suite *KeeperTestSuite) TestMsgCreateClawbackVestingAccount() { baseAccount := authtypes.NewBaseAccountWithAddress(addr2) funder := sdk.AccAddress(types.ModuleName) clawbackAccount := types.NewClawbackVestingAccount(baseAccount, funder, balances, vestingStart, lockupPeriods, vestingPeriods) - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) + testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) //nolint:errcheck s.app.AccountKeeper.SetAccount(s.ctx, clawbackAccount) }, addr2, @@ -163,9 +163,9 @@ func (suite *KeeperTestSuite) TestMsgCreateClawbackVestingAccount() { // Existing clawback account vestingStart := s.ctx.BlockTime() baseAccount := authtypes.NewBaseAccountWithAddress(addr2) - funder := sdk.AccAddress(addr) + funder := addr clawbackAccount := types.NewClawbackVestingAccount(baseAccount, funder, balances, vestingStart, lockupPeriods, vestingPeriods) - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) + testutil.FundAccount(s.ctx, s.app.BankKeeper, addr2, balances) //nolint:errcheck s.app.AccountKeeper.SetAccount(s.ctx, clawbackAccount) }, addr, @@ -185,7 +185,8 @@ func (suite *KeeperTestSuite) TestMsgCreateClawbackVestingAccount() { tc.malleate() - testutil.FundAccount(s.ctx, s.app.BankKeeper, addr, balances) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, addr, balances) + suite.Require().NoError(err) msg := types.NewMsgCreateClawbackVestingAccount( tc.from, @@ -297,7 +298,8 @@ func (suite *KeeperTestSuite) TestMsgClawback() { // Set funder funder := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, tc.funder) suite.app.AccountKeeper.SetAccount(suite.ctx, funder) - testutil.FundAccount(suite.ctx, suite.app.BankKeeper, addr, balances) + err := testutil.FundAccount(suite.ctx, suite.app.BankKeeper, addr, balances) + suite.Require().NoError(err) // Create Clawback Vesting Account createMsg := types.NewMsgCreateClawbackVestingAccount(addr, addr2, tc.startTime, lockupPeriods, vestingPeriods, false) @@ -398,7 +400,8 @@ func (suite *KeeperTestSuite) TestMsgUpdateVestingFunder() { // Set funder funder := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, tc.funder) suite.app.AccountKeeper.SetAccount(suite.ctx, funder) - testutil.FundAccount(suite.ctx, suite.app.BankKeeper, addr, balances) + err := testutil.FundAccount(suite.ctx, suite.app.BankKeeper, addr, balances) + suite.Require().NoError(err) // Create Clawback Vesting Account createMsg := types.NewMsgCreateClawbackVestingAccount(addr, addr2, startTime, lockupPeriods, vestingPeriods, false) diff --git a/x/vesting/types/clawback_vesting_account_test.go b/x/vesting/types/clawback_vesting_account_test.go index f3fd520bbf..6f227cf92b 100644 --- a/x/vesting/types/clawback_vesting_account_test.go +++ b/x/vesting/types/clawback_vesting_account_test.go @@ -443,7 +443,7 @@ func (suite *VestingAccountTestSuite) TestTrackDelegationUndelegation() { va := types.NewClawbackVestingAccount(bacc, sdk.AccAddress([]byte("funder")), origCoins, now, lockupPeriods, vestingPeriods) - if tc.expDelegationPanic { + if tc.expDelegationPanic { //nolint:gocritic suite.Require().Panics(func() { tc.delegate(va) }) diff --git a/x/vesting/types/schedule_test.go b/x/vesting/types/schedule_test.go index 5e86bda306..97e2146263 100644 --- a/x/vesting/types/schedule_test.go +++ b/x/vesting/types/schedule_test.go @@ -277,7 +277,7 @@ func (suite *ScheduleTestSuite) TestDisjunctPeriods() { expPeriods: sdkvesting.Periods{period(100, 25), period(100, 25), period(100, 35), period(100, 35), period(100, 10), period(100, 10)}, }, } - for _, tc := range testCases { + for _, tc := range testCases { //nolint:dupl suite.Run(tc.name, func() { // Function is commutative in its arguments, so get two tests // for the price of one. TODO: sub-t.Run() for distinct names. @@ -387,7 +387,7 @@ func (suite *ScheduleTestSuite) TestConjunctPeriods() { expPeriods: sdkvesting.Periods{period(10, 1), period(10, 1), period(10, 1)}, }, } - for _, tc := range testCases { + for _, tc := range testCases { //nolint:dupl suite.Run(tc.name, func() { // Function is commutative in its arguments, so get two tests // for the price of one. TODO: sub-t.Run() for distinct names.