QueryOldestUnconfirmVsc -> QueryOldestUnconfirmedVsc

cosmos · Apr 2, 2024 · 1d136f1 · 1d136f1
1 parent 643c87c
commit 1d136f1
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 187 deletions.
diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto
@@ -100,9 +100,9 @@ service Query {
     "/interchain_security/ccv/provider/params";
     }
 
-  // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID
-  rpc QueryOldestUnconfirmVsc(QueryOldestUnconfirmVscRequest)
-    returns (QueryOldestUnconfirmVscResponse) {
+  // QueryOldestUnconfirmedVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID
+  rpc QueryOldestUnconfirmedVsc(QueryOldestUnconfirmedVscRequest)
+    returns (QueryOldestUnconfirmedVscResponse) {
       option (google.api.http).get =
       "/interchain_security/ccv/provider/oldest_unconfirmed_vsc/{chain_id}";
     }
@@ -219,9 +219,9 @@ message QueryParamsResponse {
   Params params = 1 [(gogoproto.nullable) = false];
 }
 
-message QueryOldestUnconfirmVscRequest { string chain_id = 1; }
+message QueryOldestUnconfirmedVscRequest { string chain_id = 1; }
 
-message QueryOldestUnconfirmVscResponse {
+message QueryOldestUnconfirmedVscResponse {
   interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamp = 1
       [ (gogoproto.nullable) = false ];
 }
diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go
@@ -35,7 +35,7 @@ func NewQueryCmd() *cobra.Command {
 	cmd.AddCommand(CmdProposedConsumerChains())
 	cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID())
 	cmd.AddCommand(CmdProviderParameters())
-	cmd.AddCommand(CmdOldestUnconfirmVsc())
+	cmd.AddCommand(CmdOldestUnconfirmedVsc())
 	return cmd
 }
 
@@ -412,7 +412,7 @@ $ %s query provider params
 
 }
 
-func CmdOldestUnconfirmVsc() *cobra.Command {
+func CmdOldestUnconfirmedVsc() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "oldest_unconfirmed_vsc [chainid]",
 		Short: "Query the send timestamp of the oldest unconfirmed VSCPacket by chain id",
@@ -424,8 +424,8 @@ func CmdOldestUnconfirmVsc() *cobra.Command {
 			}
 			queryClient := types.NewQueryClient(clientCtx)
 
-			req := types.QueryOldestUnconfirmVscRequest{ChainId: args[0]}
-			res, err := queryClient.QueryOldestUnconfirmVsc(cmd.Context(), &req)
+			req := types.QueryOldestUnconfirmedVscRequest{ChainId: args[0]}
+			res, err := queryClient.QueryOldestUnconfirmedVsc(cmd.Context(), &req)
 			if err != nil {
 				return err
 			}

diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go
@@ -225,7 +225,7 @@ func (k Keeper) QueryParams(c context.Context, _ *types.QueryParamsRequest) (*ty
 	return &types.QueryParamsResponse{Params: params}, nil
 }
 
-func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryOldestUnconfirmVscRequest) (*types.QueryOldestUnconfirmVscResponse, error) {
+func (k Keeper) QueryOldestUnconfirmedVsc(goCtx context.Context, req *types.QueryOldestUnconfirmedVscRequest) (*types.QueryOldestUnconfirmedVscResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if req == nil {
@@ -253,5 +253,5 @@ func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryO
 		)
 	}
 
-	return &types.QueryOldestUnconfirmVscResponse{VscSendTimestamp: ts}, nil
+	return &types.QueryOldestUnconfirmedVscResponse{VscSendTimestamp: ts}, nil
 }
diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go
@@ -56,7 +56,7 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) {
 	require.Equal(t, &expectedResult, response.PairValConAddr[0])
 }
 
-func TestQueryOldestUnconfirmVsc(t *testing.T) {
+func TestQueryOldestUnconfirmedVsc(t *testing.T) {
 	chainID := consumer
 
 	pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
@@ -68,19 +68,19 @@ func TestQueryOldestUnconfirmVsc(t *testing.T) {
 	pk.SetConsumerClientId(ctx, chainID, "client-1")
 
 	// Request is nil
-	_, err := pk.QueryOldestUnconfirmVsc(ctx, nil)
+	_, err := pk.QueryOldestUnconfirmedVsc(ctx, nil)
 	require.Error(t, err)
 
 	// Request with chainId is empty
-	_, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{})
+	_, err = pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{})
 	require.Error(t, err)
 
 	// Request with chainId is invalid
-	_, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: "invalidChainId"})
+	_, err = pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: "invalidChainId"})
 	require.Error(t, err)
 
 	// Request is valid
-	response, err := pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: chainID})
+	response, err := pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: chainID})
 	require.NoError(t, err)
 	expectedResult := types.VscSendTimestamp{
 		VscId:     vscID,