ENG 119 json rpc unit tests

rpc/backend/backend_suite_test.go

@@ -5,16 +5,10 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
-	grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
-	mock "github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
 
 	"github.com/evmos/ethermint/rpc/backend/mocks"
 	rpc "github.com/evmos/ethermint/rpc/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
 )
 
 type BackendTestSuite struct {
@@ -30,44 +24,11 @@ func TestBackendTestSuite(t *testing.T) {
 func (suite *BackendTestSuite) SetupTest() {
 	ctx := server.NewDefaultContext()
 	ctx.Viper.Set("telemetry.global-labels", []interface{}{})
-	clientCtx := client.Context{}.WithChainID("ethermint_9000-1").WithHeight(1)
+	clientCtx := client.Context{}.WithChainID("ethermint_9000-1").WithHeight(1).WithOffline(true)
 	allowUnprotectedTxs := false
 
 	suite.backend = NewBackend(ctx, ctx.Logger, clientCtx, allowUnprotectedTxs)
-
-	queryClient := mocks.NewQueryClient(suite.T())
-	var header metadata.MD
-	RegisterMockQueries(queryClient, &header)
-
-	suite.backend.queryClient.QueryClient = queryClient
+	suite.backend.queryClient.QueryClient = mocks.NewQueryClient(suite.T())
+	suite.backend.clientCtx.Client = mocks.NewClient(suite.T())
 	suite.backend.ctx = rpc.ContextWithHeight(1)
 }
-
-// QueryClient defines a mocked object that implements the grpc QueryCLient
-// interface. It's used on tests to test the JSON-RPC without running a grpc
-// client server. E.g. JSON-PRC-CLIENT -> BACKEND -> Mock GRPC CLIENT -> APP
-var _ evmtypes.QueryClient = &mocks.QueryClient{}
-
-// RegisterMockQueries registers the queries and their respective responses,
-// so that they can be called in tests using the queryClient
-func RegisterMockQueries(queryClient *mocks.QueryClient, header *metadata.MD) {
-	queryClient.On("Params", rpc.ContextWithHeight(1), &evmtypes.QueryParamsRequest{}, grpc.Header(header)).
-		Return(&evmtypes.QueryParamsResponse{}, nil).
-		Run(func(args mock.Arguments) {
-			// If Params call is successful, also update the header height
-			arg := args.Get(2).(grpc.HeaderCallOption)
-			h := metadata.MD{}
-			h.Set(grpctypes.GRPCBlockHeightHeader, "1")
-			*arg.HeaderAddr = h
-		})
-}
-
-func TestQueryClient(t *testing.T) {
-	queryClient := mocks.NewQueryClient(t)
-	var header metadata.MD
-	RegisterMockQueries(queryClient, &header)
-
-	// mock calls for abstraction
-	_, err := queryClient.Params(rpc.ContextWithHeight(1), &evmtypes.QueryParamsRequest{}, grpc.Header(&header))
-	require.NoError(t, err)
-}

rpc/backend/client_test.go

@@ -0,0 +1,46 @@
+package backend // Client defines a mocked object that implements the tendermint rpc CLient
+
+import (
+	"testing"
+
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/evmos/ethermint/rpc/backend/mocks"
+	rpc "github.com/evmos/ethermint/rpc/types"
+	mock "github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	tmrpcclient "github.com/tendermint/tendermint/rpc/client"
+	tmrpctypes "github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/tendermint/tendermint/types"
+) // interface. It's used on tests to test the JSON-RPC without running a
+// tendermint rpc client server. E.g. JSON-PRC-CLIENT -> BACKEND -> Mock GRPC
+// CLIENT -> APP
+var _ tmrpcclient.Client = &mocks.Client{}
+
+func TestClient(t *testing.T) {
+	client := mocks.NewClient(t)
+
+	// Register the queries and their respective responses, so that they can be
+	// called in tests using the client
+	height := rpc.BlockNumber(1).Int64()
+	RegisterBlockQueries(client, height)
+
+	block := types.Block{Header: types.Header{Height: height}}
+	res, err := client.Block(rpc.ContextWithHeight(height), &height)
+	require.Equal(t, res, &tmrpctypes.ResultBlock{Block: &block})
+	require.NoError(t, err)
+}
+
+func RegisterBlockQueries(client *mocks.Client, height int64) {
+	block := types.Block{Header: types.Header{Height: height}}
+	client.On("Block", rpc.ContextWithHeight(height), mock.AnythingOfType("*int64")).
+		Return(&tmrpctypes.ResultBlock{Block: &block}, nil)
+}
+
+func RegisterBlockQueriesError(client *mocks.Client, height int64) {
+	client.On("Block", rpc.ContextWithHeight(height), mock.AnythingOfType("*int64")).
+		Return(nil, sdkerrors.ErrInvalidRequest)
+}
+func RegisterBlockQueriesNotFound(client *mocks.Client, height int64) {
+	client.On("Block", rpc.ContextWithHeight(height), mock.AnythingOfType("*int64")).
+		Return(&tmrpctypes.ResultBlock{Block: nil}, nil)
+}