Fix backend unit tests (#104)

* Update unit tests in rpc backend. * Update unit tests in rpc backend. * Fix unit test * Correct function name
SigmaGmbH · Jun 19, 2024 · 2a3a818 · 2a3a818
1 parent 07574fc
commit 2a3a818
Show file tree

Hide file tree

Showing 28 changed files with 140 additions and 125 deletions.
diff --git a/app/ante/fee_checker_test.go b/app/ante/fee_checker_test.go
@@ -39,7 +39,7 @@ func (m MockEVMKeeper) GetParams(ctx sdk.Context) evmtypes.Params {
 }
 
 func (m MockEVMKeeper) ChainID() *big.Int {
-	return big.NewInt(9000)
+	return big.NewInt(1291)
 }
 
 func TestSDKTxFeeChecker(t *testing.T) {

diff --git a/cmd/swisstronikd/cmd/config.go b/cmd/swisstronikd/cmd/config.go
@@ -2,12 +2,13 @@ package cmd
 
 import (
 	"fmt"
+
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/spf13/cobra"
 
 	"swisstronik/app"
 	evmtypes "swisstronik/types"
-	"github.com/spf13/cobra"
-	"github.com/cosmos/cosmos-sdk/client/flags"
 )
 
 func InitSDKConfig() {
@@ -27,10 +28,11 @@ func InitSDKConfig() {
 
 	// Set global coin type to be used in HD wallets
 	config.SetCoinType(evmtypes.Bip44CoinType)
-	config.SetPurpose(sdk.Purpose)                      
+	config.SetPurpose(sdk.Purpose)
 
 	// Set and seal config
 	config.Seal()
+
 }
 
 // ValidateChainID wraps a cobra command with a RunE function with base 10 integer chain-id verification.

diff --git a/ethereum/eip712/preprocess_test.go b/ethereum/eip712/preprocess_test.go
@@ -25,12 +25,12 @@ import (
 
 // Testing Constants
 var (
-	chainId = "ethermint_9000-1"
+	chainId = "swisstronik_1291-1"
 	ctx     = client.Context{}.WithTxConfig(
 		encoding.MakeConfig(app.ModuleBasics).TxConfig,
 	)
 )
-var feePayerAddress = "ethm17xpfvakm2amg962yls6f84z3kell8c5lthdzgl"
+var feePayerAddress = "swtr1x9djmrsvrf60xze5vj4pv52khjhskyqpzratt8"
 
 type TestCaseStruct struct {
 	txBuilder              client.TxBuilder
@@ -44,7 +44,7 @@ type TestCaseStruct struct {
 
 func TestLedgerPreprocessing(t *testing.T) {
 	// Update bech32 prefix
-	sdk.GetConfig().SetBech32PrefixForAccount("ethm", "")
+	sdk.GetConfig().SetBech32PrefixForAccount("swtr", "")
 
 	testCases := []TestCaseStruct{
 		createBasicTestCase(t),
@@ -67,7 +67,7 @@ func TestLedgerPreprocessing(t *testing.T) {
 		require.True(t, len(hasExtOptsTx.GetExtensionOptions()) == 1)
 
 		expectedExt := types.ExtensionOptionsWeb3Tx{
-			TypedDataChainID: 9000,
+			TypedDataChainID: 1291,
 			FeePayer:         feePayerAddress,
 			FeePayerSig:      tc.expectedSignatureBytes,
 		}
@@ -167,7 +167,7 @@ func createBasicTestCase(t *testing.T) TestCaseStruct {
 		Sequence: 0,
 	}
 
-	txBuilder.SetSignatures(sigsV2)
+	_ = txBuilder.SetSignatures(sigsV2)
 	return TestCaseStruct{
 		txBuilder:              txBuilder,
 		expectedFeePayer:       feePayer.String(),
@@ -209,7 +209,7 @@ func createPopulatedTestCase(t *testing.T) TestCaseStruct {
 		),
 	}
 
-	txBuilder.SetMsgs(&msgSend)
+	_ = txBuilder.SetMsgs(&msgSend)
 
 	return TestCaseStruct{
 		txBuilder:              txBuilder,

diff --git a/ibc/testing/chain.go b/ibc/testing/chain.go
@@ -41,7 +41,7 @@ import (
 )
 
 // ChainIDPrefix defines the default chain ID prefix for test chains
-var ChainIDPrefix = "swisstronik_9000-"
+var ChainIDPrefix = "swisstronik_1291-"
 
 func init() {
 	ibcgotesting.ChainIDPrefix = ChainIDPrefix

diff --git a/rpc/backend/account_info.go b/rpc/backend/account_info.go
@@ -21,14 +21,14 @@ import (
 	"math/big"
 
 	errorsmod "cosmossdk.io/errors"
-
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+
 	rpctypes "swisstronik/rpc/types"
 	evmtypes "swisstronik/x/evm/types"
 )

diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go
@@ -20,11 +20,6 @@ import (
 	"math/big"
 	"time"
 
-	rpctypes "swisstronik/rpc/types"
-	"swisstronik/server/config"
-	ethermint "swisstronik/types"
-	evmtypes "swisstronik/x/evm/types"
-
 	"github.com/cometbft/cometbft/libs/log"
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -37,6 +32,11 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
+
+	rpctypes "swisstronik/rpc/types"
+	"swisstronik/server/config"
+	ethermint "swisstronik/types"
+	evmtypes "swisstronik/x/evm/types"
 )
 
 // BackendI implements the Cosmos and EVM backend.

diff --git a/rpc/backend/backend_suite_test.go b/rpc/backend/backend_suite_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	dbm "github.com/cometbft/cometbft-db"
-
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"

diff --git a/rpc/backend/blocks.go b/rpc/backend/blocks.go
@@ -21,9 +21,6 @@ import (
 	"math/big"
 	"strconv"
 
-	rpctypes "swisstronik/rpc/types"
-	evmtypes "swisstronik/x/evm/types"
-
 	tmrpcclient "github.com/cometbft/cometbft/rpc/client"
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -35,6 +32,9 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
+
+	rpctypes "swisstronik/rpc/types"
+	evmtypes "swisstronik/x/evm/types"
 )
 
 // BlockNumber returns the current block number in abci app state. Because abci

diff --git a/rpc/backend/call_tx_test.go b/rpc/backend/call_tx_test.go
@@ -450,6 +450,7 @@ func (suite *BackendTestSuite) TestDoCall() {
 		})
 	}
 }
+
 func (suite *BackendTestSuite) TestGasPrice() {
 	defaultGasPrice := (*hexutil.Big)(big.NewInt(1))
 
@@ -468,8 +469,8 @@ func (suite *BackendTestSuite) TestGasPrice() {
 				feeMarketClient := suite.backend.queryClient.FeeMarket.(*mocks.FeeMarketQueryClient)
 				RegisterFeeMarketParams(feeMarketClient, 1)
 				RegisterParams(queryClient, &header, 1)
-				RegisterBlock(client, 1, nil)
-				RegisterBlockResults(client, 1)
+				_, _ = RegisterBlock(client, 1, nil)
+				_, _ = RegisterBlockResults(client, 1)
 				RegisterBaseFee(queryClient, sdk.NewInt(1))
 			},
 			defaultGasPrice,
@@ -484,8 +485,8 @@ func (suite *BackendTestSuite) TestGasPrice() {
 				feeMarketClient := suite.backend.queryClient.FeeMarket.(*mocks.FeeMarketQueryClient)
 				RegisterFeeMarketParamsError(feeMarketClient, 1)
 				RegisterParams(queryClient, &header, 1)
-				RegisterBlock(client, 1, nil)
-				RegisterBlockResults(client, 1)
+				_, _ = RegisterBlock(client, 1, nil)
+				_, _ = RegisterBlockResults(client, 1)
 				RegisterBaseFee(queryClient, sdk.NewInt(1))
 			},
 			defaultGasPrice,

diff --git a/rpc/backend/chain_info.go b/rpc/backend/chain_info.go
@@ -20,11 +20,6 @@ import (
 	"math/big"
 	"strconv"
 
-	rpctypes "swisstronik/rpc/types"
-	ethermint "swisstronik/types"
-	evmtypes "swisstronik/x/evm/types"
-	feemarkettypes "swisstronik/x/feemarket/types"
-
 	tmrpcclient "github.com/cometbft/cometbft/rpc/client"
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -33,6 +28,11 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
+
+	rpctypes "swisstronik/rpc/types"
+	ethermint "swisstronik/types"
+	evmtypes "swisstronik/x/evm/types"
+	feemarkettypes "swisstronik/x/feemarket/types"
 )
 
 // ChainID is the EIP-155 replay-protection chain id for the current ethereum chain config.

diff --git a/rpc/backend/chain_info_test.go b/rpc/backend/chain_info_test.go
@@ -4,18 +4,16 @@ import (
 	"fmt"
 	"math/big"
 
-	rpc "swisstronik/rpc/types"
-	"swisstronik/tests"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	ethrpc "github.com/ethereum/go-ethereum/rpc"
-	"google.golang.org/grpc/metadata"
-
 	"github.com/cometbft/cometbft/abci/types"
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethrpc "github.com/ethereum/go-ethereum/rpc"
+	"google.golang.org/grpc/metadata"
 
 	"swisstronik/rpc/backend/mocks"
+	rpc "swisstronik/rpc/types"
+	"swisstronik/tests"
 	evmtypes "swisstronik/x/evm/types"
 	feemarkettypes "swisstronik/x/feemarket/types"
 )
@@ -153,7 +151,7 @@ func (suite *BackendTestSuite) TestBaseFee() {
 }
 
 func (suite *BackendTestSuite) TestChainId() {
-	expChainId := (*hexutil.Big)(big.NewInt(9000))
+	expChainId := (*hexutil.Big)(big.NewInt(1291))
 	testCases := []struct {
 		name         string
 		registerMock func()
@@ -375,7 +373,7 @@ func (suite *BackendTestSuite) TestFeeHistory() {
 			func(validator sdk.AccAddress) {
 				client := suite.backend.clientCtx.Client.(*mocks.Client)
 				suite.backend.cfg.JSONRPC.FeeHistoryCap = 2
-				RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
+				_, _ = RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
 				RegisterBlockResultsError(client, 1)
 			},
 			1,
@@ -391,8 +389,8 @@ func (suite *BackendTestSuite) TestFeeHistory() {
 				queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
 				client := suite.backend.clientCtx.Client.(*mocks.Client)
 				suite.backend.cfg.JSONRPC.FeeHistoryCap = 2
-				RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
-				RegisterBlockResults(client, 1)
+				_, _ = RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
+				_, _ = RegisterBlockResults(client, 1)
 				RegisterBaseFeeError(queryClient)
 				RegisterValidatorAccount(queryClient, validator)
 				RegisterConsensusParams(client, 1)
@@ -411,8 +409,8 @@ func (suite *BackendTestSuite) TestFeeHistory() {
 				queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
 				client := suite.backend.clientCtx.Client.(*mocks.Client)
 				suite.backend.cfg.JSONRPC.FeeHistoryCap = 2
-				RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
-				RegisterBlockResults(client, 1)
+				_, _ = RegisterBlock(client, ethrpc.BlockNumber(1).Int64(), nil)
+				_, _ = RegisterBlockResults(client, 1)
 				RegisterBaseFee(queryClient, baseFee)
 				RegisterValidatorAccount(queryClient, validator)
 				RegisterConsensusParams(client, 1)

diff --git a/rpc/backend/client_test.go b/rpc/backend/client_test.go
@@ -4,23 +4,22 @@ import (
 	"context"
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/client"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
-
-	"swisstronik/rpc/backend/mocks"
-	rpc "swisstronik/rpc/types"
-	evmtypes "swisstronik/x/evm/types"
-
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/libs/bytes"
 	tmrpcclient "github.com/cometbft/cometbft/rpc/client"
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	"github.com/cometbft/cometbft/types"
+	"github.com/cosmos/cosmos-sdk/client"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ethereum/go-ethereum/common"
 	mock "github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"swisstronik/rpc/backend/mocks"
+	rpc "swisstronik/rpc/types"
+	evmtypes "swisstronik/x/evm/types"
 )
 
 // Client defines a mocked object that implements the Tendermint JSON-RPC Client
@@ -142,7 +141,7 @@ func RegisterBlockNotFound(
 func TestRegisterBlock(t *testing.T) {
 	client := mocks.NewClient(t)
 	height := rpc.BlockNumber(1).Int64()
-	RegisterBlock(client, height, nil)
+	_, _ = RegisterBlock(client, height, nil)
 
 	res, err := client.Block(rpc.ContextWithHeight(height), &height)
 
@@ -219,7 +218,7 @@ func RegisterBlockResultsError(client *mocks.Client, height int64) {
 func TestRegisterBlockResults(t *testing.T) {
 	client := mocks.NewClient(t)
 	height := int64(1)
-	RegisterBlockResults(client, height)
+	_, _ = RegisterBlockResults(client, height)
 
 	res, err := client.BlockResults(rpc.ContextWithHeight(height), &height)
 	expRes := &tmrpctypes.ResultBlockResults{

diff --git a/rpc/backend/evm_query_client_test.go b/rpc/backend/evm_query_client_test.go
@@ -7,11 +7,6 @@ import (
 	"strconv"
 	"testing"
 
-	"swisstronik/rpc/backend/mocks"
-	rpc "swisstronik/rpc/types"
-	"swisstronik/tests"
-	evmtypes "swisstronik/x/evm/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
@@ -22,6 +17,11 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+
+	"swisstronik/rpc/backend/mocks"
+	rpc "swisstronik/rpc/types"
+	"swisstronik/tests"
+	evmtypes "swisstronik/x/evm/types"
 )
 
 // QueryClient defines a mocked object that implements the ethermint GRPC
@@ -35,26 +35,26 @@ var _ evmtypes.QueryClient = &mocks.EVMQueryClient{}
 func RegisterTraceTransactionWithPredecessors(queryClient *mocks.EVMQueryClient, msgEthTx *evmtypes.MsgHandleTx, predecessors []*evmtypes.MsgHandleTx) {
 	data := []byte{0x7b, 0x22, 0x74, 0x65, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x22, 0x7d}
 	queryClient.On("TraceTx", rpc.ContextWithHeight(1),
-		&evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, Predecessors: predecessors, ChainId: 9000}).
+		&evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, Predecessors: predecessors, ChainId: 1291}).
 		Return(&evmtypes.QueryTraceTxResponse{Data: data}, nil)
 }
 
 func RegisterTraceTransaction(queryClient *mocks.EVMQueryClient, msgEthTx *evmtypes.MsgHandleTx) {
 	data := []byte{0x7b, 0x22, 0x74, 0x65, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x22, 0x7d}
-	queryClient.On("TraceTx", rpc.ContextWithHeight(1), &evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, ChainId: 9000}).
+	queryClient.On("TraceTx", rpc.ContextWithHeight(1), &evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, ChainId: 1291}).
 		Return(&evmtypes.QueryTraceTxResponse{Data: data}, nil)
 }
 
 func RegisterTraceTransactionError(queryClient *mocks.EVMQueryClient, msgEthTx *evmtypes.MsgHandleTx) {
-	queryClient.On("TraceTx", rpc.ContextWithHeight(1), &evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, ChainId: 9000}).
+	queryClient.On("TraceTx", rpc.ContextWithHeight(1), &evmtypes.QueryTraceTxRequest{Msg: msgEthTx, BlockNumber: 1, ChainId: 1291}).
 		Return(nil, errortypes.ErrInvalidRequest)
 }
 
 // TraceBlock
 func RegisterTraceBlock(queryClient *mocks.EVMQueryClient, txs []*evmtypes.MsgHandleTx) {
 	data := []byte{0x7b, 0x22, 0x74, 0x65, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x22, 0x7d}
 	queryClient.On("TraceBlock", rpc.ContextWithHeight(1),
-		&evmtypes.QueryTraceBlockRequest{Txs: txs, BlockNumber: 1, TraceConfig: &evmtypes.TraceConfig{}, ChainId: 9000}).
+		&evmtypes.QueryTraceBlockRequest{Txs: txs, BlockNumber: 1, TraceConfig: &evmtypes.TraceConfig{}, ChainId: 1291}).
 		Return(&evmtypes.QueryTraceBlockResponse{Data: data}, nil)
 }