fmt

cmd/zetae2e/config/clients.go

@@ -8,12 +8,12 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/gagliardetto/solana-go/rpc"
-	zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/zeta-chain/zetacore/e2e/config"
 	"github.com/zeta-chain/zetacore/e2e/runner"
+	zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc"
 )
 
 // getClientsFromConfig get clients from config
@@ -108,7 +108,10 @@ func getEVMClient(
 
 func GetZetacoreClient(ctx context.Context, conf config.Config) (zetacore_rpc.Clients, error) {
 	if conf.RPCs.ZetaCoreGRPC != "" {
-		return zetacore_rpc.NewGRPCClients(conf.RPCs.ZetaCoreGRPC, grpc.WithTransportCredentials(insecure.NewCredentials()))
+		return zetacore_rpc.NewGRPCClients(
+			conf.RPCs.ZetaCoreGRPC,
+			grpc.WithTransportCredentials(insecure.NewCredentials()),
+		)
 	}
 	if conf.RPCs.ZetaCoreRPC != "" {
 		return zetacore_rpc.NewCometBFTClients(conf.RPCs.ZetaCoreRPC)

e2e/runner/clients.go

@@ -5,6 +5,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/gagliardetto/solana-go/rpc"
+
 	zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc"
 )
 

pkg/rpc/clients.go

@@ -9,9 +9,9 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
 	"google.golang.org/grpc"
 
-	feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
 	etherminttypes "github.com/zeta-chain/zetacore/rpc/types"
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
@@ -21,6 +21,8 @@ import (
 )
 
 // Clients contains RPC client interfaces to interact with ZetaCore
+//
+// Clients also has some high level wrappers for the clients
 type Clients struct {
 	// Cosmos SDK clients
 

pkg/rpc/clients_test.go

@@ -9,12 +9,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	abci "github.com/cometbft/cometbft/abci/types"
 	tmtypes "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/stretchr/testify/require"
@@ -72,29 +70,6 @@ func setupMockServer(
 	return server
 }
 
-func withDummyServer(zetaBlockHeight int64) []grpcmock.ServerOption {
-	return []grpcmock.ServerOption{
-		grpcmock.RegisterService(crosschaintypes.RegisterQueryServer),
-		grpcmock.RegisterService(crosschaintypes.RegisterMsgServer),
-		grpcmock.RegisterService(feemarkettypes.RegisterQueryServer),
-		grpcmock.RegisterService(authtypes.RegisterQueryServer),
-		grpcmock.RegisterService(abci.RegisterABCIApplicationServer),
-		func(s *grpcmock.Server) {
-			// Block Height
-			s.ExpectUnary("/zetachain.zetacore.crosschain.Query/LastZetaHeight").
-				UnlimitedTimes().
-				Return(crosschaintypes.QueryLastZetaHeightResponse{Height: zetaBlockHeight})
-
-			// London Base Fee
-			s.ExpectUnary("/ethermint.feemarket.v1.Query/Params").
-				UnlimitedTimes().
-				Return(feemarkettypes.QueryParamsResponse{
-					Params: feemarkettypes.Params{BaseFee: types.NewInt(100)},
-				})
-		},
-	}
-}
-
 func setupZetacoreClients(t *testing.T) Clients {
 	c, err := NewGRPCClients(gRPCListenPath, grpc.WithTransportCredentials(insecure.NewCredentials()))