From c5b2703526af08245ce2cbd20c0402c70e605225 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Mon, 18 Nov 2024 14:19:37 +0300 Subject: [PATCH] rollback ICQ messages renaming --- proto/neutron/interchainqueries/query.proto | 16 +- proto/neutron/interchainqueries/tx.proto | 8 +- wasmbinding/message_plugin.go | 4 +- wasmbinding/stargate_allowlist.go | 2 +- wasmbinding/test/custom_query_test.go | 4 +- x/interchainqueries/client/cli/query.go | 4 +- x/interchainqueries/keeper/grpc_query.go | 6 +- x/interchainqueries/keeper/grpc_query_test.go | 12 +- x/interchainqueries/keeper/keeper_test.go | 36 +- x/interchainqueries/keeper/msg_server.go | 6 +- x/interchainqueries/keeper/msg_server_test.go | 34 +- x/interchainqueries/types/codec.go | 4 +- .../types/message_remove_interchain_query.go | 16 +- x/interchainqueries/types/query.pb.go | 508 +++++++++++++----- x/interchainqueries/types/query.pb.gw.go | 8 +- x/interchainqueries/types/tx.go | 8 +- x/interchainqueries/types/tx.pb.go | 274 +++++----- x/interchainqueries/types/tx_test.go | 9 +- 18 files changed, 605 insertions(+), 354 deletions(-) diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index cbb8ed718..2829badc8 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/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; diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 414e336c2..343257c85 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/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; diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index c1b603d74..ed76a8ed3 100644 --- a/wasmbinding/message_plugin.go +++ b/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(), } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 0f7c18f31..1364c94a4 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/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 diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 5d52a5fa1..d3fecbcf5 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/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) diff --git a/x/interchainqueries/client/cli/query.go b/x/interchainqueries/client/cli/query.go index d63790abd..90f6fea84 100644 --- a/x/interchainqueries/client/cli/query.go +++ b/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 } diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index 367309be2..767109134 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/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 { diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index 73be134ca..0f9908fd3 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/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") diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index b612d0a50..9ac2b5228 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/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(), }) diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 68d7f7b31..50f30fa97 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/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 diff --git a/x/interchainqueries/keeper/msg_server_test.go b/x/interchainqueries/keeper/msg_server_test.go index 7f2bea9f2..26b30bc94 100644 --- a/x/interchainqueries/keeper/msg_server_test.go +++ b/x/interchainqueries/keeper/msg_server_test.go @@ -298,18 +298,18 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { } } -func TestMsgRemoveInterchainQueryValidate(t *testing.T) { +func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgRemoveInterchainQuery + msg types.MsgRemoveInterchainQueryRequest expectedErr error }{ { "invalid query id", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 0, Sender: testutil.TestOwnerAddress, }, @@ -317,7 +317,7 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: "", }, @@ -325,7 +325,7 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: "invalid-sender", }, @@ -343,18 +343,18 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { } } -func TestMsgUpdateInterchainQueryValidate(t *testing.T) { +func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgUpdateInterchainQuery + msg types.MsgUpdateInterchainQueryRequest expectedErr error }{ { "invalid query id", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 0, NewKeys: []*types.KVKey{{ Path: "staking", @@ -367,7 +367,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty keys, update_period and tx filter", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 0, @@ -378,7 +378,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "both keys and filter sent", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -392,7 +392,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "too many keys", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: make([]*types.KVKey, types.DefaultMaxKvQueryKeysCount+1), NewUpdatePeriod: 0, @@ -402,7 +402,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "nil key", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, nil}, NewUpdatePeriod: 0, @@ -412,7 +412,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "duplicated keys", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, {Key: []byte("key1"), Path: "path1"}}, NewUpdatePeriod: 0, @@ -422,7 +422,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty key path", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: ""}}, NewUpdatePeriod: 0, @@ -432,7 +432,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty key id", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte(""), Path: "path"}}, NewUpdatePeriod: 0, @@ -442,7 +442,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -455,7 +455,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index c1698cf14..985707a3e 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -17,8 +17,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { (*sdk.Msg)(nil), &MsgRegisterInterchainQuery{}, &MsgSubmitQueryResult{}, - &MsgUpdateInterchainQuery{}, - &MsgRemoveInterchainQuery{}, + &MsgUpdateInterchainQueryRequest{}, + &MsgRemoveInterchainQueryRequest{}, &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/interchainqueries/types/message_remove_interchain_query.go b/x/interchainqueries/types/message_remove_interchain_query.go index 0667de398..632c4a552 100644 --- a/x/interchainqueries/types/message_remove_interchain_query.go +++ b/x/interchainqueries/types/message_remove_interchain_query.go @@ -9,24 +9,24 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -var _ sdk.Msg = &MsgRemoveInterchainQuery{} +var _ sdk.Msg = &MsgRemoveInterchainQueryRequest{} -func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQuery { - return MsgRemoveInterchainQuery{ +func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQueryRequest { + return MsgRemoveInterchainQueryRequest{ QueryId: queryID, Sender: sender, } } -func (msg MsgRemoveInterchainQuery) Route() string { +func (msg MsgRemoveInterchainQueryRequest) Route() string { return RouterKey } -func (msg MsgRemoveInterchainQuery) Type() string { +func (msg MsgRemoveInterchainQueryRequest) Type() string { return "remove-interchain-query" } -func (msg MsgRemoveInterchainQuery) Validate() error { +func (msg MsgRemoveInterchainQueryRequest) Validate() error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -42,11 +42,11 @@ func (msg MsgRemoveInterchainQuery) Validate() error { return nil } -func (msg MsgRemoveInterchainQuery) GetSignBytes() []byte { +func (msg MsgRemoveInterchainQueryRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgRemoveInterchainQuery) GetSigners() []sdk.AccAddress { +func (msg MsgRemoveInterchainQueryRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index cb08fa6c6..0300e73fa 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -331,23 +331,23 @@ func (m *QueryRegisteredQueryResponse) GetRegisteredQuery() *RegisteredQuery { } // Request type for the Query/QueryResult RPC method. -type QueryQueryResultRequest struct { +type QueryRegisteredQueryResultRequest struct { // ID of an Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } -func (m *QueryQueryResultRequest) Reset() { *m = QueryQueryResultRequest{} } -func (m *QueryQueryResultRequest) String() string { return proto.CompactTextString(m) } -func (*QueryQueryResultRequest) ProtoMessage() {} -func (*QueryQueryResultRequest) Descriptor() ([]byte, []int) { +func (m *QueryRegisteredQueryResultRequest) Reset() { *m = QueryRegisteredQueryResultRequest{} } +func (m *QueryRegisteredQueryResultRequest) String() string { return proto.CompactTextString(m) } +func (*QueryRegisteredQueryResultRequest) ProtoMessage() {} +func (*QueryRegisteredQueryResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{6} } -func (m *QueryQueryResultRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryRegisteredQueryResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryRegisteredQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryQueryResultRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryRegisteredQueryResultRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -357,19 +357,19 @@ func (m *QueryQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryQueryResultRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryQueryResultRequest.Merge(m, src) +func (m *QueryRegisteredQueryResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryRegisteredQueryResultRequest.Merge(m, src) } -func (m *QueryQueryResultRequest) XXX_Size() int { +func (m *QueryRegisteredQueryResultRequest) XXX_Size() int { return m.Size() } -func (m *QueryQueryResultRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryQueryResultRequest.DiscardUnknown(m) +func (m *QueryRegisteredQueryResultRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryRegisteredQueryResultRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryQueryResultRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryRegisteredQueryResultRequest proto.InternalMessageInfo -func (m *QueryQueryResultRequest) GetQueryId() uint64 { +func (m *QueryRegisteredQueryResultRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } @@ -377,23 +377,23 @@ func (m *QueryQueryResultRequest) GetQueryId() uint64 { } // Response type for the Query/QueryResult RPC method. -type QueryQueryResultResponse struct { +type QueryRegisteredQueryResultResponse struct { // The last successfully submitted result of an Interchain Query. Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"` } -func (m *QueryQueryResultResponse) Reset() { *m = QueryQueryResultResponse{} } -func (m *QueryQueryResultResponse) String() string { return proto.CompactTextString(m) } -func (*QueryQueryResultResponse) ProtoMessage() {} -func (*QueryQueryResultResponse) Descriptor() ([]byte, []int) { +func (m *QueryRegisteredQueryResultResponse) Reset() { *m = QueryRegisteredQueryResultResponse{} } +func (m *QueryRegisteredQueryResultResponse) String() string { return proto.CompactTextString(m) } +func (*QueryRegisteredQueryResultResponse) ProtoMessage() {} +func (*QueryRegisteredQueryResultResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{7} } -func (m *QueryQueryResultResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryRegisteredQueryResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryRegisteredQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryQueryResultResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryRegisteredQueryResultResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -403,44 +403,105 @@ func (m *QueryQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryQueryResultResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryQueryResultResponse.Merge(m, src) +func (m *QueryRegisteredQueryResultResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryRegisteredQueryResultResponse.Merge(m, src) } -func (m *QueryQueryResultResponse) XXX_Size() int { +func (m *QueryRegisteredQueryResultResponse) XXX_Size() int { return m.Size() } -func (m *QueryQueryResultResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryQueryResultResponse.DiscardUnknown(m) +func (m *QueryRegisteredQueryResultResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryRegisteredQueryResultResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryQueryResultResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryRegisteredQueryResultResponse proto.InternalMessageInfo -func (m *QueryQueryResultResponse) GetResult() *QueryResult { +func (m *QueryRegisteredQueryResultResponse) GetResult() *QueryResult { if m != nil { return m.Result } return nil } +// Deprecated: Do not use. +type Transaction struct { + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *Transaction) Reset() { *m = Transaction{} } +func (m *Transaction) String() string { return proto.CompactTextString(m) } +func (*Transaction) ProtoMessage() {} +func (*Transaction) Descriptor() ([]byte, []int) { + return fileDescriptor_2254be23ba3ff3b4, []int{8} +} +func (m *Transaction) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Transaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Transaction.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Transaction) XXX_Merge(src proto.Message) { + xxx_messageInfo_Transaction.Merge(m, src) +} +func (m *Transaction) XXX_Size() int { + return m.Size() +} +func (m *Transaction) XXX_DiscardUnknown() { + xxx_messageInfo_Transaction.DiscardUnknown(m) +} + +var xxx_messageInfo_Transaction proto.InternalMessageInfo + +func (m *Transaction) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *Transaction) GetHeight() uint64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *Transaction) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + // Request type for the Query/LastRemoteHeight RPC method. -type QueryLastRemoteHeightRequest struct { +type QueryLastRemoteHeight struct { // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query // handling. ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` } -func (m *QueryLastRemoteHeightRequest) Reset() { *m = QueryLastRemoteHeightRequest{} } -func (m *QueryLastRemoteHeightRequest) String() string { return proto.CompactTextString(m) } -func (*QueryLastRemoteHeightRequest) ProtoMessage() {} -func (*QueryLastRemoteHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{8} +func (m *QueryLastRemoteHeight) Reset() { *m = QueryLastRemoteHeight{} } +func (m *QueryLastRemoteHeight) String() string { return proto.CompactTextString(m) } +func (*QueryLastRemoteHeight) ProtoMessage() {} +func (*QueryLastRemoteHeight) Descriptor() ([]byte, []int) { + return fileDescriptor_2254be23ba3ff3b4, []int{9} } -func (m *QueryLastRemoteHeightRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryLastRemoteHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryLastRemoteHeightRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryLastRemoteHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryLastRemoteHeightRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryLastRemoteHeight.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -450,19 +511,19 @@ func (m *QueryLastRemoteHeightRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryLastRemoteHeightRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryLastRemoteHeightRequest.Merge(m, src) +func (m *QueryLastRemoteHeight) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryLastRemoteHeight.Merge(m, src) } -func (m *QueryLastRemoteHeightRequest) XXX_Size() int { +func (m *QueryLastRemoteHeight) XXX_Size() int { return m.Size() } -func (m *QueryLastRemoteHeightRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryLastRemoteHeightRequest.DiscardUnknown(m) +func (m *QueryLastRemoteHeight) XXX_DiscardUnknown() { + xxx_messageInfo_QueryLastRemoteHeight.DiscardUnknown(m) } -var xxx_messageInfo_QueryLastRemoteHeightRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryLastRemoteHeight proto.InternalMessageInfo -func (m *QueryLastRemoteHeightRequest) GetConnectionId() string { +func (m *QueryLastRemoteHeight) GetConnectionId() string { if m != nil { return m.ConnectionId } @@ -481,7 +542,7 @@ func (m *QueryLastRemoteHeightResponse) Reset() { *m = QueryLastRemoteHe func (m *QueryLastRemoteHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryLastRemoteHeightResponse) ProtoMessage() {} func (*QueryLastRemoteHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{9} + return fileDescriptor_2254be23ba3ff3b4, []int{10} } func (m *QueryLastRemoteHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -531,9 +592,10 @@ func init() { proto.RegisterType((*QueryRegisteredQueriesResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueriesResponse") proto.RegisterType((*QueryRegisteredQueryRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryRequest") proto.RegisterType((*QueryRegisteredQueryResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResponse") - proto.RegisterType((*QueryQueryResultRequest)(nil), "neutron.interchainqueries.QueryQueryResultRequest") - proto.RegisterType((*QueryQueryResultResponse)(nil), "neutron.interchainqueries.QueryQueryResultResponse") - proto.RegisterType((*QueryLastRemoteHeightRequest)(nil), "neutron.interchainqueries.QueryLastRemoteHeightRequest") + proto.RegisterType((*QueryRegisteredQueryResultRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultRequest") + proto.RegisterType((*QueryRegisteredQueryResultResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultResponse") + proto.RegisterType((*Transaction)(nil), "neutron.interchainqueries.Transaction") + proto.RegisterType((*QueryLastRemoteHeight)(nil), "neutron.interchainqueries.QueryLastRemoteHeight") proto.RegisterType((*QueryLastRemoteHeightResponse)(nil), "neutron.interchainqueries.QueryLastRemoteHeightResponse") } @@ -542,53 +604,56 @@ func init() { } var fileDescriptor_2254be23ba3ff3b4 = []byte{ - // 732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x4f, 0x13, 0x41, - 0x14, 0xee, 0x02, 0xae, 0x30, 0x68, 0x80, 0x91, 0x60, 0x59, 0x71, 0x85, 0x25, 0x42, 0xc1, 0x74, - 0x47, 0x8a, 0x28, 0xc6, 0x44, 0x13, 0x4c, 0x54, 0x12, 0x0f, 0xb0, 0x06, 0x0f, 0x5c, 0x9a, 0x6d, - 0x3b, 0xd9, 0x6e, 0x42, 0x67, 0xca, 0xce, 0x14, 0xd9, 0xab, 0xbf, 0xc0, 0xe8, 0x5f, 0x30, 0xf1, - 0x27, 0x78, 0xf4, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x33, 0x3c, 0x98, 0x9d, 0x99, - 0x2d, 0xb4, 0xdb, 0x76, 0x5b, 0x4f, 0x9d, 0x79, 0x7d, 0xdf, 0x7b, 0xdf, 0xfb, 0xde, 0x7b, 0x3b, - 0xe0, 0x2e, 0xc1, 0x0d, 0x1e, 0x50, 0x82, 0x7c, 0xc2, 0x71, 0x50, 0xae, 0xba, 0x3e, 0x39, 0x6c, - 0xe0, 0xc0, 0xc7, 0x0c, 0x45, 0xbf, 0xa1, 0x5d, 0x0f, 0x28, 0xa7, 0x70, 0x56, 0xb9, 0xd9, 0x09, - 0x37, 0x63, 0xb5, 0x4c, 0x59, 0x8d, 0x32, 0x54, 0x72, 0x19, 0x96, 0x18, 0x74, 0xb4, 0x56, 0xc2, - 0xdc, 0x5d, 0x43, 0x75, 0xd7, 0xf3, 0x89, 0xcb, 0x7d, 0x4a, 0x64, 0x18, 0x63, 0xda, 0xa3, 0x1e, - 0x15, 0x47, 0x14, 0x9d, 0x94, 0x75, 0xce, 0xa3, 0xd4, 0x3b, 0xc0, 0xc8, 0xad, 0xfb, 0xc8, 0x25, - 0x84, 0x72, 0x01, 0x61, 0xea, 0xdf, 0xe5, 0xee, 0x0c, 0x3d, 0x4c, 0x30, 0xf3, 0x63, 0xc7, 0xa5, - 0xee, 0x8e, 0x75, 0x37, 0x70, 0x6b, 0xb1, 0x9f, 0xd5, 0xdd, 0x8f, 0x1f, 0x4b, 0x1f, 0x6b, 0x1a, - 0xc0, 0xdd, 0xa8, 0x94, 0x1d, 0x01, 0x74, 0xf0, 0x61, 0x03, 0x33, 0x6e, 0xbd, 0x05, 0x37, 0x5a, - 0xac, 0xac, 0x4e, 0x09, 0xc3, 0xf0, 0x19, 0xd0, 0x65, 0x82, 0xac, 0x36, 0xaf, 0xe5, 0xc6, 0x0b, - 0x0b, 0x76, 0x57, 0xb5, 0x6c, 0x09, 0xdd, 0x1a, 0x39, 0xf9, 0x75, 0x27, 0xe3, 0x28, 0x98, 0xf5, - 0x59, 0x03, 0xb7, 0x45, 0x60, 0x07, 0x7b, 0x3e, 0xe3, 0x38, 0xc0, 0x95, 0x5d, 0xe9, 0xaf, 0x32, - 0xc3, 0x19, 0xa0, 0xd3, 0x77, 0x04, 0x07, 0x51, 0x8a, 0xe1, 0xdc, 0x98, 0xa3, 0x6e, 0x70, 0x11, - 0x5c, 0x2f, 0x53, 0x42, 0x70, 0x39, 0x52, 0xac, 0xe8, 0x57, 0xb2, 0x43, 0xf3, 0x5a, 0x6e, 0xcc, - 0xb9, 0x76, 0x61, 0xdc, 0xae, 0xc0, 0x17, 0x00, 0x5c, 0x74, 0x22, 0x3b, 0x2c, 0x38, 0x2e, 0xd9, - 0xb2, 0x6d, 0x76, 0xd4, 0x36, 0x5b, 0xb6, 0x5a, 0xb5, 0xcd, 0xde, 0x71, 0x3d, 0xac, 0x12, 0x3b, - 0x97, 0x90, 0xd6, 0x77, 0x0d, 0x98, 0xdd, 0x68, 0x2a, 0x29, 0x8a, 0x00, 0x06, 0xcd, 0x3f, 0x8b, - 0xaa, 0x68, 0xc1, 0x79, 0xbc, 0xb0, 0xda, 0x43, 0x96, 0xd6, 0x88, 0xa1, 0xd2, 0x67, 0x2a, 0x68, - 0x4f, 0x04, 0x5f, 0xb6, 0xd4, 0x32, 0x24, 0x6a, 0x59, 0x4e, 0xad, 0x45, 0xb2, 0x6b, 0x29, 0x66, - 0x13, 0xdc, 0xea, 0x50, 0x4b, 0x18, 0x0b, 0x3e, 0x0b, 0x46, 0x45, 0xa0, 0x48, 0xd3, 0xa8, 0xab, - 0x23, 0xce, 0x55, 0x71, 0xdf, 0xae, 0x58, 0x0d, 0x30, 0xd7, 0x19, 0xa9, 0x34, 0xd8, 0x03, 0x93, - 0x6d, 0x1a, 0x84, 0x6a, 0x30, 0x06, 0x50, 0xc0, 0x99, 0x68, 0xad, 0x3d, 0xb4, 0x1e, 0x80, 0x9b, - 0xe2, 0x10, 0x27, 0x6b, 0x1c, 0xf0, 0x3e, 0xc8, 0xee, 0x83, 0x6c, 0x12, 0xa5, 0x88, 0x3e, 0x05, - 0x7a, 0x20, 0x2c, 0x8a, 0xde, 0x52, 0x0f, 0x7a, 0x97, 0xf1, 0x0a, 0x65, 0x3d, 0x57, 0x42, 0xbc, - 0x76, 0x19, 0x77, 0x70, 0x8d, 0x72, 0xfc, 0x0a, 0xfb, 0x5e, 0xb5, 0x49, 0x2b, 0x31, 0x9c, 0x5a, - 0x72, 0x38, 0xad, 0x37, 0x6a, 0xf4, 0x93, 0x41, 0x14, 0xcb, 0x19, 0xa0, 0x57, 0x85, 0x45, 0x95, - 0xa6, 0x6e, 0xd0, 0x00, 0xa3, 0x01, 0x3e, 0xf2, 0x59, 0x3c, 0x07, 0x23, 0x4e, 0xf3, 0x5e, 0xf8, - 0xab, 0x83, 0x2b, 0x22, 0x2a, 0xfc, 0xa8, 0x01, 0x5d, 0xee, 0x1c, 0xcc, 0xa7, 0x95, 0xd7, 0xb2, - 0xec, 0x86, 0xdd, 0xaf, 0xbb, 0xe4, 0x69, 0xad, 0xbc, 0xff, 0xf1, 0xe7, 0xd3, 0xd0, 0x22, 0x5c, - 0x40, 0x69, 0xdf, 0x21, 0xf8, 0x4d, 0x03, 0x53, 0x89, 0x1d, 0x82, 0x9b, 0xe9, 0xf2, 0x77, 0xfe, - 0x3a, 0x18, 0x8f, 0xff, 0x03, 0xa9, 0x58, 0x6f, 0x08, 0xd6, 0x08, 0xe6, 0x7b, 0xb0, 0x4e, 0x6e, - 0x34, 0xfc, 0xaa, 0x81, 0x89, 0xb6, 0x89, 0x85, 0x0f, 0x07, 0x63, 0x11, 0xaf, 0x9a, 0xf1, 0x68, - 0x60, 0x9c, 0xe2, 0xbe, 0x2e, 0xb8, 0xe7, 0xe1, 0xbd, 0xfe, 0xb9, 0x87, 0xf0, 0x8b, 0x06, 0xc6, - 0x2f, 0x0d, 0x33, 0x2c, 0xa4, 0x65, 0x4f, 0xee, 0x9b, 0xb1, 0x3e, 0x10, 0x46, 0xb1, 0x45, 0x82, - 0xed, 0x0a, 0x5c, 0x46, 0x29, 0x4f, 0x6e, 0x51, 0xae, 0x57, 0xa4, 0xf1, 0x64, 0xfb, 0x56, 0xc0, - 0x54, 0xb1, 0xba, 0x2c, 0xa3, 0xb1, 0x39, 0x38, 0x50, 0x11, 0xbf, 0x2f, 0x88, 0xaf, 0xc2, 0x5c, - 0x4f, 0x99, 0x23, 0x60, 0x51, 0xae, 0xe6, 0xd6, 0xde, 0xc9, 0x99, 0xa9, 0x9d, 0x9e, 0x99, 0xda, - 0xef, 0x33, 0x53, 0xfb, 0x70, 0x6e, 0x66, 0x4e, 0xcf, 0xcd, 0xcc, 0xcf, 0x73, 0x33, 0xb3, 0xff, - 0xc4, 0xf3, 0x79, 0xb5, 0x51, 0xb2, 0xcb, 0xb4, 0x16, 0x47, 0xcb, 0xd3, 0xc0, 0x6b, 0x46, 0x3e, - 0xda, 0x40, 0xc7, 0x9d, 0xde, 0xe5, 0xb0, 0x8e, 0x59, 0x49, 0x17, 0x6f, 0xf3, 0xfa, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x88, 0x8a, 0x1e, 0x01, 0xb4, 0x08, 0x00, 0x00, + // 775 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x13, 0x4f, + 0x14, 0xef, 0x94, 0x7e, 0x0b, 0xbc, 0xf2, 0x15, 0x18, 0xd1, 0x94, 0x15, 0x2b, 0x2c, 0x11, 0x0a, + 0xa6, 0xbb, 0xfc, 0x08, 0x8a, 0x8a, 0x98, 0x70, 0x50, 0x49, 0x34, 0x81, 0x55, 0x3c, 0x78, 0x69, + 0xa6, 0xed, 0x64, 0xbb, 0x09, 0xdd, 0x29, 0xbb, 0x53, 0xa4, 0x57, 0x6f, 0xde, 0x8c, 0xfe, 0x0b, + 0xfe, 0x01, 0xde, 0x3c, 0x78, 0xf0, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, 0x98, + 0x9d, 0x99, 0xb6, 0x6c, 0x7f, 0x52, 0x4e, 0x9d, 0x99, 0x7d, 0x9f, 0xf7, 0x3e, 0xef, 0xf3, 0xde, + 0x9b, 0x0e, 0xdc, 0x76, 0x69, 0x85, 0x7b, 0xcc, 0x35, 0x1d, 0x97, 0x53, 0x2f, 0x5f, 0x24, 0x8e, + 0x7b, 0x50, 0xa1, 0x9e, 0x43, 0x7d, 0x33, 0xf8, 0xad, 0x1a, 0x65, 0x8f, 0x71, 0x86, 0x27, 0x95, + 0x99, 0xd1, 0x62, 0xa6, 0x2d, 0xe6, 0x99, 0x5f, 0x62, 0xbe, 0x99, 0x23, 0x3e, 0x95, 0x18, 0xf3, + 0x70, 0x39, 0x47, 0x39, 0x59, 0x36, 0xcb, 0xc4, 0x76, 0x5c, 0xc2, 0x1d, 0xe6, 0x4a, 0x37, 0xda, + 0x84, 0xcd, 0x6c, 0x26, 0x96, 0x66, 0xb0, 0x52, 0xa7, 0x53, 0x36, 0x63, 0xf6, 0x3e, 0x35, 0x49, + 0xd9, 0x31, 0x89, 0xeb, 0x32, 0x2e, 0x20, 0xbe, 0xfa, 0x3a, 0xdf, 0x99, 0xa1, 0x4d, 0x5d, 0xea, + 0x3b, 0x35, 0xc3, 0xb9, 0xce, 0x86, 0x65, 0xe2, 0x91, 0x52, 0xcd, 0x4e, 0xef, 0x6c, 0xc7, 0x8f, + 0xa4, 0x8d, 0x3e, 0x01, 0x78, 0x37, 0x48, 0x65, 0x47, 0x00, 0x2d, 0x7a, 0x50, 0xa1, 0x3e, 0xd7, + 0x5f, 0xc3, 0xd5, 0xd0, 0xa9, 0x5f, 0x66, 0xae, 0x4f, 0xf1, 0x63, 0x88, 0xcb, 0x00, 0x49, 0x34, + 0x8d, 0xd2, 0x89, 0x95, 0x19, 0xa3, 0xa3, 0x5a, 0x86, 0x84, 0x6e, 0xc5, 0x8e, 0x7f, 0xdf, 0x8a, + 0x58, 0x0a, 0xa6, 0x7f, 0x46, 0x70, 0x53, 0x38, 0xb6, 0xa8, 0xed, 0xf8, 0x9c, 0x7a, 0xb4, 0xb0, + 0x2b, 0xed, 0x55, 0x64, 0x7c, 0x1d, 0xe2, 0xec, 0xad, 0x4b, 0xbd, 0x20, 0xc4, 0x40, 0x7a, 0xd8, + 0x52, 0x3b, 0x3c, 0x0b, 0xff, 0xe7, 0x99, 0xeb, 0xd2, 0x7c, 0xa0, 0x58, 0xd6, 0x29, 0x24, 0xa3, + 0xd3, 0x28, 0x3d, 0x6c, 0x8d, 0x34, 0x0e, 0xb7, 0x0b, 0xf8, 0x09, 0x40, 0xa3, 0x12, 0xc9, 0x01, + 0xc1, 0x71, 0xce, 0x90, 0x65, 0x33, 0x82, 0xb2, 0x19, 0xb2, 0xd4, 0xaa, 0x6c, 0xc6, 0x0e, 0xb1, + 0xa9, 0x0a, 0x6c, 0x9d, 0x43, 0xea, 0x3f, 0x10, 0xa4, 0x3a, 0xd1, 0x54, 0x52, 0x64, 0x01, 0x7b, + 0xf5, 0x8f, 0x59, 0x95, 0xb4, 0xe0, 0x9c, 0x58, 0x59, 0xec, 0x22, 0x4b, 0xd8, 0x63, 0x55, 0xe9, + 0x33, 0xee, 0x35, 0x07, 0xc2, 0x4f, 0x43, 0xb9, 0x44, 0x45, 0x2e, 0xf3, 0x3d, 0x73, 0x91, 0xec, + 0x42, 0xc9, 0xac, 0xc3, 0x8d, 0x36, 0xb9, 0x54, 0x6b, 0x82, 0x4f, 0xc2, 0x90, 0x70, 0x14, 0x68, + 0x1a, 0x54, 0x35, 0x66, 0x0d, 0x8a, 0xfd, 0x76, 0x41, 0xaf, 0xc0, 0x54, 0x7b, 0xa4, 0xd2, 0x60, + 0x0f, 0xc6, 0x9a, 0x34, 0xa8, 0xaa, 0xc6, 0xe8, 0x43, 0x01, 0x6b, 0x34, 0x9c, 0x7b, 0x55, 0xdf, + 0x84, 0x99, 0x0e, 0x61, 0x2b, 0xfb, 0xfc, 0x02, 0xb4, 0x0b, 0xa0, 0x77, 0xc3, 0x2b, 0xf2, 0x9b, + 0x10, 0xf7, 0xc4, 0x89, 0xa2, 0x3c, 0xd7, 0x85, 0xf2, 0x79, 0xbc, 0x42, 0xe9, 0x2f, 0x20, 0xf1, + 0xca, 0x23, 0xae, 0x4f, 0x44, 0xf3, 0xe1, 0x2b, 0x10, 0xad, 0x33, 0x89, 0x3a, 0x85, 0xa0, 0x8f, + 0x8b, 0xd4, 0xb1, 0x8b, 0x5c, 0x94, 0x2e, 0x66, 0xa9, 0x1d, 0xc6, 0x10, 0x2b, 0x10, 0x4e, 0x44, + 0x73, 0x8e, 0x58, 0x62, 0xfd, 0x20, 0x9a, 0x44, 0xfa, 0x06, 0x5c, 0x13, 0x51, 0x9e, 0x13, 0x9f, + 0x5b, 0xb4, 0xc4, 0x38, 0x7d, 0x26, 0x01, 0x2d, 0x8d, 0x8f, 0x5a, 0x1b, 0x5f, 0x7f, 0xa9, 0xc6, + 0xaa, 0x19, 0x5d, 0xcf, 0xb6, 0x41, 0x07, 0x85, 0xe8, 0x68, 0x30, 0xe4, 0xd1, 0x43, 0xc7, 0xaf, + 0xf5, 0x58, 0xcc, 0xaa, 0xef, 0x57, 0xde, 0x0f, 0xc2, 0x7f, 0xc2, 0x2b, 0xfe, 0x88, 0x20, 0x2e, + 0xe7, 0x19, 0x67, 0x7a, 0xc9, 0x14, 0xba, 0x48, 0x34, 0xe3, 0xa2, 0xe6, 0x92, 0xa7, 0xbe, 0xf0, + 0xee, 0xe7, 0xdf, 0x4f, 0xd1, 0x59, 0x3c, 0x63, 0xf6, 0xba, 0xe3, 0xf0, 0x77, 0x04, 0xe3, 0x2d, + 0xf3, 0x89, 0xd7, 0x7b, 0x97, 0xb1, 0xfd, 0xcd, 0xa3, 0xdd, 0xbf, 0x04, 0x52, 0xb1, 0x5e, 0x13, + 0xac, 0x4d, 0x9c, 0xe9, 0xc2, 0xba, 0xf5, 0xb6, 0xc0, 0x5f, 0x11, 0x8c, 0x36, 0x35, 0x29, 0xbe, + 0xdb, 0x1f, 0x8b, 0xda, 0x18, 0x6b, 0xf7, 0xfa, 0xc6, 0x29, 0xee, 0xab, 0x82, 0x7b, 0x06, 0xdf, + 0xb9, 0x38, 0xf7, 0x2a, 0xfe, 0x86, 0x20, 0x71, 0x6e, 0x28, 0xf0, 0x46, 0xff, 0xd1, 0x1b, 0xb3, + 0xac, 0x3d, 0xba, 0x24, 0x5a, 0x65, 0x60, 0x8a, 0x0c, 0x16, 0xf0, 0xbc, 0xd9, 0xe3, 0x2f, 0x3e, + 0x2b, 0x47, 0x17, 0x7f, 0x41, 0x30, 0xd6, 0x32, 0x67, 0x4b, 0xbd, 0x48, 0x34, 0x23, 0xb4, 0xf5, + 0x7e, 0x11, 0x75, 0xc6, 0x4b, 0x82, 0xf1, 0x22, 0x4e, 0x77, 0xd5, 0x3c, 0x00, 0x66, 0xe5, 0x9c, + 0x6e, 0xed, 0x1d, 0x9f, 0xa6, 0xd0, 0xc9, 0x69, 0x0a, 0xfd, 0x39, 0x4d, 0xa1, 0x0f, 0x67, 0xa9, + 0xc8, 0xc9, 0x59, 0x2a, 0xf2, 0xeb, 0x2c, 0x15, 0x79, 0xf3, 0xd0, 0x76, 0x78, 0xb1, 0x92, 0x33, + 0xf2, 0xac, 0x54, 0xf3, 0x96, 0x61, 0x9e, 0x5d, 0xf7, 0x7c, 0xb8, 0x66, 0x1e, 0xb5, 0x7b, 0x00, + 0x54, 0xcb, 0xd4, 0xcf, 0xc5, 0xc5, 0x23, 0x60, 0xf5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, + 0x6f, 0x80, 0x31, 0x1d, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -611,9 +676,9 @@ type QueryClient interface { // Queries a registered Interchain Query by ID. RegisteredQuery(ctx context.Context, in *QueryRegisteredQueryRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResponse, error) // Queries the last successfully submitted result of an Interchain Query. - QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) + QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) // Queries the last height of a remote chain known to the IBC client behind a given connection ID. - LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) + LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) } type queryClient struct { @@ -651,8 +716,8 @@ func (c *queryClient) RegisteredQuery(ctx context.Context, in *QueryRegisteredQu return out, nil } -func (c *queryClient) QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) { - out := new(QueryQueryResultResponse) +func (c *queryClient) QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) { + out := new(QueryRegisteredQueryResultResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/QueryResult", in, out, opts...) if err != nil { return nil, err @@ -660,7 +725,7 @@ func (c *queryClient) QueryResult(ctx context.Context, in *QueryQueryResultReque return out, nil } -func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { +func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { out := new(QueryLastRemoteHeightResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/LastRemoteHeight", in, out, opts...) if err != nil { @@ -679,9 +744,9 @@ type QueryServer interface { // Queries a registered Interchain Query by ID. RegisteredQuery(context.Context, *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) // Queries the last successfully submitted result of an Interchain Query. - QueryResult(context.Context, *QueryQueryResultRequest) (*QueryQueryResultResponse, error) + QueryResult(context.Context, *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) // Queries the last height of a remote chain known to the IBC client behind a given connection ID. - LastRemoteHeight(context.Context, *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) + LastRemoteHeight(context.Context, *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -697,10 +762,10 @@ func (*UnimplementedQueryServer) RegisteredQueries(ctx context.Context, req *Que func (*UnimplementedQueryServer) RegisteredQuery(ctx context.Context, req *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisteredQuery not implemented") } -func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryQueryResultRequest) (*QueryQueryResultResponse, error) { +func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryResult not implemented") } -func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) { +func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method LastRemoteHeight not implemented") } @@ -763,7 +828,7 @@ func _Query_RegisteredQuery_Handler(srv interface{}, ctx context.Context, dec fu } func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryQueryResultRequest) + in := new(QueryRegisteredQueryResultRequest) if err := dec(in); err != nil { return nil, err } @@ -775,13 +840,13 @@ func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: "/neutron.interchainqueries.Query/QueryResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryResult(ctx, req.(*QueryQueryResultRequest)) + return srv.(QueryServer).QueryResult(ctx, req.(*QueryRegisteredQueryResultRequest)) } return interceptor(ctx, in, info, handler) } func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryLastRemoteHeightRequest) + in := new(QueryLastRemoteHeight) if err := dec(in); err != nil { return nil, err } @@ -793,7 +858,7 @@ func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec f FullMethod: "/neutron.interchainqueries.Query/LastRemoteHeight", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeightRequest)) + return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeight)) } return interceptor(ctx, in, info, handler) } @@ -1046,7 +1111,7 @@ func (m *QueryRegisteredQueryResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryQueryResultRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryRegisteredQueryResultRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1056,12 +1121,12 @@ func (m *QueryQueryResultRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1074,7 +1139,7 @@ func (m *QueryQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryQueryResultResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryRegisteredQueryResultResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1084,12 +1149,12 @@ func (m *QueryQueryResultResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1109,7 +1174,47 @@ func (m *QueryQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryLastRemoteHeightRequest) Marshal() (dAtA []byte, err error) { +func (m *Transaction) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Transaction) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Transaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x1a + } + if m.Height != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x10 + } + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryLastRemoteHeight) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1119,12 +1224,12 @@ func (m *QueryLastRemoteHeightRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryLastRemoteHeightRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLastRemoteHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1270,7 +1375,7 @@ func (m *QueryRegisteredQueryResponse) Size() (n int) { return n } -func (m *QueryQueryResultRequest) Size() (n int) { +func (m *QueryRegisteredQueryResultRequest) Size() (n int) { if m == nil { return 0 } @@ -1282,7 +1387,7 @@ func (m *QueryQueryResultRequest) Size() (n int) { return n } -func (m *QueryQueryResultResponse) Size() (n int) { +func (m *QueryRegisteredQueryResultResponse) Size() (n int) { if m == nil { return 0 } @@ -1295,7 +1400,26 @@ func (m *QueryQueryResultResponse) Size() (n int) { return n } -func (m *QueryLastRemoteHeightRequest) Size() (n int) { +func (m *Transaction) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Id != 0 { + n += 1 + sovQuery(uint64(m.Id)) + } + if m.Height != 0 { + n += 1 + sovQuery(uint64(m.Height)) + } + l = len(m.Data) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryLastRemoteHeight) Size() (n int) { if m == nil { return 0 } @@ -1887,7 +2011,7 @@ func (m *QueryRegisteredQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { +func (m *QueryRegisteredQueryResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1910,10 +2034,10 @@ func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryQueryResultRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1956,7 +2080,7 @@ func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { +func (m *QueryRegisteredQueryResultResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1979,10 +2103,10 @@ func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryQueryResultResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2042,7 +2166,129 @@ func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryLastRemoteHeightRequest) Unmarshal(dAtA []byte) error { +func (m *Transaction) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Transaction: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Transaction: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + } + m.Id = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryLastRemoteHeight) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2065,10 +2311,10 @@ func (m *QueryLastRemoteHeightRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryLastRemoteHeightRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryLastRemoteHeight: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryLastRemoteHeightRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryLastRemoteHeight: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchainqueries/types/query.pb.gw.go b/x/interchainqueries/types/query.pb.gw.go index c59d065af..8cbfcdc6f 100644 --- a/x/interchainqueries/types/query.pb.gw.go +++ b/x/interchainqueries/types/query.pb.gw.go @@ -128,7 +128,7 @@ var ( ) func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryQueryResultRequest + var protoReq QueryRegisteredQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -144,7 +144,7 @@ func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshale } func local_request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryQueryResultRequest + var protoReq QueryRegisteredQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -164,7 +164,7 @@ var ( ) func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeightRequest + var protoReq QueryLastRemoteHeight var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -180,7 +180,7 @@ func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Mar } func local_request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeightRequest + var protoReq QueryLastRemoteHeight var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index d40da497f..7e1fbb766 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -134,9 +134,9 @@ func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { //---------------------------------------------------------------- -var _ sdk.Msg = &MsgUpdateInterchainQuery{} +var _ sdk.Msg = &MsgUpdateInterchainQueryRequest{} -func (msg MsgUpdateInterchainQuery) Validate(params Params) error { +func (msg MsgUpdateInterchainQueryRequest) Validate(params Params) error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -179,11 +179,11 @@ func (msg MsgUpdateInterchainQuery) Validate(params Params) error { return nil } -func (msg MsgUpdateInterchainQuery) GetSignBytes() []byte { +func (msg MsgUpdateInterchainQueryRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgUpdateInterchainQuery) GetSigners() []sdk.AccAddress { +func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 1f10becdc..266884af2 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -600,25 +600,25 @@ func (m *MsgSubmitQueryResultResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitQueryResultResponse proto.InternalMessageInfo // Request type for the Msg/RemoveInterchainQuery RPC method. -type MsgRemoveInterchainQuery struct { +type MsgRemoveInterchainQueryRequest struct { // The ID of the query to remove. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // The signer of the message. Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgRemoveInterchainQuery) Reset() { *m = MsgRemoveInterchainQuery{} } -func (m *MsgRemoveInterchainQuery) String() string { return proto.CompactTextString(m) } -func (*MsgRemoveInterchainQuery) ProtoMessage() {} -func (*MsgRemoveInterchainQuery) Descriptor() ([]byte, []int) { +func (m *MsgRemoveInterchainQueryRequest) Reset() { *m = MsgRemoveInterchainQueryRequest{} } +func (m *MsgRemoveInterchainQueryRequest) String() string { return proto.CompactTextString(m) } +func (*MsgRemoveInterchainQueryRequest) ProtoMessage() {} +func (*MsgRemoveInterchainQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{8} } -func (m *MsgRemoveInterchainQuery) XXX_Unmarshal(b []byte) error { +func (m *MsgRemoveInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRemoveInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRemoveInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRemoveInterchainQuery.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRemoveInterchainQueryRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -628,26 +628,26 @@ func (m *MsgRemoveInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgRemoveInterchainQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRemoveInterchainQuery.Merge(m, src) +func (m *MsgRemoveInterchainQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRemoveInterchainQueryRequest.Merge(m, src) } -func (m *MsgRemoveInterchainQuery) XXX_Size() int { +func (m *MsgRemoveInterchainQueryRequest) XXX_Size() int { return m.Size() } -func (m *MsgRemoveInterchainQuery) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRemoveInterchainQuery.DiscardUnknown(m) +func (m *MsgRemoveInterchainQueryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRemoveInterchainQueryRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgRemoveInterchainQuery proto.InternalMessageInfo +var xxx_messageInfo_MsgRemoveInterchainQueryRequest proto.InternalMessageInfo -func (m *MsgRemoveInterchainQuery) GetQueryId() uint64 { +func (m *MsgRemoveInterchainQueryRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgRemoveInterchainQuery) GetSender() string { +func (m *MsgRemoveInterchainQueryRequest) GetSender() string { if m != nil { return m.Sender } @@ -692,7 +692,7 @@ func (m *MsgRemoveInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveInterchainQueryResponse proto.InternalMessageInfo // Request type for the Msg/UpdateInterchainQuery RPC method. -type MsgUpdateInterchainQuery struct { +type MsgUpdateInterchainQueryRequest struct { // The ID of the query to update. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // A new list of KV-storage keys for which to get values from the remote chain. Only applicable @@ -710,18 +710,18 @@ type MsgUpdateInterchainQuery struct { Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgUpdateInterchainQuery) Reset() { *m = MsgUpdateInterchainQuery{} } -func (m *MsgUpdateInterchainQuery) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateInterchainQuery) ProtoMessage() {} -func (*MsgUpdateInterchainQuery) Descriptor() ([]byte, []int) { +func (m *MsgUpdateInterchainQueryRequest) Reset() { *m = MsgUpdateInterchainQueryRequest{} } +func (m *MsgUpdateInterchainQueryRequest) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateInterchainQueryRequest) ProtoMessage() {} +func (*MsgUpdateInterchainQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{10} } -func (m *MsgUpdateInterchainQuery) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateInterchainQuery.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateInterchainQueryRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -731,47 +731,47 @@ func (m *MsgUpdateInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgUpdateInterchainQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateInterchainQuery.Merge(m, src) +func (m *MsgUpdateInterchainQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateInterchainQueryRequest.Merge(m, src) } -func (m *MsgUpdateInterchainQuery) XXX_Size() int { +func (m *MsgUpdateInterchainQueryRequest) XXX_Size() int { return m.Size() } -func (m *MsgUpdateInterchainQuery) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateInterchainQuery.DiscardUnknown(m) +func (m *MsgUpdateInterchainQueryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateInterchainQueryRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateInterchainQuery proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateInterchainQueryRequest proto.InternalMessageInfo -func (m *MsgUpdateInterchainQuery) GetQueryId() uint64 { +func (m *MsgUpdateInterchainQueryRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgUpdateInterchainQuery) GetNewKeys() []*KVKey { +func (m *MsgUpdateInterchainQueryRequest) GetNewKeys() []*KVKey { if m != nil { return m.NewKeys } return nil } -func (m *MsgUpdateInterchainQuery) GetNewUpdatePeriod() uint64 { +func (m *MsgUpdateInterchainQueryRequest) GetNewUpdatePeriod() uint64 { if m != nil { return m.NewUpdatePeriod } return 0 } -func (m *MsgUpdateInterchainQuery) GetNewTransactionsFilter() string { +func (m *MsgUpdateInterchainQueryRequest) GetNewTransactionsFilter() string { if m != nil { return m.NewTransactionsFilter } return "" } -func (m *MsgUpdateInterchainQuery) GetSender() string { +func (m *MsgUpdateInterchainQueryRequest) GetSender() string { if m != nil { return m.Sender } @@ -916,9 +916,9 @@ func init() { proto.RegisterType((*Block)(nil), "neutron.interchainqueries.Block") proto.RegisterType((*TxValue)(nil), "neutron.interchainqueries.TxValue") proto.RegisterType((*MsgSubmitQueryResultResponse)(nil), "neutron.interchainqueries.MsgSubmitQueryResultResponse") - proto.RegisterType((*MsgRemoveInterchainQuery)(nil), "neutron.interchainqueries.MsgRemoveInterchainQuery") + proto.RegisterType((*MsgRemoveInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryRequest") proto.RegisterType((*MsgRemoveInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryResponse") - proto.RegisterType((*MsgUpdateInterchainQuery)(nil), "neutron.interchainqueries.MsgUpdateInterchainQuery") + proto.RegisterType((*MsgUpdateInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryRequest") proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchainqueries.MsgUpdateParams") proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchainqueries.MsgUpdateParamsResponse") @@ -929,81 +929,81 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 1169 bytes of a gzipped FileDescriptorProto + // 1170 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x1b, 0xc7, - 0x17, 0x67, 0x8d, 0x0d, 0xf8, 0x61, 0x20, 0xcc, 0x97, 0x7c, 0x31, 0x4e, 0x71, 0xc8, 0x56, 0x4d, - 0x10, 0x4a, 0x76, 0x15, 0x87, 0x50, 0x35, 0xa8, 0x3f, 0xa0, 0x6d, 0x54, 0x84, 0x50, 0xe9, 0x02, - 0x39, 0xe4, 0xb2, 0x5a, 0xef, 0x0e, 0xeb, 0x91, 0xd7, 0x33, 0xee, 0xee, 0xf8, 0xd7, 0xa1, 0x52, - 0xd5, 0x5b, 0x7b, 0x69, 0xfa, 0x47, 0x54, 0xaa, 0xd4, 0x0b, 0x87, 0x4a, 0xfd, 0x0b, 0x2a, 0xe5, - 0x18, 0xf5, 0xd4, 0x43, 0x55, 0x55, 0x70, 0xe0, 0xd8, 0x3f, 0xa0, 0x97, 0x6a, 0x66, 0x76, 0x8d, - 0x01, 0xdb, 0x84, 0x5c, 0x60, 0xdf, 0x7b, 0x9f, 0xf7, 0xe6, 0xf3, 0xde, 0xcc, 0x7b, 0xcf, 0xa0, - 0x53, 0xdc, 0xe0, 0x21, 0xa3, 0x26, 0xa1, 0x1c, 0x87, 0x6e, 0xc5, 0x21, 0xf4, 0xcb, 0x06, 0x0e, - 0x09, 0x8e, 0x4c, 0xde, 0x36, 0xea, 0x21, 0xe3, 0x0c, 0x2d, 0xc4, 0x18, 0xe3, 0x12, 0xa6, 0x30, - 0xeb, 0xd4, 0x08, 0x65, 0xa6, 0xfc, 0xab, 0xd0, 0x85, 0x79, 0x97, 0x45, 0x35, 0x16, 0x99, 0xb5, - 0xc8, 0x37, 0x9b, 0x0f, 0xc5, 0xbf, 0xd8, 0xb0, 0xa0, 0x0c, 0xb6, 0x94, 0x4c, 0x25, 0xc4, 0xa6, - 0x39, 0x9f, 0xf9, 0x4c, 0xe9, 0xc5, 0x57, 0xe2, 0xe0, 0x33, 0xe6, 0x07, 0xd8, 0x94, 0x52, 0xb9, - 0x71, 0x68, 0x3a, 0xb4, 0x13, 0x9b, 0xee, 0x0d, 0xa6, 0xed, 0x63, 0x8a, 0x23, 0x92, 0x44, 0xbe, - 0x3b, 0x18, 0x58, 0x77, 0x42, 0xa7, 0x96, 0xe0, 0x6e, 0x71, 0x4c, 0x3d, 0x1c, 0xd6, 0x08, 0xe5, - 0xa6, 0x53, 0x76, 0x89, 0xc9, 0x3b, 0x75, 0x9c, 0x18, 0x17, 0x7b, 0x8c, 0x6e, 0xd8, 0xa9, 0x73, - 0x26, 0x38, 0xb1, 0x43, 0x65, 0xd6, 0x7f, 0x48, 0x41, 0x61, 0x27, 0xf2, 0x2d, 0xec, 0x93, 0x88, - 0xe3, 0x70, 0xab, 0x7b, 0xd2, 0x17, 0x0d, 0x1c, 0x76, 0xd0, 0x22, 0x80, 0x38, 0xb2, 0x63, 0x8b, - 0x90, 0x79, 0x6d, 0x49, 0x5b, 0xce, 0x5a, 0x59, 0xa9, 0xd9, 0xef, 0xd4, 0x31, 0x5a, 0x85, 0x74, - 0x15, 0x77, 0xa2, 0x7c, 0x6a, 0x69, 0x74, 0x79, 0xb2, 0xb4, 0x64, 0x0c, 0x2c, 0xb6, 0xb1, 0xfd, - 0x6c, 0x1b, 0x77, 0x2c, 0x89, 0x46, 0x26, 0xfc, 0x8f, 0x87, 0x0e, 0x8d, 0x1c, 0x97, 0x13, 0x46, - 0x23, 0xfb, 0x90, 0x04, 0x1c, 0x87, 0xf9, 0x51, 0x19, 0x1d, 0xf5, 0x9a, 0x9e, 0x4a, 0x0b, 0x7a, - 0x1b, 0xa6, 0x5c, 0x46, 0x29, 0x96, 0x4a, 0x9b, 0x78, 0xf9, 0xb4, 0x84, 0xe6, 0xce, 0x94, 0x5b, - 0x9e, 0x00, 0x35, 0xea, 0x9e, 0xc3, 0xb1, 0x5d, 0xc7, 0x21, 0x61, 0x5e, 0x3e, 0xb3, 0xa4, 0x2d, - 0xa7, 0xad, 0x9c, 0x52, 0xee, 0x4a, 0x1d, 0xfa, 0x3f, 0x8c, 0x45, 0xb2, 0x1e, 0xf9, 0x31, 0x19, - 0x22, 0x96, 0x9e, 0x4c, 0x7e, 0x73, 0x7a, 0xb4, 0x12, 0x0b, 0xfa, 0x2a, 0xe8, 0x83, 0x4b, 0x62, - 0xe1, 0xa8, 0xce, 0x68, 0x84, 0xd1, 0x34, 0xa4, 0x88, 0x27, 0x4b, 0x92, 0xb6, 0x52, 0xc4, 0xd3, - 0x7f, 0xd5, 0x60, 0x6e, 0x27, 0xf2, 0xf7, 0x1a, 0xe5, 0x1a, 0xe1, 0x09, 0xb4, 0x11, 0x70, 0xb4, - 0x00, 0x13, 0xaa, 0x86, 0x5d, 0xf8, 0xb8, 0x94, 0xb7, 0x7a, 0xe9, 0xa4, 0x7a, 0xe9, 0xa0, 0xdb, - 0x90, 0x75, 0x03, 0x82, 0x29, 0x17, 0x3e, 0xb2, 0x2e, 0x9b, 0xa9, 0xbc, 0x66, 0x4d, 0x28, 0xe5, - 0x96, 0x87, 0x3e, 0x80, 0xb1, 0x50, 0x46, 0x97, 0xa5, 0x98, 0x2c, 0xdd, 0x1d, 0x52, 0xfa, 0x1e, - 0x2e, 0x56, 0xec, 0x75, 0x3e, 0xdf, 0x7f, 0x34, 0x98, 0xec, 0x25, 0xfc, 0x14, 0xa0, 0xda, 0xb4, - 0x15, 0x32, 0xca, 0x6b, 0xf2, 0x6e, 0xef, 0x0d, 0x39, 0x60, 0x8f, 0xb3, 0xd0, 0xf1, 0xf1, 0x33, - 0x27, 0x68, 0x60, 0x2b, 0x5b, 0x6d, 0xaa, 0x30, 0x11, 0x5a, 0x83, 0x4c, 0x39, 0x60, 0x6e, 0x55, - 0x26, 0x37, 0xfc, 0x79, 0x6c, 0x0a, 0x9c, 0xa5, 0xe0, 0xa2, 0x2a, 0x15, 0x4c, 0xfc, 0x0a, 0x97, - 0xa9, 0xa7, 0xad, 0x58, 0x42, 0x05, 0x98, 0x08, 0x71, 0x93, 0x44, 0x84, 0x51, 0x99, 0x76, 0xda, - 0xea, 0xca, 0xe8, 0x3e, 0x20, 0x27, 0x08, 0x58, 0xcb, 0xae, 0x36, 0x6d, 0xd7, 0x09, 0x82, 0xb2, - 0xe3, 0x56, 0x23, 0xf9, 0x04, 0x26, 0xac, 0x1b, 0xd2, 0xb2, 0xdd, 0xfc, 0x38, 0xd1, 0xeb, 0x2f, - 0x34, 0xc8, 0xf5, 0xb2, 0x46, 0xef, 0xc0, 0x74, 0xa4, 0x64, 0xbb, 0x1e, 0xe2, 0x43, 0xd2, 0x8e, - 0xdf, 0xfa, 0x54, 0xac, 0xdd, 0x95, 0x4a, 0x74, 0x03, 0x46, 0xab, 0xb8, 0x23, 0xf3, 0xc9, 0x59, - 0xe2, 0x13, 0xcd, 0x41, 0xa6, 0x29, 0x22, 0x48, 0xaa, 0x39, 0x4b, 0x09, 0xe8, 0x21, 0x64, 0x76, - 0x45, 0x93, 0xc5, 0xb7, 0x73, 0xcb, 0x38, 0x6b, 0x42, 0x43, 0x35, 0xa1, 0x21, 0xed, 0x9f, 0xd7, - 0x23, 0x4b, 0x21, 0xf5, 0x9f, 0x35, 0xc8, 0xc8, 0x2a, 0xa0, 0x8f, 0x60, 0x96, 0xe2, 0x36, 0xb7, - 0x65, 0x31, 0xec, 0x0a, 0x76, 0xc4, 0xfb, 0xd0, 0x64, 0xa0, 0x39, 0x43, 0x8d, 0x15, 0x23, 0x19, - 0x2b, 0xc6, 0x06, 0xed, 0x58, 0x33, 0x02, 0x2e, 0x7d, 0x3f, 0x93, 0x60, 0x74, 0x5f, 0x14, 0xd0, - 0x49, 0x9e, 0xd5, 0x20, 0xb7, 0x18, 0x83, 0x4a, 0x90, 0xe2, 0x6d, 0xc9, 0x7f, 0xb2, 0xa4, 0x0f, - 0xb9, 0xa3, 0xfd, 0xb6, 0xba, 0xe1, 0x14, 0x6f, 0xeb, 0x7f, 0x6a, 0x30, 0x1e, 0xcb, 0xe8, 0x3d, - 0x71, 0x2d, 0xaa, 0x29, 0x62, 0x9a, 0x8b, 0xbd, 0xf9, 0x8a, 0x89, 0x64, 0x7c, 0xda, 0xc6, 0xee, - 0x7e, 0x3b, 0x7e, 0x84, 0x5d, 0x38, 0xfa, 0x10, 0xa6, 0x3d, 0x1c, 0x90, 0xa6, 0xe8, 0x0e, 0x39, - 0x95, 0x62, 0xc2, 0xf9, 0x41, 0x05, 0xb3, 0xa6, 0x12, 0xbc, 0x14, 0xd1, 0x06, 0xcc, 0x10, 0xea, - 0x06, 0x0d, 0xf1, 0x06, 0xe2, 0x08, 0xa3, 0x57, 0x44, 0x98, 0xee, 0x3a, 0xa8, 0x10, 0x08, 0xd2, - 0x9e, 0xc3, 0x1d, 0x79, 0x55, 0x39, 0x4b, 0x7e, 0xeb, 0x45, 0x78, 0xab, 0x5f, 0x2b, 0x27, 0xbd, - 0xaf, 0x3f, 0x87, 0xbc, 0x9c, 0x10, 0x35, 0xd6, 0xc4, 0x17, 0x47, 0xe6, 0xf5, 0xdb, 0xfd, 0x7c, - 0x37, 0xea, 0xb0, 0x34, 0x28, 0x76, 0xf7, 0xfc, 0x7f, 0x35, 0x49, 0xe0, 0x40, 0x8e, 0xb6, 0x6b, - 0x10, 0x58, 0x87, 0x09, 0x8a, 0x5b, 0xf6, 0xb5, 0x66, 0xf6, 0x38, 0xc5, 0xad, 0x6d, 0x31, 0xb6, - 0x57, 0xc4, 0xbb, 0x6c, 0xd9, 0xe7, 0x87, 0xac, 0xea, 0xd0, 0x19, 0x8a, 0x5b, 0x07, 0xbd, 0x73, - 0x76, 0x0d, 0xe6, 0x05, 0xb6, 0xdf, 0x98, 0x57, 0xb3, 0xfb, 0x26, 0xc5, 0xad, 0xfd, 0xcb, 0x93, - 0xfe, 0xac, 0x42, 0x99, 0xab, 0x2a, 0xd4, 0x37, 0xf9, 0x6e, 0x85, 0x7e, 0xd3, 0x60, 0xa6, 0x0b, - 0xda, 0x95, 0xdb, 0x12, 0xad, 0x41, 0xd6, 0x69, 0xf0, 0x0a, 0x0b, 0x09, 0xef, 0xa8, 0xfe, 0xde, - 0xcc, 0xff, 0xfe, 0xcb, 0x83, 0xb9, 0x78, 0x9d, 0x6f, 0x78, 0x5e, 0x88, 0xa3, 0x68, 0x8f, 0x87, - 0x84, 0xfa, 0xd6, 0x19, 0x14, 0x7d, 0x02, 0x63, 0x6a, 0xdf, 0xc6, 0xaf, 0xf3, 0xce, 0x90, 0x9a, - 0xa9, 0xa3, 0x36, 0xb3, 0x2f, 0xff, 0xba, 0x3d, 0xf2, 0xd3, 0xe9, 0xd1, 0x8a, 0x66, 0xc5, 0xbe, - 0x4f, 0x56, 0x45, 0x0a, 0x67, 0x51, 0xbf, 0x3b, 0x3d, 0x5a, 0xb9, 0x73, 0x79, 0xb1, 0x5f, 0xe0, - 0xac, 0x2f, 0xc0, 0xfc, 0x05, 0x55, 0x92, 0x62, 0xe9, 0xc7, 0x0c, 0x8c, 0xee, 0x44, 0x3e, 0xfa, - 0x5e, 0x83, 0xf9, 0x41, 0xfb, 0xfb, 0xf1, 0x10, 0xaa, 0x83, 0x77, 0x5c, 0xe1, 0xfd, 0x37, 0x72, - 0xeb, 0xae, 0xc6, 0xaf, 0x60, 0xf6, 0xf2, 0x1a, 0x34, 0x87, 0xc7, 0xbc, 0xe4, 0x50, 0x78, 0xf7, - 0x9a, 0x0e, 0xdd, 0xe3, 0xbf, 0xd5, 0xe0, 0x66, 0xff, 0xde, 0x7c, 0x74, 0x55, 0x5e, 0x7d, 0x9c, - 0x0a, 0xeb, 0x6f, 0xe0, 0x74, 0x8e, 0x4b, 0xff, 0x36, 0xbd, 0x82, 0x4b, 0x5f, 0xa7, 0xab, 0xb8, - 0x0c, 0xed, 0x09, 0x44, 0x21, 0x77, 0xae, 0x1f, 0x56, 0x5e, 0x27, 0x98, 0xc2, 0x16, 0x4a, 0xaf, - 0x8f, 0x4d, 0xce, 0x2b, 0x64, 0xbe, 0x16, 0x0d, 0xb0, 0x79, 0xf0, 0xf2, 0xb8, 0xa8, 0xbd, 0x3a, - 0x2e, 0x6a, 0x7f, 0x1f, 0x17, 0xb5, 0x17, 0x27, 0xc5, 0x91, 0x57, 0x27, 0xc5, 0x91, 0x3f, 0x4e, - 0x8a, 0x23, 0xcf, 0xd7, 0x7d, 0xc2, 0x2b, 0x8d, 0xb2, 0xe1, 0xb2, 0x9a, 0x19, 0x87, 0x7f, 0xc0, - 0x42, 0x3f, 0xf9, 0x36, 0x9b, 0x8f, 0xcd, 0x76, 0xbf, 0x1f, 0xf7, 0xe2, 0xe7, 0x6d, 0x79, 0x4c, - 0x2e, 0xb3, 0x47, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x36, 0x3d, 0xe1, 0x10, 0x06, 0x0c, 0x00, - 0x00, + 0x17, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x40, 0x32, 0x5f, 0xf2, 0xc5, 0x38, 0x8d, 0x43, 0xb6, 0x6a, + 0x12, 0xa1, 0x64, 0x57, 0x71, 0x09, 0x55, 0x41, 0xfd, 0x01, 0x6d, 0xa3, 0x22, 0x84, 0x4a, 0x17, + 0xc8, 0xa1, 0x97, 0xd5, 0x7a, 0x77, 0x58, 0x8f, 0xbc, 0x9e, 0x71, 0x76, 0x66, 0xfd, 0xe3, 0x50, + 0xa9, 0xca, 0xb1, 0x97, 0xd2, 0xff, 0xa2, 0x52, 0x2f, 0x48, 0xad, 0xd4, 0xbf, 0xa0, 0x52, 0x8e, + 0x51, 0x4f, 0x3d, 0x54, 0x55, 0x05, 0x07, 0x8e, 0xfd, 0x17, 0xaa, 0xf9, 0xb1, 0xc6, 0xc4, 0xd8, + 0x04, 0x2e, 0xb0, 0xef, 0xbd, 0xcf, 0x7b, 0xf3, 0x99, 0x37, 0xef, 0x87, 0x81, 0x49, 0x50, 0xc2, + 0x63, 0x4a, 0x6c, 0x4c, 0x38, 0x8a, 0xfd, 0x9a, 0x87, 0xc9, 0x8b, 0x04, 0xc5, 0x18, 0x31, 0x9b, + 0x77, 0xac, 0x66, 0x4c, 0x39, 0x85, 0xf3, 0x1a, 0x63, 0x0d, 0x60, 0x4a, 0x37, 0xbd, 0x06, 0x26, + 0xd4, 0x96, 0x7f, 0x15, 0xba, 0x34, 0xe7, 0x53, 0xd6, 0xa0, 0xcc, 0x6e, 0xb0, 0xd0, 0x6e, 0x3d, + 0x11, 0xff, 0xb4, 0x61, 0x5e, 0x19, 0x5c, 0x29, 0xd9, 0x4a, 0xd0, 0xa6, 0xd9, 0x90, 0x86, 0x54, + 0xe9, 0xc5, 0x57, 0xea, 0x10, 0x52, 0x1a, 0x46, 0xc8, 0x96, 0x52, 0x35, 0xd9, 0xb7, 0x3d, 0xd2, + 0xd5, 0xa6, 0x07, 0xc3, 0x69, 0x87, 0x88, 0x20, 0x86, 0xd3, 0xc8, 0xf7, 0x87, 0x03, 0x9b, 0x5e, + 0xec, 0x35, 0x52, 0xdc, 0x6d, 0x8e, 0x48, 0x80, 0xe2, 0x06, 0x26, 0xdc, 0xf6, 0xaa, 0x3e, 0xb6, + 0x79, 0xb7, 0x89, 0x52, 0xe3, 0x9d, 0x3e, 0xa3, 0x1f, 0x77, 0x9b, 0x9c, 0x0a, 0x4e, 0x74, 0x5f, + 0x99, 0xcd, 0x1f, 0x33, 0xa0, 0xb4, 0xc5, 0x42, 0x07, 0x85, 0x98, 0x71, 0x14, 0x6f, 0xf4, 0x4e, + 0xfa, 0x3a, 0x41, 0x71, 0x17, 0xde, 0x01, 0x40, 0x1c, 0xd9, 0x75, 0x45, 0xc8, 0xa2, 0xb1, 0x60, + 0x3c, 0xcc, 0x3b, 0x79, 0xa9, 0xd9, 0xed, 0x36, 0x11, 0x5c, 0x02, 0xd9, 0x3a, 0xea, 0xb2, 0x62, + 0x66, 0x61, 0xfc, 0xe1, 0x54, 0x65, 0xc1, 0x1a, 0x9a, 0x6c, 0x6b, 0xf3, 0xf9, 0x26, 0xea, 0x3a, + 0x12, 0x0d, 0x6d, 0xf0, 0x3f, 0x1e, 0x7b, 0x84, 0x79, 0x3e, 0xc7, 0x94, 0x30, 0x77, 0x1f, 0x47, + 0x1c, 0xc5, 0xc5, 0x71, 0x19, 0x1d, 0xf6, 0x9b, 0x9e, 0x49, 0x0b, 0x7c, 0x17, 0x5c, 0xf7, 0x29, + 0x21, 0x48, 0x2a, 0x5d, 0x1c, 0x14, 0xb3, 0x12, 0x5a, 0x38, 0x55, 0x6e, 0x04, 0x02, 0x94, 0x34, + 0x03, 0x8f, 0x23, 0xb7, 0x89, 0x62, 0x4c, 0x83, 0x62, 0x6e, 0xc1, 0x78, 0x98, 0x75, 0x0a, 0x4a, + 0xb9, 0x2d, 0x75, 0xf0, 0xff, 0x60, 0x82, 0xc9, 0x7c, 0x14, 0x27, 0x64, 0x08, 0x2d, 0xad, 0x4c, + 0xbd, 0x3c, 0x39, 0x5c, 0xd4, 0x82, 0xb9, 0x04, 0xcc, 0xe1, 0x29, 0x71, 0x10, 0x6b, 0x52, 0xc2, + 0x10, 0x9c, 0x06, 0x19, 0x1c, 0xc8, 0x94, 0x64, 0x9d, 0x0c, 0x0e, 0xcc, 0xdf, 0x0c, 0x30, 0xbb, + 0xc5, 0xc2, 0x9d, 0xa4, 0xda, 0xc0, 0x3c, 0x85, 0x26, 0x11, 0x87, 0xf3, 0x60, 0x52, 0xe5, 0xb0, + 0x07, 0xbf, 0x26, 0xe5, 0x8d, 0x7e, 0x3a, 0x99, 0x7e, 0x3a, 0xf0, 0x2e, 0xc8, 0xfb, 0x11, 0x46, + 0x84, 0x0b, 0x1f, 0x99, 0x97, 0xf5, 0x4c, 0xd1, 0x70, 0x26, 0x95, 0x72, 0x23, 0x80, 0x1f, 0x83, + 0x89, 0x58, 0x46, 0x97, 0xa9, 0x98, 0xaa, 0xdc, 0x1f, 0x91, 0xfa, 0x3e, 0x2e, 0x8e, 0xf6, 0x3a, + 0x7b, 0xdf, 0x7f, 0x0d, 0x30, 0xd5, 0x4f, 0xf8, 0x19, 0x00, 0xf5, 0x96, 0xab, 0x90, 0xac, 0x68, + 0xc8, 0xb7, 0x7d, 0x30, 0xe2, 0x80, 0x1d, 0x4e, 0x63, 0x2f, 0x44, 0xcf, 0xbd, 0x28, 0x41, 0x4e, + 0xbe, 0xde, 0x52, 0x61, 0x18, 0x5c, 0x06, 0xb9, 0x6a, 0x44, 0xfd, 0xba, 0xbc, 0xdc, 0xe8, 0xf2, + 0x58, 0x17, 0x38, 0x47, 0xc1, 0x45, 0x56, 0x6a, 0x08, 0x87, 0x35, 0x2e, 0xaf, 0x9e, 0x75, 0xb4, + 0x04, 0x4b, 0x60, 0x32, 0x46, 0x2d, 0xcc, 0x30, 0x25, 0xf2, 0xda, 0x59, 0xa7, 0x27, 0xc3, 0x47, + 0x00, 0x7a, 0x51, 0x44, 0xdb, 0x6e, 0xbd, 0xe5, 0xfa, 0x5e, 0x14, 0x55, 0x3d, 0xbf, 0xce, 0x64, + 0x09, 0x4c, 0x3a, 0x37, 0xa4, 0x65, 0xb3, 0xf5, 0x59, 0xaa, 0x37, 0x0f, 0x0c, 0x50, 0xe8, 0x67, + 0x0d, 0xdf, 0x03, 0xd3, 0x4c, 0xc9, 0x6e, 0x33, 0x46, 0xfb, 0xb8, 0xa3, 0x6b, 0xfd, 0xba, 0xd6, + 0x6e, 0x4b, 0x25, 0xbc, 0x01, 0xc6, 0xeb, 0xa8, 0x2b, 0xef, 0x53, 0x70, 0xc4, 0x27, 0x9c, 0x05, + 0xb9, 0x96, 0x88, 0x20, 0xa9, 0x16, 0x1c, 0x25, 0xc0, 0x27, 0x20, 0xb7, 0x2d, 0x9a, 0x4c, 0xbf, + 0xce, 0x6d, 0xeb, 0xb4, 0x09, 0x2d, 0xd5, 0x84, 0x96, 0xb4, 0x7f, 0xd5, 0x64, 0x8e, 0x42, 0x9a, + 0x3f, 0x1b, 0x20, 0x27, 0xb3, 0x00, 0x3f, 0x05, 0x37, 0x09, 0xea, 0x70, 0x57, 0x26, 0xc3, 0xad, + 0x21, 0x4f, 0xd4, 0x87, 0x21, 0x03, 0xcd, 0x5a, 0x6a, 0xac, 0x58, 0xe9, 0x58, 0xb1, 0xd6, 0x48, + 0xd7, 0x99, 0x11, 0x70, 0xe9, 0xfb, 0xa5, 0x04, 0xc3, 0x47, 0x22, 0x81, 0x5e, 0x5a, 0x56, 0xc3, + 0xdc, 0x34, 0x06, 0x56, 0x40, 0x86, 0x77, 0x24, 0xff, 0xa9, 0x8a, 0x39, 0xe2, 0x8d, 0x76, 0x3b, + 0xea, 0x85, 0x33, 0xbc, 0x63, 0xfe, 0x65, 0x80, 0x6b, 0x5a, 0x86, 0x1f, 0x8a, 0x67, 0x51, 0x4d, + 0xa1, 0x69, 0xde, 0xe9, 0xbf, 0xaf, 0x98, 0x48, 0xd6, 0x17, 0x1d, 0xe4, 0xef, 0x76, 0x74, 0x11, + 0xf6, 0xe0, 0xf0, 0x13, 0x30, 0x1d, 0xa0, 0x08, 0xb7, 0x44, 0x77, 0xc8, 0xa9, 0xa4, 0x09, 0x17, + 0x87, 0x25, 0xcc, 0xb9, 0x9e, 0xe2, 0xa5, 0x08, 0xd7, 0xc0, 0x0c, 0x26, 0x7e, 0x94, 0x88, 0x1a, + 0xd0, 0x11, 0xc6, 0x2f, 0x88, 0x30, 0xdd, 0x73, 0x50, 0x21, 0x20, 0xc8, 0x06, 0x1e, 0xf7, 0xe4, + 0x53, 0x15, 0x1c, 0xf9, 0x6d, 0x96, 0xc1, 0x3b, 0xe7, 0xb5, 0x72, 0xda, 0xfb, 0xa6, 0x07, 0xee, + 0xca, 0x09, 0xd1, 0xa0, 0x2d, 0x34, 0x30, 0x1f, 0x5e, 0x24, 0x88, 0x5d, 0xa5, 0xeb, 0xcf, 0x36, + 0xa5, 0x09, 0x16, 0x86, 0x1f, 0xa1, 0x69, 0xbc, 0xcc, 0x48, 0x1e, 0x7b, 0x72, 0xc2, 0x5d, 0x9e, + 0xc7, 0x2a, 0x98, 0x24, 0xa8, 0xed, 0x5e, 0x6a, 0x82, 0x5f, 0x23, 0xa8, 0xbd, 0x29, 0x86, 0xf8, + 0xa2, 0xa8, 0xd2, 0xb6, 0x7b, 0x76, 0xe4, 0xaa, 0x7e, 0x9d, 0x21, 0xa8, 0xbd, 0xd7, 0x3f, 0x75, + 0x97, 0xc1, 0x9c, 0xc0, 0x9e, 0x37, 0xf4, 0xd5, 0x24, 0xbf, 0x45, 0x50, 0x7b, 0x77, 0x70, 0xee, + 0x9f, 0x26, 0x2a, 0x77, 0x51, 0xa2, 0x86, 0xe4, 0x40, 0x27, 0xea, 0x77, 0x03, 0xcc, 0xf4, 0x40, + 0xdb, 0x72, 0x77, 0xc2, 0x65, 0x90, 0xf7, 0x12, 0x5e, 0xa3, 0x31, 0xe6, 0x5d, 0xd5, 0xed, 0xeb, + 0xc5, 0x3f, 0x7e, 0x7d, 0x3c, 0xab, 0x97, 0xfb, 0x5a, 0x10, 0xc4, 0x88, 0xb1, 0x1d, 0x1e, 0x63, + 0x12, 0x3a, 0xa7, 0x50, 0xf8, 0x39, 0x98, 0x50, 0xdb, 0x57, 0xd7, 0xea, 0xbd, 0x11, 0x39, 0x53, + 0x47, 0xad, 0xe7, 0x5f, 0xfd, 0x7d, 0x77, 0xec, 0xa7, 0x93, 0xc3, 0x45, 0xc3, 0xd1, 0xbe, 0x2b, + 0x4b, 0xe2, 0x0a, 0xa7, 0x51, 0xbf, 0x3f, 0x39, 0x5c, 0xbc, 0x37, 0xb8, 0xe6, 0xdf, 0xe0, 0x6c, + 0xce, 0x83, 0xb9, 0x37, 0x54, 0xe9, 0x15, 0x2b, 0xbf, 0xe4, 0xc0, 0xf8, 0x16, 0x0b, 0xe1, 0x0f, + 0x06, 0x98, 0x1b, 0xb6, 0xcd, 0x9f, 0x8e, 0xa0, 0x3a, 0x7c, 0xe3, 0x95, 0x3e, 0xba, 0x92, 0x5b, + 0x6f, 0x51, 0x7e, 0x0b, 0x6e, 0x0e, 0x2e, 0x45, 0x7b, 0x74, 0xcc, 0x01, 0x87, 0xd2, 0x07, 0x97, + 0x74, 0xe8, 0x1d, 0x7f, 0x60, 0x80, 0x5b, 0xe7, 0xb6, 0x11, 0x5c, 0xb9, 0xe8, 0x5e, 0xc3, 0xdb, + 0xbb, 0xb4, 0x7a, 0x25, 0xdf, 0x3e, 0x4a, 0xe7, 0x16, 0xec, 0x45, 0x94, 0x46, 0x75, 0xfa, 0x45, + 0x94, 0x46, 0x76, 0x08, 0x24, 0xa0, 0x70, 0xa6, 0x3b, 0x16, 0xdf, 0x26, 0x98, 0xc2, 0x96, 0x2a, + 0x6f, 0x8f, 0x4d, 0xcf, 0x2b, 0xe5, 0xbe, 0x13, 0xed, 0xb0, 0xbe, 0xf7, 0xea, 0xa8, 0x6c, 0xbc, + 0x3e, 0x2a, 0x1b, 0xff, 0x1c, 0x95, 0x8d, 0x83, 0xe3, 0xf2, 0xd8, 0xeb, 0xe3, 0xf2, 0xd8, 0x9f, + 0xc7, 0xe5, 0xb1, 0x6f, 0x56, 0x43, 0xcc, 0x6b, 0x49, 0xd5, 0xf2, 0x69, 0xc3, 0xd6, 0xe1, 0x1f, + 0xd3, 0x38, 0x4c, 0xbf, 0xed, 0xd6, 0x53, 0xbb, 0x73, 0xde, 0x0f, 0x7f, 0xf1, 0xd3, 0xb7, 0x3a, + 0x21, 0x17, 0xdd, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xaf, 0xe2, 0x7e, 0x22, 0x0c, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1034,9 +1034,9 @@ type MsgClient interface { // 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. - RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } @@ -1067,7 +1067,7 @@ func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryRes return out, nil } -func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { +func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { out := new(MsgRemoveInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/RemoveInterchainQuery", in, out, opts...) if err != nil { @@ -1076,7 +1076,7 @@ func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInte return out, nil } -func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { +func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { out := new(MsgUpdateInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/UpdateInterchainQuery", in, out, opts...) if err != nil { @@ -1112,9 +1112,9 @@ type MsgServer interface { // 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. - RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } @@ -1129,10 +1129,10 @@ func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitQueryResult not implemented") } -func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveInterchainQuery not implemented") } -func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateInterchainQuery not implemented") } func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { @@ -1180,7 +1180,7 @@ func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec fu } func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRemoveInterchainQuery) + in := new(MsgRemoveInterchainQueryRequest) if err := dec(in); err != nil { return nil, err } @@ -1192,13 +1192,13 @@ func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/RemoveInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQuery)) + return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQueryRequest)) } return interceptor(ctx, in, info, handler) } func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateInterchainQuery) + in := new(MsgUpdateInterchainQueryRequest) if err := dec(in); err != nil { return nil, err } @@ -1210,7 +1210,7 @@ func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/UpdateInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQuery)) + return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQueryRequest)) } return interceptor(ctx, in, info, handler) } @@ -1687,7 +1687,7 @@ func (m *MsgSubmitQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *MsgRemoveInterchainQuery) Marshal() (dAtA []byte, err error) { +func (m *MsgRemoveInterchainQueryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1697,12 +1697,12 @@ func (m *MsgRemoveInterchainQuery) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRemoveInterchainQuery) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRemoveInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1745,7 +1745,7 @@ func (m *MsgRemoveInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *MsgUpdateInterchainQuery) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateInterchainQueryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1755,12 +1755,12 @@ func (m *MsgUpdateInterchainQuery) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateInterchainQuery) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2081,7 +2081,7 @@ func (m *MsgSubmitQueryResultResponse) Size() (n int) { return n } -func (m *MsgRemoveInterchainQuery) Size() (n int) { +func (m *MsgRemoveInterchainQueryRequest) Size() (n int) { if m == nil { return 0 } @@ -2106,7 +2106,7 @@ func (m *MsgRemoveInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgUpdateInterchainQuery) Size() (n int) { +func (m *MsgUpdateInterchainQueryRequest) Size() (n int) { if m == nil { return 0 } @@ -3407,7 +3407,7 @@ func (m *MsgSubmitQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRemoveInterchainQuery) Unmarshal(dAtA []byte) error { +func (m *MsgRemoveInterchainQueryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3430,10 +3430,10 @@ func (m *MsgRemoveInterchainQuery) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRemoveInterchainQuery: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRemoveInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3558,7 +3558,7 @@ func (m *MsgRemoveInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateInterchainQuery) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateInterchainQueryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3581,10 +3581,10 @@ func (m *MsgUpdateInterchainQuery) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateInterchainQuery: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index f39fafff6..0addf3d3b 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -49,9 +49,8 @@ func TestMsgSubmitQueryResultGetSigners(t *testing.T) { "valid_signer", func() sdktypes.LegacyMsg { return &iqtypes.MsgSubmitQueryResult{ - QueryId: 1, - Sender: TestAddress, - ClientId: "client-id", + QueryId: 1, + Sender: TestAddress, Result: &iqtypes.QueryResult{ KvResults: []*iqtypes.StorageValue{{ Key: []byte{10}, @@ -89,7 +88,7 @@ func TestMsgUpdateQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgUpdateInterchainQuery{ + return &iqtypes.MsgUpdateInterchainQueryRequest{ Sender: TestAddress, } }, @@ -111,7 +110,7 @@ func TestMsgRemoveQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgRemoveInterchainQuery{ + return &iqtypes.MsgRemoveInterchainQueryRequest{ Sender: TestAddress, } },