rollback ICQ messages renaming

proto/neutron/interchainqueries/query.proto

@@ -26,11 +26,11 @@ service Query {
     option (google.api.http).get = "/neutron/interchainqueries/registered_query";
   }
   // Queries the last successfully submitted result of an Interchain Query.
-  rpc QueryResult(QueryQueryResultRequest) returns (QueryQueryResultResponse) {
+  rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) {
     option (google.api.http).get = "/neutron/interchainqueries/query_result";
   }
   // Queries the last height of a remote chain known to the IBC client behind a given connection ID.
-  rpc LastRemoteHeight(QueryLastRemoteHeightRequest) returns (QueryLastRemoteHeightResponse) {
+  rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) {
     option (google.api.http).get = "/neutron/interchainqueries/remote_height";
   }
 }
@@ -81,19 +81,25 @@ message QueryRegisteredQueryResponse {
 }
 
 // Request type for the Query/QueryResult RPC method.
-message QueryQueryResultRequest {
+message QueryRegisteredQueryResultRequest {
   // ID of an Interchain Query.
   uint64 query_id = 1;
 }
 
 // Response type for the Query/QueryResult RPC method.
-message QueryQueryResultResponse {
+message QueryRegisteredQueryResultResponse {
   // The last successfully submitted result of an Interchain Query.
   QueryResult result = 1;
 }
 
+message Transaction {
+  uint64 id = 1;
+  uint64 height = 2;
+  bytes data = 3;
+}
+
 // Request type for the Query/LastRemoteHeight RPC method.
-message QueryLastRemoteHeightRequest {
+message QueryLastRemoteHeight {
   // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query
   // handling.
   string connection_id = 1;

proto/neutron/interchainqueries/tx.proto

@@ -32,9 +32,9 @@ service Msg {
   // Removes a given Interchain Query and its results from the module. Can be removed only by the
   // owner of the query during the query's submit timeout, and by anyone after the query has been
   // timed out. The query deposit is returned to the caller on a success call.
-  rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse);
+  rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse);
   // Updates parameters of a registered Interchain Query. Only callable by the owner of the query.
-  rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse);
+  rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse);
   // Updates params of the interchainqueries module. Only callable by the module's authority.
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 }
@@ -152,7 +152,7 @@ message TxValue {
 message MsgSubmitQueryResultResponse {}
 
 // Request type for the Msg/RemoveInterchainQuery RPC method.
-message MsgRemoveInterchainQuery {
+message MsgRemoveInterchainQueryRequest {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to remove.
   uint64 query_id = 1;
@@ -164,7 +164,7 @@ message MsgRemoveInterchainQuery {
 message MsgRemoveInterchainQueryResponse {}
 
 // Request type for the Msg/UpdateInterchainQuery RPC method.
-message MsgUpdateInterchainQuery {
+message MsgUpdateInterchainQueryRequest {
   option (cosmos.msg.v1.signer) = "sender";
   // The ID of the query to update.
   uint64 query_id = 1;

wasmbinding/message_plugin.go

@@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) {
-	msg := icqtypes.MsgUpdateInterchainQuery{
+	msg := icqtypes.MsgUpdateInterchainQueryRequest{
 		QueryId:               updateQuery.QueryId,
 		NewKeys:               updateQuery.NewKeys,
 		NewUpdatePeriod:       updateQuery.NewUpdatePeriod,
@@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd
 }
 
 func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) {
-	msg := icqtypes.MsgRemoveInterchainQuery{
+	msg := icqtypes.MsgRemoveInterchainQueryRequest{
 		QueryId: updateQuery.QueryId,
 		Sender:  contractAddr.String(),
 	}

wasmbinding/stargate_allowlist.go

@@ -66,7 +66,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries {
 		"/neutron.interchainqueries.Query/Params":            &interchainqueriestypes.QueryParamsResponse{},
 		"/neutron.interchainqueries.Query/RegisteredQueries": &interchainqueriestypes.QueryRegisteredQueriesResponse{},
 		"/neutron.interchainqueries.Query/RegisteredQuery":   &interchainqueriestypes.QueryRegisteredQueryResponse{},
-		"/neutron.interchainqueries.Query/QueryResult":       &interchainqueriestypes.QueryQueryResultResponse{},
+		"/neutron.interchainqueries.Query/QueryResult":       &interchainqueriestypes.QueryRegisteredQueryResultResponse{},
 		"/neutron.interchainqueries.Query/LastRemoteHeight":  &interchainqueriestypes.QueryLastRemoteHeightResponse{},
 
 		// feeburner

wasmbinding/test/custom_query_test.go

@@ -88,7 +88,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() {
 			QueryID: lastID,
 		},
 	}
-	resp := icqtypes.QueryQueryResultResponse{}
+	resp := icqtypes.QueryRegisteredQueryResultResponse{}
 	err = suite.queryCustom(ctx, contractAddress, query, &resp)
 	suite.Require().NoError(err)
 
@@ -121,7 +121,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResultNotFound() {
 			QueryID: 1,
 		},
 	}
-	resp := icqtypes.QueryQueryResultResponse{}
+	resp := icqtypes.QueryRegisteredQueryResultResponse{}
 	err := suite.queryCustom(ctx, contractAddress, query, &resp)
 	expectedErrMsg := fmt.Sprintf("Generic error: Querier contract error: codespace: interchainqueries, code: %d: query wasm contract failed", icqtypes.ErrNoQueryResult.ABCICode())
 	suite.Require().ErrorContains(err, expectedErrMsg)

x/interchainqueries/client/cli/query.go

@@ -119,7 +119,7 @@ func CmdQueryRegisteredQueryResult() *cobra.Command {
 				return fmt.Errorf("failed to parse query id: %w", err)
 			}
 
-			res, err := queryClient.QueryResult(context.Background(), &types.QueryQueryResultRequest{QueryId: queryID})
+			res, err := queryClient.QueryResult(context.Background(), &types.QueryRegisteredQueryResultRequest{QueryId: queryID})
 			if err != nil {
 				return err
 			}
@@ -142,7 +142,7 @@ func CmdQueryLastRemoteHeight() *cobra.Command {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			connectionID := args[0]
 			queryClient := types.NewQueryClient(clientCtx)
-			res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeightRequest{ConnectionId: connectionID})
+			res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeight{ConnectionId: connectionID})
 			if err != nil {
 				return err
 			}

x/interchainqueries/keeper/grpc_query.go

@@ -75,7 +75,7 @@ func (k Keeper) GetRegisteredQueries(ctx sdk.Context, req *types.QueryRegistered
 	return &types.QueryRegisteredQueriesResponse{RegisteredQueries: queries, Pagination: pageRes}, nil
 }
 
-func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResultRequest) (*types.QueryQueryResultResponse, error) {
+func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegisteredQueryResultRequest) (*types.QueryRegisteredQueryResultResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if !k.checkRegisteredQueryExists(ctx, request.QueryId) {
@@ -86,10 +86,10 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResu
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err)
 	}
-	return &types.QueryQueryResultResponse{Result: result}, nil
+	return &types.QueryRegisteredQueryResultResponse{Result: result}, nil
 }
 
-func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeightRequest) (*types.QueryLastRemoteHeightResponse, error) {
+func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeight) (*types.QueryLastRemoteHeightResponse, error) {
 	req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId}
 	r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req)
 	if err != nil {

x/interchainqueries/keeper/grpc_query_test.go

@@ -25,7 +25,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() {
 			"wrong connection id",
 			func() {
 				ctx := suite.ChainA.GetContext()
-				_, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: "test"})
+				_, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: "test"})
 				suite.Require().Error(err)
 			},
 		},
