Skip to content

Commit 8851318

Browse files
sotnikov-ssotnikov-s
committed
rollback ICQ messages renaming
1 parent 0464849 commit 8851318

File tree

15 files changed

+563
-309
lines changed

15 files changed

+563
-309
lines changed

‎proto/neutron/interchainqueries/query.proto‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ service Query {
2626
option (google.api.http).get = "/neutron/interchainqueries/registered_query";
2727
}
2828
// Queries the last successfully submitted result of an Interchain Query.
29-
rpc QueryResult(QueryQueryResultRequest) returns (QueryQueryResultResponse) {
29+
rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) {
3030
option (google.api.http).get = "/neutron/interchainqueries/query_result";
3131
}
3232
// Queries the last height of a remote chain known to the IBC client behind a given connection ID.
33-
rpc LastRemoteHeight(QueryLastRemoteHeightRequest) returns (QueryLastRemoteHeightResponse) {
33+
rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) {
3434
option (google.api.http).get = "/neutron/interchainqueries/remote_height";
3535
}
3636
}
@@ -81,19 +81,27 @@ message QueryRegisteredQueryResponse {
8181
}
8282

8383
// Request type for the Query/QueryResult RPC method.
84-
message QueryQueryResultRequest {
84+
message QueryRegisteredQueryResultRequest {
8585
// ID of an Interchain Query.
8686
uint64 query_id = 1;
8787
}
8888

8989
// Response type for the Query/QueryResult RPC method.
90-
message QueryQueryResultResponse {
90+
message QueryRegisteredQueryResultResponse {
9191
// The last successfully submitted result of an Interchain Query.
9292
QueryResult result = 1;
9393
}
9494

95+
message Transaction {
96+
option deprecated = true;
97+
98+
uint64 id = 1;
99+
uint64 height = 2;
100+
bytes data = 3;
101+
}
102+
95103
// Request type for the Query/LastRemoteHeight RPC method.
96-
message QueryLastRemoteHeightRequest {
104+
message QueryLastRemoteHeight {
97105
// Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query
98106
// handling.
99107
string connection_id = 1;

‎proto/neutron/interchainqueries/tx.proto‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ service Msg {
3232
// Removes a given Interchain Query and its results from the module. Can be removed only by the
3333
// owner of the query during the query's submit timeout, and by anyone after the query has been
3434
// timed out. The query deposit is returned to the caller on a success call.
35-
rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse);
35+
rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse);
3636
// Updates parameters of a registered Interchain Query. Only callable by the owner of the query.
37-
rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse);
37+
rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse);
3838
// Updates params of the interchainqueries module. Only callable by the module's authority.
3939
rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
4040
}
@@ -152,7 +152,7 @@ message TxValue {
152152
message MsgSubmitQueryResultResponse {}
153153

154154
// Request type for the Msg/RemoveInterchainQuery RPC method.
155-
message MsgRemoveInterchainQuery {
155+
message MsgRemoveInterchainQueryRequest {
156156
option (cosmos.msg.v1.signer) = "sender";
157157
// The ID of the query to remove.
158158
uint64 query_id = 1;
@@ -164,7 +164,7 @@ message MsgRemoveInterchainQuery {
164164
message MsgRemoveInterchainQueryResponse {}
165165

166166
// Request type for the Msg/UpdateInterchainQuery RPC method.
167-
message MsgUpdateInterchainQuery {
167+
message MsgUpdateInterchainQueryRequest {
168168
option (cosmos.msg.v1.signer) = "sender";
169169
// The ID of the query to update.
170170
uint64 query_id = 1;

‎wasmbinding/message_plugin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd
351351
}
352352

353353
func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) {
354-
msg := icqtypes.MsgUpdateInterchainQuery{
354+
msg := icqtypes.MsgUpdateInterchainQueryRequest{
355355
QueryId: updateQuery.QueryId,
356356
NewKeys: updateQuery.NewKeys,
357357
NewUpdatePeriod: updateQuery.NewUpdatePeriod,
@@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd
402402
}
403403

404404
func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) {
405-
msg := icqtypes.MsgRemoveInterchainQuery{
405+
msg := icqtypes.MsgRemoveInterchainQueryRequest{
406406
QueryId: updateQuery.QueryId,
407407
Sender: contractAddr.String(),
408408
}

‎wasmbinding/stargate_allowlist.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries {
6666
"/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{},
6767
"/neutron.interchainqueries.Query/RegisteredQueries": &interchainqueriestypes.QueryRegisteredQueriesResponse{},
6868
"/neutron.interchainqueries.Query/RegisteredQuery": &interchainqueriestypes.QueryRegisteredQueryResponse{},
69-
"/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryQueryResultResponse{},
69+
"/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryRegisteredQueryResultRequest{},
7070
"/neutron.interchainqueries.Query/LastRemoteHeight": &interchainqueriestypes.QueryLastRemoteHeightResponse{},
7171

7272
// feeburner

‎x/interchainqueries/client/cli/query.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func CmdQueryRegisteredQueryResult() *cobra.Command {
119119
return fmt.Errorf("failed to parse query id: %w", err)
120120
}
121121

122-
res, err := queryClient.QueryResult(context.Background(), &types.QueryQueryResultRequest{QueryId: queryID})
122+
res, err := queryClient.QueryResult(context.Background(), &types.QueryRegisteredQueryResultRequest{QueryId: queryID})
123123
if err != nil {
124124
return err
125125
}
@@ -142,7 +142,7 @@ func CmdQueryLastRemoteHeight() *cobra.Command {
142142
clientCtx := client.GetClientContextFromCmd(cmd)
143143
connectionID := args[0]
144144
queryClient := types.NewQueryClient(clientCtx)
145-
res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeightRequest{ConnectionId: connectionID})
145+
res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeight{ConnectionId: connectionID})
146146
if err != nil {
147147
return err
148148
}

‎x/interchainqueries/client/cli/tx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func RemoveInterchainQueryCmd() *cobra.Command {
4848
return fmt.Errorf("failed to parse query id: %w", err)
4949
}
5050

51-
msg := types.NewMsgRemoveInterchainQuery(sender, queryID)
51+
msg := types.NewMsgRemoveInterchainQueryRequest(sender, queryID)
5252

5353
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
5454
},

‎x/interchainqueries/keeper/grpc_query.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (k Keeper) GetRegisteredQueries(ctx sdk.Context, req *types.QueryRegistered
7575
return &types.QueryRegisteredQueriesResponse{RegisteredQueries: queries, Pagination: pageRes}, nil
7676
}
7777

78-
func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResultRequest) (*types.QueryQueryResultResponse, error) {
78+
func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegisteredQueryResultRequest) (*types.QueryRegisteredQueryResultResponse, error) {
7979
ctx := sdk.UnwrapSDKContext(goCtx)
8080

8181
if !k.checkRegisteredQueryExists(ctx, request.QueryId) {
@@ -86,10 +86,10 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResu
8686
if err != nil {
8787
return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err)
8888
}
89-
return &types.QueryQueryResultResponse{Result: result}, nil
89+
return &types.QueryRegisteredQueryResultResponse{Result: result}, nil
9090
}
9191

92-
func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeightRequest) (*types.QueryLastRemoteHeightResponse, error) {
92+
func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeight) (*types.QueryLastRemoteHeightResponse, error) {
9393
req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId}
9494
r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req)
9595
if err != nil {

‎x/interchainqueries/keeper/msg_server.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg
9292
return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil
9393
}
9494

95-
func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQuery) (*types.MsgRemoveInterchainQueryResponse, error) {
95+
func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) {
9696
if err := msg.Validate(); err != nil {
9797
return nil, errors.Wrap(err, "failed to validate MsgRemoveInterchainQueryRequest")
9898
}
@@ -119,7 +119,7 @@ func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe
119119
return &types.MsgRemoveInterchainQueryResponse{}, nil
120120
}
121121

122-
func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQuery) (*types.MsgUpdateInterchainQueryResponse, error) {
122+
func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) {
123123
ctx := sdk.UnwrapSDKContext(goCtx)
124124
ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg)
125125
params := m.GetParams(ctx)
@@ -316,7 +316,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit
316316
// with the query type.
317317
func (m msgServer) validateUpdateInterchainQueryParams(
318318
query *types.RegisteredQuery,
319-
msg *types.MsgUpdateInterchainQuery,
319+
msg *types.MsgUpdateInterchainQueryRequest,
320320
) error {
321321
queryType := types.InterchainQueryType(query.GetQueryType())
322322
newKvKeysSet := len(msg.GetNewKeys()) != 0

‎x/interchainqueries/types/codec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
1717
(*sdk.Msg)(nil),
1818
&MsgRegisterInterchainQuery{},
1919
&MsgSubmitQueryResult{},
20-
&MsgUpdateInterchainQuery{},
21-
&MsgRemoveInterchainQuery{},
20+
&MsgUpdateInterchainQueryRequest{},
21+
&MsgRemoveInterchainQueryRequest{},
2222
&MsgUpdateParams{},
2323
)
2424
msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)

