refactor(evm): renamed query FunToken to FunTokenMapping

NibiruChain · Jul 23, 2024 · 777ab3a · 777ab3a
1 parent 6cb512a
commit 777ab3a
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 194 deletions.
diff --git a/eth/rpc/backend/mocks/evm_query_client.go b/eth/rpc/backend/mocks/evm_query_client.go
diff --git a/proto/eth/evm/v1/query.proto b/proto/eth/evm/v1/query.proto
@@ -76,7 +76,7 @@ service Query {
     option (google.api.http).get = "/nibiru/evm/v1/base_fee";
   }
 
-  rpc FunToken(QueryFunTokenRequest) returns (QueryFunTokenResponse) {
+  rpc FunTokenMapping(QueryFunTokenMappingRequest) returns (QueryFunTokenMappingResponse) {
     option (google.api.http).get = "/nibiru/evm/v1/funtoken/{token}";
   }
 }
@@ -306,15 +306,15 @@ message QueryBaseFeeResponse {
   string base_fee = 1 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
 }
 
-message QueryFunTokenRequest {
+message QueryFunTokenMappingRequest {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_getters) = false;
 
   // either the 0x contract address of the ERC-20 token or the cosmos denom
   string token = 1;
 }
 
-message QueryFunTokenResponse {
+message QueryFunTokenMappingResponse {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_getters) = false;  
 

diff --git a/x/evm/cli/query.go b/x/evm/cli/query.go
@@ -57,7 +57,7 @@ $ %s query %s get-fun-token 0x7D4B7B8CA7E1a24928Bb96D59249c7a5bd1DfBe6
 			}
 			queryClient := evm.NewQueryClient(clientCtx)
 
-			res, err := queryClient.FunToken(cmd.Context(), &evm.QueryFunTokenRequest{
+			res, err := queryClient.FunTokenMapping(cmd.Context(), &evm.QueryFunTokenMappingRequest{
 				Token: args[0],
 			})
 			if err != nil {

diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -741,17 +741,17 @@ func (k *Keeper) TraceEthTxMsg(
 	return &result, txConfig.LogIndex + uint(len(res.Logs)), nil
 }
 
-func (k Keeper) FunToken(
-	goCtx context.Context, req *evm.QueryFunTokenRequest,
-) (*evm.QueryFunTokenResponse, error) {
+func (k Keeper) FunTokenMapping(
+	goCtx context.Context, req *evm.QueryFunTokenMappingRequest,
+) (*evm.QueryFunTokenMappingResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	// first try lookup by cosmos denom
 	bankDenomIter := k.FunTokens.Indexes.BankDenom.ExactMatch(ctx, req.Token)
 	funTokenMappings := k.FunTokens.Collect(ctx, bankDenomIter)
 	if len(funTokenMappings) > 0 {
 		// assumes that there is only one mapping for a given denom
-		return &evm.QueryFunTokenResponse{
+		return &evm.QueryFunTokenMappingResponse{
 			FunToken: &funTokenMappings[0],
 		}, nil
 	}
@@ -760,7 +760,7 @@ func (k Keeper) FunToken(
 	funTokenMappings = k.FunTokens.Collect(ctx, erc20AddrIter)
 	if len(funTokenMappings) > 0 {
 		// assumes that there is only one mapping for a given erc20 address
-		return &evm.QueryFunTokenResponse{
+		return &evm.QueryFunTokenMappingResponse{
 			FunToken: &funTokenMappings[0],
 		}, nil
 	}

diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go
@@ -913,16 +913,16 @@ func (s *Suite) TestTraceBlock() {
 }
 
 func (s *Suite) TestQueryFunToken() {
-	type In = *evm.QueryFunTokenRequest
-	type Out = *evm.QueryFunTokenResponse
+	type In = *evm.QueryFunTokenMappingRequest
+	type Out = *evm.QueryFunTokenMappingResponse
 	testCases := []TestCase[In, Out]{
 		{
 			name: "sad: no token mapping",
 			scenario: func(deps *evmtest.TestDeps) (req In, wantResp Out) {
-				req = &evm.QueryFunTokenRequest{
+				req = &evm.QueryFunTokenMappingRequest{
 					Token: "unibi",
 				}
-				wantResp = &evm.QueryFunTokenResponse{
+				wantResp = &evm.QueryFunTokenMappingResponse{
 					FunToken: nil,
 				}
 				return req, wantResp
@@ -940,10 +940,10 @@ func (s *Suite) TestQueryFunToken() {
 				)
 			},
 			scenario: func(deps *evmtest.TestDeps) (req In, wantResp Out) {
-				req = &evm.QueryFunTokenRequest{
+				req = &evm.QueryFunTokenMappingRequest{
 					Token: "unibi",
 				}
-				wantResp = &evm.QueryFunTokenResponse{
+				wantResp = &evm.QueryFunTokenMappingResponse{
 					FunToken: &evm.FunToken{
 						Erc20Addr:      "0xAEf9437FF23D48D73271a41a8A094DEc9ac71477",
 						BankDenom:      "unibi",
@@ -965,10 +965,10 @@ func (s *Suite) TestQueryFunToken() {
 				)
 			},
 			scenario: func(deps *evmtest.TestDeps) (req In, wantResp Out) {
-				req = &evm.QueryFunTokenRequest{
+				req = &evm.QueryFunTokenMappingRequest{
 					Token: "0xAEf9437FF23D48D73271a41a8A094DEc9ac71477",
 				}
-				wantResp = &evm.QueryFunTokenResponse{
+				wantResp = &evm.QueryFunTokenMappingResponse{
 					FunToken: &evm.FunToken{
 						Erc20Addr:      "0xAEf9437FF23D48D73271a41a8A094DEc9ac71477",
 						BankDenom:      "unibi",
@@ -989,7 +989,7 @@ func (s *Suite) TestQueryFunToken() {
 			}
 			req, wantResp := tc.scenario(&deps)
 			goCtx := sdk.WrapSDKContext(deps.Ctx)
-			gotResp, err := deps.K.FunToken(goCtx, req)
+			gotResp, err := deps.K.FunTokenMapping(goCtx, req)
 			if tc.wantErr != "" {
 				s.Require().ErrorContains(err, tc.wantErr)
 				return