From 16f47a419b7504c08a158e3ae2f77d035bc13420 Mon Sep 17 00:00:00 2001
From: Oleg Nikonychev <oleg.nikonychev@gmail.com>
Date: Mon, 20 Jan 2025 17:52:44 +0400
Subject: [PATCH] fix: tests

---
 eth/rpc/backend/gas_used_test.go | 18 +++++++-----------
 eth/rpc/backend/tx_logs_test.go  |  2 +-
 x/evm/keeper/call_contract.go    |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/eth/rpc/backend/gas_used_test.go b/eth/rpc/backend/gas_used_test.go
index 0ad3ed0c3..8362d599f 100644
--- a/eth/rpc/backend/gas_used_test.go
+++ b/eth/rpc/backend/gas_used_test.go
@@ -76,10 +76,10 @@ func (s *BackendSuite) TestGasUsedFunTokens() {
 	erc20Addr, err := eth.NewEIP55AddrFromStr(testContractAddress.String())
 	s.Require().NoError(err)
 
-	_, err = s.backend.GetTransactionCount(s.fundedAccEthAddr, rpc.EthPendingBlockNumber)
-	s.Require().NoError(err)
+	nonce := s.getCurrentNonce(s.node.EthAddress)
+	balanceBefore := s.getUnibiBalance(s.fundedAccEthAddr)
 
-	txResp, err := s.network.BroadcastMsgs(s.node.Address, &evm.MsgCreateFunToken{
+	txResp, err := s.network.BroadcastMsgs(s.node.Address, &nonce, &evm.MsgCreateFunToken{
 		Sender:    s.node.Address.String(),
 		FromErc20: &erc20Addr,
 	})
@@ -96,15 +96,11 @@ func (s *BackendSuite) TestGasUsedFunTokens() {
 	)
 	s.Require().NoError(err)
 
-	nonce, err := s.backend.GetTransactionCount(s.fundedAccEthAddr, rpc.EthPendingBlockNumber)
-	s.Require().NoError(err)
-
-	balanceBefore := s.getUnibiBalance(s.fundedAccEthAddr)
-
+	nonce = s.getCurrentNonce(s.fundedAccEthAddr)
 	txHash1 := SendTransaction(
 		s,
 		&gethcore.LegacyTx{
-			Nonce:    uint64(*nonce),
+			Nonce:    nonce,
 			To:       &precompile.PrecompileAddr_FunToken,
 			Data:     packedArgsPass,
 			Gas:      1_500_000,
@@ -123,7 +119,7 @@ func (s *BackendSuite) TestGasUsedFunTokens() {
 	txHash2 := SendTransaction( // should fail due to invalid recipient address
 		s,
 		&gethcore.LegacyTx{
-			Nonce:    uint64(*nonce + 1),
+			Nonce:    nonce + 1,
 			To:       &precompile.PrecompileAddr_FunToken,
 			Data:     packedArgsFail,
 			Gas:      1_500_000,
@@ -134,7 +130,7 @@ func (s *BackendSuite) TestGasUsedFunTokens() {
 	txHash3 := SendTransaction(
 		s,
 		&gethcore.LegacyTx{
-			Nonce:    uint64(*nonce + 2),
+			Nonce:    nonce + 2,
 			To:       &precompile.PrecompileAddr_FunToken,
 			Data:     packedArgsPass,
 			Gas:      1_500_000,
diff --git a/eth/rpc/backend/tx_logs_test.go b/eth/rpc/backend/tx_logs_test.go
index 262db1ff9..6bd1132cf 100644
--- a/eth/rpc/backend/tx_logs_test.go
+++ b/eth/rpc/backend/tx_logs_test.go
@@ -60,7 +60,7 @@ func (s *BackendSuite) TestLogs() {
 
 	s.T().Log("TX4: Create FunToken from unibi coin")
 	nonce++
-	erc20FromCoinAddr := crypto.CreateAddress(evm.EVM_MODULE_ADDRESS, s.getCurrentNonce(evm.EVM_MODULE_ADDRESS))
+	erc20FromCoinAddr := crypto.CreateAddress(evm.EVM_MODULE_ADDRESS, s.getCurrentNonce(evm.EVM_MODULE_ADDRESS)+1)
 
 	txResp, err = s.network.BroadcastMsgs(s.node.Address, &nonce, &evm.MsgCreateFunToken{
 		Sender:        s.node.Address.String(),
diff --git a/x/evm/keeper/call_contract.go b/x/evm/keeper/call_contract.go
index 143bf2574..f9fdc2c8b 100644
--- a/x/evm/keeper/call_contract.go
+++ b/x/evm/keeper/call_contract.go
@@ -87,7 +87,7 @@ func (k Keeper) CallContractWithInput(
 
 		err = k.EmitLogEvents(ctx, evmResp)
 		if err != nil {
-			return nil, nil, errors.Wrap(err, "error emitting tx logs")
+			return nil, errors.Wrap(err, "error emitting tx logs")
 		}
 	}
 	return evmResp, nil