‎x/interchainqueries/types/message_remove_interchain_query.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ import (
99
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1010
)
1111

12-
var _ sdk.Msg = &MsgRemoveInterchainQuery{}
12+
var _ sdk.Msg = &MsgRemoveInterchainQueryRequest{}
1313

14-
func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQuery {
15-
return MsgRemoveInterchainQuery{
14+
func NewMsgRemoveInterchainQueryRequest(sender string, queryID uint64) MsgRemoveInterchainQueryRequest {
15+
return MsgRemoveInterchainQueryRequest{
1616
QueryId: queryID,
1717
Sender: sender,
1818
}
1919
}
2020

21-
func (msg MsgRemoveInterchainQuery) Route() string {
21+
func (msg MsgRemoveInterchainQueryRequest) Route() string {
2222
return RouterKey
2323
}
2424

25-
func (msg MsgRemoveInterchainQuery) Type() string {
25+
func (msg MsgRemoveInterchainQueryRequest) Type() string {
2626
return "remove-interchain-query"
2727
}
2828

29-
func (msg MsgRemoveInterchainQuery) Validate() error {
29+
func (msg MsgRemoveInterchainQueryRequest) Validate() error {
3030
if msg.GetQueryId() == 0 {
3131
return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0")
3232
}
@@ -42,11 +42,11 @@ func (msg MsgRemoveInterchainQuery) Validate() error {
4242
return nil
4343
}
4444

45-
func (msg MsgRemoveInterchainQuery) GetSignBytes() []byte {
45+
func (msg MsgRemoveInterchainQueryRequest) GetSignBytes() []byte {
4646
return ModuleCdc.MustMarshalJSON(&msg)
4747
}
4848

49-
func (msg MsgRemoveInterchainQuery) GetSigners() []sdk.AccAddress {
49+
func (msg MsgRemoveInterchainQueryRequest) GetSigners() []sdk.AccAddress {
5050
senderAddr, err := sdk.AccAddressFromBech32(msg.Sender)
5151
if err != nil { // should never happen as valid basic rejects invalid addresses
5252
panic(err.Error())

0 commit comments

Comments
 (0)