@@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() {
 			func() {
 				ctx := suite.ChainA.GetContext()
 
-				oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID})
+				oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID})
 				suite.Require().NoError(err)
 				suite.Require().Greater(oldHeight.Height, uint64(0))
 
@@ -44,7 +44,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() {
 					suite.NoError(suite.Path.EndpointA.UpdateClient())
 				}
 
-				updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID})
+				updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID})
 				suite.Require().Equal(updatedHeight.Height, oldHeight.Height+N) // check that last remote height really equals oldHeight+N
 				suite.Require().NoError(err)
 			},
@@ -529,7 +529,7 @@ func (suite *KeeperTestSuite) TestQueryResult() {
 	_, err = msgSrv.SubmitQueryResult(ctx, &msg)
 	suite.NoError(err)
 
-	queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{
+	queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{
 		QueryId: regQuery1.Id,
 	})
 	suite.NoError(err)
@@ -546,12 +546,12 @@ func (suite *KeeperTestSuite) TestQueryResult() {
 	}
 	suite.Equal(len(expectKvResults), len(queryKvResult))
 
-	_, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{
+	_, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{
 		QueryId: regQuery2.Id,
 	})
 	suite.ErrorContains(err, "no query result")
 
-	_, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{
+	_, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{
 		QueryId: regQuery2.Id + 1,
 	})
 	suite.ErrorContains(err, "invalid query id")

x/interchainqueries/keeper/keeper_test.go

@@ -163,7 +163,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() {
 }
 
 func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
-	var msg iqtypes.MsgUpdateInterchainQuery
+	var msg iqtypes.MsgUpdateInterchainQueryRequest
 	originalKVQuery := iqtypes.MsgRegisterInterchainQuery{
 		QueryType: string(iqtypes.InterchainQueryTypeKV),
 		Keys: []*iqtypes.KVKey{
@@ -199,7 +199,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid update period for kv",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:         1,
 					NewKeys:         nil,
 					NewUpdatePeriod: 2,
@@ -215,7 +215,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid update period for tx",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:         1,
 					NewKeys:         nil,
 					NewUpdatePeriod: 2,
@@ -231,7 +231,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid kv query data",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId: 1,
 					NewKeys: []*iqtypes.KVKey{
 						{
@@ -257,7 +257,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid tx filter",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:               1,
 					NewUpdatePeriod:       0,
 					NewTransactionsFilter: "[]",
@@ -273,7 +273,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid kv query both query keys and update period and ignore tx filter",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId: 1,
 					NewKeys: []*iqtypes.KVKey{
 						{
@@ -299,7 +299,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"valid tx query both tx filter and update period and ignore query keys",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:               1,
 					NewUpdatePeriod:       2,
 					NewTransactionsFilter: "[]",
@@ -315,7 +315,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"must fail on update filter for a kv query",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:               1,
 					NewUpdatePeriod:       2,
 					NewTransactionsFilter: "[]",
@@ -331,7 +331,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"must fail on update keys for a tx query",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId: 1,
 					NewKeys: []*iqtypes.KVKey{
 						{
@@ -352,7 +352,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 		{
 			"invalid query id",
 			func(sender string) {
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId: 2,
 					NewKeys: []*iqtypes.KVKey{
 						{
@@ -380,7 +380,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 				codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath)
 				newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID)
 				suite.Require().NotEmpty(newContractAddress)
-				msg = iqtypes.MsgUpdateInterchainQuery{
+				msg = iqtypes.MsgUpdateInterchainQueryRequest{
 					QueryId:         1,
 					NewKeys:         nil,
 					NewUpdatePeriod: 2,
@@ -449,7 +449,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() {
 func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 	suite.SetupTest()
 
-	var msg iqtypes.MsgRemoveInterchainQuery
+	var msg iqtypes.MsgRemoveInterchainQueryRequest
 	var query iqtypes.MsgRegisterInterchainQuery
 	var txQueryHashes [][]byte
 
@@ -461,7 +461,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 		{
 			"valid TX remove",
 			func(sender string) {
-				msg = iqtypes.MsgRemoveInterchainQuery{
+				msg = iqtypes.MsgRemoveInterchainQueryRequest{
 					QueryId: 1,
 					Sender:  sender,
 				}
@@ -483,7 +483,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 		{
 			"valid large TX remove",
 			func(sender string) {
-				msg = iqtypes.MsgRemoveInterchainQuery{
+				msg = iqtypes.MsgRemoveInterchainQueryRequest{
 					QueryId: 1,
 					Sender:  sender,
 				}
@@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 		{
 			"valid KV remove",
 			func(sender string) {
-				msg = iqtypes.MsgRemoveInterchainQuery{
+				msg = iqtypes.MsgRemoveInterchainQueryRequest{
 					QueryId: 1,
 					Sender:  sender,
 				}
@@ -526,7 +526,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 		{
 			"invalid query id",
 			func(sender string) {
-				msg = iqtypes.MsgRemoveInterchainQuery{
+				msg = iqtypes.MsgRemoveInterchainQueryRequest{
 					QueryId: 2,
 					Sender:  sender,
 				}
@@ -551,7 +551,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() {
 				codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath)
 				newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID)
 				suite.Require().NotEmpty(newContractAddress)
-				msg = iqtypes.MsgRemoveInterchainQuery{
+				msg = iqtypes.MsgRemoveInterchainQueryRequest{
 					QueryId: 1,
 					Sender:  newContractAddress.String(),
 				}
@@ -1723,7 +1723,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() {
 
 	newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID)
 	suite.Require().NotEmpty(newContractAddress)
-	resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQuery{
+	resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQueryRequest{
 		QueryId: 1,
 		Sender:  newContractAddress.String(),
 	})

x/interchainqueries/keeper/msg_server.go

@@ -92,7 +92,7 @@ func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg
 	return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil
 }
 
-func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQuery) (*types.MsgRemoveInterchainQueryResponse, error) {
+func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) {
 	if err := msg.Validate(); err != nil {
 		return nil, errors.Wrap(err, "failed to validate MsgRemoveInterchainQueryRequest")
 	}
@@ -119,7 +119,7 @@ func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe
 	return &types.MsgRemoveInterchainQueryResponse{}, nil
 }
 
-func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQuery) (*types.MsgUpdateInterchainQueryResponse, error) {
+func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg)
 	params := m.GetParams(ctx)
@@ -316,7 +316,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit
 // with the query type.
 func (m msgServer) validateUpdateInterchainQueryParams(
 	query *types.RegisteredQuery,
-	msg *types.MsgUpdateInterchainQuery,
+	msg *types.MsgUpdateInterchainQueryRequest,
 ) error {
 	queryType := types.InterchainQueryType(query.GetQueryType())
 	newKvKeysSet := len(msg.GetNewKeys()) != 0