tests: Add unit tests for rpc client endpoints

rpc/backend/account_info_test.go

@@ -103,6 +103,18 @@ func (suite *BackendTestSuite) TestGetProof() {
  false,
  &rpctypes.AccountResult{},
  },
+ {
+ "fail - Block doesn't exist)",
+ address1,
+ []string{},
+ rpctypes.BlockNumberOrHash{BlockNumber: &blockNrInvalid},
+ func(bn rpctypes.BlockNumber, addr common.Address) {
+ client := suite.backend.clientCtx.Client.(*mocks.Client)
+ RegisterBlockError(client, bn.Int64())
+ },
+ false,
+ &rpctypes.AccountResult{},
+ },
  {
  "pass",
  address1,
@@ -351,6 +363,27 @@ func (suite *BackendTestSuite) TestGetTransactionCount() {
  true,
  hexutil.Uint64(0),
  },
+ // TODO: Error mocking the GetAccount call - problem with Any type
+ //{
+ // "pass - returns the number of transactions at the given address up to the given block number",
+ // true,
+ // rpctypes.NewBlockNumber(big.NewInt(1)),
+ // func(addr common.Address, bn rpctypes.BlockNumber) {
+ // client := suite.backend.clientCtx.Client.(*mocks.Client)
+ // account, err := suite.backend.clientCtx.AccountRetriever.GetAccount(suite.backend.clientCtx, suite.acc)
+ // suite.Require().NoError(err)
+ // request := &authtypes.QueryAccountRequest{Address: sdk.AccAddress(suite.acc.Bytes()).String()}
+ // requestMarshal, _ := request.Marshal()
+ // RegisterABCIQueryAccount(
+ // client,
+ // requestMarshal,
+ // tmrpcclient.ABCIQueryOptions{Height: int64(1), Prove: false},
+ // account,
+ // )
+ // },
+ // true,
+ // hexutil.Uint64(0),
+ //},
  }
  for _, tc := range testCases {
  suite.Run(fmt.Sprintf("Case %s", tc.name), func() {

rpc/backend/backend.go

@@ -6,7 +6,6 @@ import (
  "time"
 
  "github.com/cosmos/cosmos-sdk/client"
- "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/crypto/keyring"
  "github.com/cosmos/cosmos-sdk/server"
  sdk "github.com/cosmos/cosmos-sdk/types"
@@ -16,12 +15,10 @@ import (
  "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/rpc"
  "github.com/ethereum/go-ethereum/signer/core/apitypes"
- "github.com/evmos/ethermint/crypto/hd"
  rpctypes "github.com/evmos/ethermint/rpc/types"
  "github.com/evmos/ethermint/server/config"
  ethermint "github.com/evmos/ethermint/types"
  evmtypes "github.com/evmos/ethermint/x/evm/types"
- "github.com/spf13/viper"
  "github.com/tendermint/tendermint/libs/log"
  tmrpctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
@@ -162,23 +159,6 @@ func NewBackend(
  panic(err)
  }
 
- algos, _ := clientCtx.Keyring.SupportedAlgorithms()
- if !algos.Contains(hd.EthSecp256k1) {
- kr, err := keyring.New(
- sdk.KeyringServiceName(),
- viper.GetString(flags.FlagKeyringBackend),
- clientCtx.KeyringDir,
- clientCtx.Input,
- clientCtx.Codec,
- hd.EthSecp256k1Option(),
- )
- if err != nil {
- panic(err)
- }
-
- clientCtx = clientCtx.WithKeyring(kr)
- }
-
  return &Backend{
  ctx: context.Background(),
  clientCtx: clientCtx,

rpc/backend/backend_suite_test.go

@@ -3,6 +3,7 @@ package backend
 import (
  "bufio"
  "fmt"
+ "github.com/evmos/ethermint/crypto/ethsecp256k1"
  "math/big"
  "os"
  "path/filepath"
@@ -33,6 +34,7 @@ type BackendTestSuite struct {
  suite.Suite
  backend *Backend
  acc sdk.AccAddress
+ signer keyring.Signer
 }
 
 func TestBackendTestSuite(t *testing.T) {
@@ -61,6 +63,10 @@ func (suite *BackendTestSuite) SetupTest() {
  Seq: uint64(1),
  }
 
+ priv, err := ethsecp256k1.GenerateKey()
+ suite.signer = tests.NewSigner(priv)
+ suite.Require().NoError(err)
+
  encodingConfig := encoding.MakeConfig(app.ModuleBasics)
  clientCtx := client.Context{}.WithChainID("ethermint_9000-1").
  WithHeight(1).
@@ -70,13 +76,18 @@ func (suite *BackendTestSuite) SetupTest() {
  WithAccountRetriever(client.TestAccountRetriever{Accounts: accounts})
 
  allowUnprotectedTxs := false
-
  idxer := indexer.NewKVIndexer(dbm.NewMemDB(), ctx.Logger, clientCtx)
 
  suite.backend = NewBackend(ctx, ctx.Logger, clientCtx, allowUnprotectedTxs, idxer)
  suite.backend.queryClient.QueryClient = mocks.NewEVMQueryClient(suite.T())
  suite.backend.clientCtx.Client = mocks.NewClient(suite.T())
+ suite.backend.queryClient.FeeMarket = mocks.NewFeeMarketQueryClient(suite.T())
  suite.backend.ctx = rpctypes.ContextWithHeight(1)
+
+ // Add codec
+ encCfg := encoding.MakeConfig(app.ModuleBasics)
+ suite.backend.clientCtx.Codec = encCfg.Codec
+
 }
 
 // buildEthereumTx returns an example legacy Ethereum transaction
@@ -157,3 +168,25 @@ func (suite *BackendTestSuite) generateTestKeyring(clientDir string) (keyring.Ke
  encCfg := encoding.MakeConfig(app.ModuleBasics)
  return keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, clientDir, buf, encCfg.Codec, []keyring.Option{hd.EthSecp256k1Option()}...)
 }
+
+func (suite *BackendTestSuite) signAndEncodeEthTx(msgEthereumTx *evmtypes.MsgEthereumTx) []byte {
+ from, priv := tests.NewAddrKey()
+ signer := tests.NewSigner(priv)
+
+ queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
+ RegisterParamsWithoutHeader(queryClient, 1)
+
+ ethSigner := ethtypes.LatestSigner(suite.backend.ChainConfig())
+ msgEthereumTx.From = from.String()
+ err := msgEthereumTx.Sign(ethSigner, signer)
+ suite.Require().NoError(err)
+
+ tx, err := msgEthereumTx.BuildTx(suite.backend.clientCtx.TxConfig.NewTxBuilder(), "aphoton")
+ suite.Require().NoError(err)
+
+ txEncoder := suite.backend.clientCtx.TxConfig.TxEncoder()
+ txBz, err := txEncoder(tx)
+ suite.Require().NoError(err)
+
+ return txBz
+}

rpc/backend/blocks_test.go

@@ -30,8 +30,8 @@ func (suite *BackendTestSuite) TestBlockNumber() {
  {
  "fail - invalid block header height",
  func() {
- height := int64(1)
  var header metadata.MD
+ height := int64(1)
  queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
  RegisterParamsInvalidHeight(queryClient, &header, int64(height))
  },
@@ -41,8 +41,8 @@ func (suite *BackendTestSuite) TestBlockNumber() {
  {
  "fail - invalid block header",
  func() {
- height := int64(1)
  var header metadata.MD
+ height := int64(1)
  queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
  RegisterParamsInvalidHeader(queryClient, &header, int64(height))
  },
@@ -52,8 +52,8 @@ func (suite *BackendTestSuite) TestBlockNumber() {
  {
  "pass - app state header height 1",
  func() {
- height := int64(1)
  var header metadata.MD
+ height := int64(1)
  queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
  RegisterParams(queryClient, &header, int64(height))
  },
@@ -552,8 +552,8 @@ func (suite *BackendTestSuite) TestTendermintBlockByNumber() {
  "fail - blockNum < 0 with app state height error",
  ethrpc.BlockNumber(-1),
  func(_ ethrpc.BlockNumber) {
- appHeight := int64(1)
  var header metadata.MD
+ appHeight := int64(1)
  queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
  RegisterParamsError(queryClient, &header, appHeight)
  },
@@ -564,8 +564,8 @@ func (suite *BackendTestSuite) TestTendermintBlockByNumber() {
  "pass - blockNum < 0 with app state height >= 1",
  ethrpc.BlockNumber(-1),
  func(blockNum ethrpc.BlockNumber) {
- appHeight := int64(1)
  var header metadata.MD
+ appHeight := int64(1)
  queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
  RegisterParams(queryClient, &header, appHeight)