fix: variable declarations in BeforeEach blocks

- Use short declaration operator (:=) in BeforeEach blocks instead of separate var declarations
- Fix DepositEvent and WithdrawalEvent to use pointers: &werc20.DepositEvent{}
- Fix ERC20 return type field access (Field1 instead of Balance, Name, Symbol, Decimals)
- Remove unused crypto import from test_events.go

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
Co-Authored-By: Happy <[email protected]>

Author: 3 people

tests/integration/precompiles/erc20/test_integration.go

@@ -107,27 +107,18 @@ func TestIntegrationTestSuite(t *testing.T, create network.CreateEvmApp, options
 			// contractsData holds the addresses and ABIs for the different
 			// contract instances that are subject to testing here.
 			contractsData ContractsData
-
-			erc20MdCallerContract evmtypes.CompiledContract
-			revertCallerContract  evmtypes.CompiledContract
-			erc20MinterV5Contract evmtypes.CompiledContract
-
-			execRevertedCheck testutil.LogCheckArgs
-			failCheck         testutil.LogCheckArgs
-			passCheck         testutil.LogCheckArgs
 		)
 
 		BeforeEach(func() {
 			is.SetupTest()
 
-			var err error
-			erc20MdCallerContract, err = testdata.LoadERC20TestCaller()
+			erc20MdCallerContract, err := testdata.LoadERC20TestCaller()
 			Expect(err).ToNot(HaveOccurred(), "failed to load ERC20 allowance caller contract")
 
-			erc20MinterV5Contract, err = testdata.LoadERC20MinterV5Contract()
+			erc20MinterV5Contract, err := testdata.LoadERC20MinterV5Contract()
 			Expect(err).ToNot(HaveOccurred(), "failed to load ERC20 minter contract")
 
-			revertCallerContract, err = testdata.LoadERC20TestCaller()
+			revertCallerContract, err := testdata.LoadERC20TestCaller()
 			Expect(err).ToNot(HaveOccurred(), "failed to load ERC20 allowance caller contract")
 
 			sender := is.keyring.GetKey(0)

tests/integration/precompiles/slashing/test_integration.go

@@ -64,11 +64,11 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 		BeforeEach(func() {
 			s.SetupTest()
 
-			valAddr, err = sdk.ValAddressFromBech32(s.network.GetValidators()[0].GetOperator())
+			valAddr, err := sdk.ValAddressFromBech32(s.network.GetValidators()[0].GetOperator())
 			Expect(err).To(BeNil())
 
 			// send funds to the contract
-			err := utils.FundAccountWithBaseDenom(s.factory, s.network, s.keyring.GetKey(0), contractAddr.Bytes(), math.NewInt(2e18))
+			err = utils.FundAccountWithBaseDenom(s.factory, s.network, s.keyring.GetKey(0), contractAddr.Bytes(), math.NewInt(2e18))
 			Expect(err).To(BeNil())
 			Expect(s.network.NextBlock()).To(BeNil())
 

tests/integration/precompiles/staking/test_integration.go

@@ -62,11 +62,10 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 		var s *PrecompileTestSuite
 
 		BeforeEach(func() {
-			var err error
 			s = NewPrecompileTestSuite(create, options...)
 			s.SetupTest()
 
-			valAddr, err = sdk.ValAddressFromBech32(s.network.GetValidators()[0].GetOperator())
+			valAddr, err := sdk.ValAddressFromBech32(s.network.GetValidators()[0].GetOperator())
 			Expect(err).To(BeNil())
 			valAddr2, err = sdk.ValAddressFromBech32(s.network.GetValidators()[1].GetOperator())
 			Expect(err).To(BeNil())
@@ -1391,7 +1390,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			s.SetupTest()
 			delegator := s.keyring.GetKey(0)
 
-			contractAddr, err = s.factory.DeployContract(
+			contractAddr, err := s.factory.DeployContract(
 				delegator.Priv,
 				evmtypes.EvmTxArgs{}, // NOTE: passing empty struct to use default values
 				testutiltypes.ContractDeploymentData{
@@ -1407,7 +1406,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			Expect(s.network.NextBlock()).To(BeNil())
 
 			// Deploy StakingCallerTwo contract
-			contractTwoAddr, err = s.factory.DeployContract(
+			contractTwoAddr, err := s.factory.DeployContract(
 				delegator.Priv,
 				evmtypes.EvmTxArgs{}, // NOTE: passing empty struct to use default values
 				testutiltypes.ContractDeploymentData{
@@ -1418,7 +1417,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			Expect(s.network.NextBlock()).To(BeNil())
 
 			// Deploy StakingReverter contract
-			stkReverterAddr, err = s.factory.DeployContract(
+			stkReverterAddr, err := s.factory.DeployContract(
 				delegator.Priv,
 				evmtypes.EvmTxArgs{}, // NOTE: passing empty struct to use default values
 				testutiltypes.ContractDeploymentData{
@@ -1430,7 +1429,7 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 
 			// send some funds to the StakingCallerTwo & StakingReverter contracts to transfer to the
 			// delegator during the tx
-			err := utils.FundAccountWithBaseDenom(s.factory, s.network, s.keyring.GetKey(0), contractTwoAddr.Bytes(), testContractInitialBalance)
+			err = utils.FundAccountWithBaseDenom(s.factory, s.network, s.keyring.GetKey(0), contractTwoAddr.Bytes(), testContractInitialBalance)
 			Expect(err).To(BeNil(), "error while funding the smart contract: %v", err)
 			Expect(s.network.NextBlock()).To(BeNil())
 			err = utils.FundAccountWithBaseDenom(s.factory, s.network, s.keyring.GetKey(0), stkReverterAddr.Bytes(), testContractInitialBalance)

tests/integration/precompiles/werc20/test_events.go

@@ -4,7 +4,6 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/suite"
 
 	cmn "github.com/cosmos/evm/precompiles/common"
@@ -129,9 +128,8 @@ func (s *PrecompileUnitTestSuite) TestEmitDepositEvent() {
 			s.Require().Equal(log.Address, s.precompile.Address())
 
 			// Check on the topics
-			event := s.precompile.Events[werc20.EventTypeDeposit]
 			s.Require().Equal(
-				crypto.Keccak256Hash([]byte(event.Sig)),
+				(&werc20.DepositEvent{}).GetEventID(),
 				common.HexToHash(log.Topics[0].Hex()),
 			)
 			var adddressTopic common.Hash
@@ -141,8 +139,8 @@ func (s *PrecompileUnitTestSuite) TestEmitDepositEvent() {
 			s.Require().EqualValues(log.BlockNumber, s.network.GetContext().BlockHeight())
 
 			// Verify data
-			var depositEvent DepositEvent
-			err = cmn.UnpackLog(s.precompile.ABI, &depositEvent, werc20.EventTypeDeposit, *log)
+			var depositEvent werc20.DepositEvent
+			err = cmn.UnpackLog(&depositEvent, *log)
 			s.Require().NoError(err, "unable to unpack log into deposit event")
 
 			s.Require().Equal(caller, depositEvent.Dst, "expected different destination address")
@@ -188,9 +186,8 @@ func (s *PrecompileUnitTestSuite) TestEmitWithdrawalEvent() {
 			s.Require().Equal(log.Address, s.precompile.Address())
 
 			// Check on the topics
-			event := s.precompile.Events[werc20.EventTypeWithdrawal]
 			s.Require().Equal(
-				crypto.Keccak256Hash([]byte(event.Sig)),
+				(&werc20.WithdrawalEvent{}).GetEventID(),
 				common.HexToHash(log.Topics[0].Hex()),
 			)
 			var adddressTopic common.Hash
@@ -200,8 +197,8 @@ func (s *PrecompileUnitTestSuite) TestEmitWithdrawalEvent() {
 			s.Require().EqualValues(log.BlockNumber, s.network.GetContext().BlockHeight())
 
 			// Verify data
-			var withdrawalEvent WithdrawalEvent
-			err = cmn.UnpackLog(s.precompile.ABI, &withdrawalEvent, werc20.EventTypeWithdrawal, *log)
+			var withdrawalEvent werc20.WithdrawalEvent
+			err = cmn.UnpackLog(&withdrawalEvent, *log)
 			s.Require().NoError(err, "unable to unpack log into withdrawal event")
 
 			s.Require().Equal(caller, withdrawalEvent.Src, "expected different source address")