From 1e65d67ae12edccef6d64caf0f4637c6959ed76c Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 14:49:35 -0500 Subject: [PATCH 01/14] updating some storage protos --- proto/canine_chain/storage/params.proto | 2 +- proto/canine_chain/storage/payment_info.proto | 2 +- proto/canine_chain/storage/providers.proto | 2 +- proto/canine_chain/storage/query.proto | 14 +- proto/canine_chain/storage/tx.proto | 12 +- x/storage/client/cli/query_freespace.go | 2 +- x/storage/client/cli/tx_init_provider.go | 4 +- x/storage/client/cli/tx_provider.go | 2 +- .../client/cli/tx_set_provider_totalspace.go | 4 +- x/storage/handler.go | 4 +- x/storage/keeper/grpc_query_freespace.go | 4 +- .../grpc_query_get_client_free_space.go | 4 +- x/storage/keeper/msg_server_init_provider.go | 2 +- x/storage/keeper/msg_server_proofs_test.go | 2 +- x/storage/keeper/msg_server_providers_test.go | 16 +- .../msg_server_set_provider_totalspace.go | 4 +- x/storage/keeper/providers_test.go | 4 +- x/storage/module_simulation.go | 14 +- x/storage/simulation/init_miner.go | 2 +- x/storage/simulation/set_miner_totalspace.go | 6 +- x/storage/types/codec.go | 4 +- x/storage/types/message_init_miner.go | 4 +- x/storage/types/message_init_miner_test.go | 10 +- .../types/message_set_miner_totalspace.go | 20 +- .../message_set_miner_totalspace_test.go | 10 +- x/storage/types/query.pb.go | 389 +++++++++--------- x/storage/types/query.pb.gw.go | 6 +- x/storage/types/tx.pb.go | 299 +++++++------- 28 files changed, 425 insertions(+), 423 deletions(-) diff --git a/proto/canine_chain/storage/params.proto b/proto/canine_chain/storage/params.proto index 6ea3275d8..cbee353ed 100644 --- a/proto/canine_chain/storage/params.proto +++ b/proto/canine_chain/storage/params.proto @@ -19,7 +19,7 @@ message Params { // Life span of a contract in blocks int64 max_contract_age_in_blocks = 6; int64 price_per_tb_per_month = 7; - int64 attestFormSize = 8; + int64 attestFormSize = 8; // TODO: needs more research on if this messes up reading from protos int64 attestMinToPass = 9; int64 collateralPrice = 10; } diff --git a/proto/canine_chain/storage/payment_info.proto b/proto/canine_chain/storage/payment_info.proto index 7d754cee4..330ad7ee6 100644 --- a/proto/canine_chain/storage/payment_info.proto +++ b/proto/canine_chain/storage/payment_info.proto @@ -14,7 +14,7 @@ message StoragePaymentInfo { google.protobuf.Timestamp start = 1 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; google.protobuf.Timestamp end = 2 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false]; - int64 spaceAvailable = 3; + int64 spaceAvailable = 3; // TODO: same as params int64 spaceUsed = 4; string address = 5; diff --git a/proto/canine_chain/storage/providers.proto b/proto/canine_chain/storage/providers.proto index 66f58738f..325a23944 100644 --- a/proto/canine_chain/storage/providers.proto +++ b/proto/canine_chain/storage/providers.proto @@ -6,7 +6,7 @@ option go_package = "github.com/jackalLabs/canine-chain/x/storage/types"; message Providers { string address = 1; string ip = 2; - string totalspace = 3; + string totalspace = 3; // TODO: same as params string burned_contracts = 4; string creator = 5; string keybase_identity = 6; diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index 255c424b5..403cce8e1 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -84,9 +84,9 @@ service Query { } // Queries a list of Freespace items. - rpc Freespace(QueryFreespaceRequest) returns (QueryFreespaceResponse) { + rpc Freespace(QueryFreeSpaceRequest) returns (QueryFreeSpaceResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/freespace/{address}"; + "/jackal-dao/canine-chain/storage/free_space/{address}"; } // Queries a list of Freespace items. @@ -266,11 +266,11 @@ message QueryAllReportResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryFreespaceRequest { string address = 1; } +message QueryFreeSpaceRequest { string address = 1; } message QueryStoreCountRequest { string address = 1; } -message QueryFreespaceResponse { string space = 1; } +message QueryFreeSpaceResponse { string space = 1; } message QueryStoreCountResponse { string count = 1; } @@ -283,7 +283,7 @@ message QueryFindFileResponse { string provider_ips = 1; } message QueryClientFreeSpaceRequest { string address = 1; } -message QueryClientFreeSpaceResponse { int64 bytesfree = 1; } +message QueryClientFreeSpaceResponse { int64 bytes_free = 1; } message QueryPayDataRequest { string address = 1; } @@ -337,10 +337,10 @@ message QueryStorageStatsRequest {} message QueryStorageStatsResponse { uint64 purchased = 1; uint64 used = 2; - bytes usedRatio = 3 [ + bytes used_ratio = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - uint64 activeUsers = 4; + uint64 active_users = 4; map users_by_plan= 5; } diff --git a/proto/canine_chain/storage/tx.proto b/proto/canine_chain/storage/tx.proto index 6d8c93bfa..c6e612a7a 100644 --- a/proto/canine_chain/storage/tx.proto +++ b/proto/canine_chain/storage/tx.proto @@ -12,8 +12,8 @@ service Msg { rpc SetProviderIP(MsgSetProviderIP) returns (MsgSetProviderIPResponse); rpc SetProviderKeybase(MsgSetProviderKeybase) returns (MsgSetProviderKeybaseResponse); - rpc SetProviderTotalspace(MsgSetProviderTotalspace) - returns (MsgSetProviderTotalspaceResponse); + rpc SetProviderTotalSpace(MsgSetProviderTotalSpace) + returns (MsgSetProviderTotalSpaceResponse); rpc InitProvider(MsgInitProvider) returns (MsgInitProviderResponse); rpc ShutdownProvider(MsgShutdownProvider) returns (MsgShutdownProviderResponse); rpc BuyStorage(MsgBuyStorage) returns (MsgBuyStorageResponse); @@ -56,7 +56,7 @@ message MsgPostProof { message MsgPostProofResponse { bool success = 1; - string errorMessage = 2; + string error_message = 2; } message MsgDeleteFile { @@ -83,12 +83,12 @@ message MsgSetProviderKeybase { message MsgSetProviderKeybaseResponse {} -message MsgSetProviderTotalspace { +message MsgSetProviderTotalSpace { string creator = 1; string space = 2; } -message MsgSetProviderTotalspaceResponse {} +message MsgSetProviderTotalSpaceResponse {} message MsgAddClaimer { string creator = 1; @@ -109,7 +109,7 @@ message MsgInitProvider { string creator = 1; string ip = 2; string keybase = 3; - string totalspace = 4; + string total_space = 4; } message MsgInitProviderResponse {} diff --git a/x/storage/client/cli/query_freespace.go b/x/storage/client/cli/query_freespace.go index 2e9baa2bf..5751cfaaf 100644 --- a/x/storage/client/cli/query_freespace.go +++ b/x/storage/client/cli/query_freespace.go @@ -26,7 +26,7 @@ func CmdFreespace() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryFreespaceRequest{ + params := &types.QueryFreeSpaceRequest{ Address: reqAddress, } diff --git a/x/storage/client/cli/tx_init_provider.go b/x/storage/client/cli/tx_init_provider.go index e8d40f787..3dfcc101c 100644 --- a/x/storage/client/cli/tx_init_provider.go +++ b/x/storage/client/cli/tx_init_provider.go @@ -19,7 +19,7 @@ func CmdInitProvider() *cobra.Command { Args: cobra.ExactArgs(3), RunE: func(cmd *cobra.Command, args []string) (err error) { argIP := args[0] - argTotalspace := args[1] + argTotalSpace := args[1] argKeybase := args[2] clientCtx, err := client.GetClientTxContext(cmd) @@ -30,7 +30,7 @@ func CmdInitProvider() *cobra.Command { msg := types.NewMsgInitProvider( clientCtx.GetFromAddress().String(), argIP, - argTotalspace, + argTotalSpace, argKeybase, ) if err := msg.ValidateBasic(); err != nil { diff --git a/x/storage/client/cli/tx_provider.go b/x/storage/client/cli/tx_provider.go index 1cfa174e2..27476eb43 100644 --- a/x/storage/client/cli/tx_provider.go +++ b/x/storage/client/cli/tx_provider.go @@ -17,7 +17,7 @@ func CmdProvider() *cobra.Command { } cmds := []*cobra.Command{ - CmdSetProviderTotalspace(), + CmdSetProviderTotalSpace(), CmdSetProviderIP(), CmdSetProviderKeybase(), CmdInitProvider(), diff --git a/x/storage/client/cli/tx_set_provider_totalspace.go b/x/storage/client/cli/tx_set_provider_totalspace.go index c6ade82db..67f14e6ca 100644 --- a/x/storage/client/cli/tx_set_provider_totalspace.go +++ b/x/storage/client/cli/tx_set_provider_totalspace.go @@ -11,7 +11,7 @@ import ( var _ = strconv.Itoa(0) -func CmdSetProviderTotalspace() *cobra.Command { +func CmdSetProviderTotalSpace() *cobra.Command { cmd := &cobra.Command{ Use: "set-totalspace [space]", Short: "Broadcast message set-provider-totalspace", @@ -24,7 +24,7 @@ func CmdSetProviderTotalspace() *cobra.Command { return err } - msg := types.NewMsgSetProviderTotalspace( + msg := types.NewMsgSetProviderTotalSpace( clientCtx.GetFromAddress().String(), argSpace, ) diff --git a/x/storage/handler.go b/x/storage/handler.go index 2438146f7..d3fe8176b 100644 --- a/x/storage/handler.go +++ b/x/storage/handler.go @@ -29,8 +29,8 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgSetProviderKeybase: res, err := msgServer.SetProviderKeybase(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgSetProviderTotalspace: - res, err := msgServer.SetProviderTotalspace(sdk.WrapSDKContext(ctx), msg) + case *types.MsgSetProviderTotalSpace: + res, err := msgServer.SetProviderTotalSpace(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) case *types.MsgInitProvider: res, err := msgServer.InitProvider(sdk.WrapSDKContext(ctx), msg) diff --git a/x/storage/keeper/grpc_query_freespace.go b/x/storage/keeper/grpc_query_freespace.go index 04d4a5a97..010fbe6bd 100644 --- a/x/storage/keeper/grpc_query_freespace.go +++ b/x/storage/keeper/grpc_query_freespace.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Freespace(goCtx context.Context, req *types.QueryFreespaceRequest) (*types.QueryFreespaceResponse, error) { +func (k Keeper) Freespace(goCtx context.Context, req *types.QueryFreeSpaceRequest) (*types.QueryFreeSpaceResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -31,7 +31,7 @@ func (k Keeper) Freespace(goCtx context.Context, req *types.QueryFreespaceReques return nil, fmt.Errorf("can't parse total space") } - return &types.QueryFreespaceResponse{ + return &types.QueryFreeSpaceResponse{ Space: fmt.Sprintf("%d", space.Int64()-num), }, nil } diff --git a/x/storage/keeper/grpc_query_get_client_free_space.go b/x/storage/keeper/grpc_query_get_client_free_space.go index 6de75263e..c0f250a6d 100644 --- a/x/storage/keeper/grpc_query_get_client_free_space.go +++ b/x/storage/keeper/grpc_query_get_client_free_space.go @@ -18,8 +18,8 @@ func (k Keeper) GetClientFreeSpace(goCtx context.Context, req *types.QueryClient payInfo, found := k.GetStoragePaymentInfo(ctx, req.Address) if !found { - return &types.QueryClientFreeSpaceResponse{Bytesfree: 0}, nil + return &types.QueryClientFreeSpaceResponse{BytesFree: 0}, nil } - return &types.QueryClientFreeSpaceResponse{Bytesfree: payInfo.SpaceAvailable - payInfo.SpaceUsed}, nil + return &types.QueryClientFreeSpaceResponse{BytesFree: payInfo.SpaceAvailable - payInfo.SpaceUsed}, nil } diff --git a/x/storage/keeper/msg_server_init_provider.go b/x/storage/keeper/msg_server_init_provider.go index 8fe9ae5fa..6cf27ec81 100644 --- a/x/storage/keeper/msg_server_init_provider.go +++ b/x/storage/keeper/msg_server_init_provider.go @@ -40,7 +40,7 @@ func (k msgServer) InitProvider(goCtx context.Context, msg *types.MsgInitProvide provider := types.Providers{ Address: msg.Creator, Ip: msg.Ip, - Totalspace: msg.Totalspace, + Totalspace: msg.TotalSpace, Creator: msg.Creator, BurnedContracts: "0", KeybaseIdentity: msg.Keybase, diff --git a/x/storage/keeper/msg_server_proofs_test.go b/x/storage/keeper/msg_server_proofs_test.go index a226a82c9..c228b66e6 100644 --- a/x/storage/keeper/msg_server_proofs_test.go +++ b/x/storage/keeper/msg_server_proofs_test.go @@ -143,7 +143,7 @@ func (suite *KeeperTestSuite) TestPostProof() { _, err = msgSrvr.InitProvider(context, &types.MsgInitProvider{ Creator: testProvider.String(), Ip: "192.168.0.1", - Totalspace: "1_000_000", + TotalSpace: "1_000_000", }) suite.Require().NoError(err) diff --git a/x/storage/keeper/msg_server_providers_test.go b/x/storage/keeper/msg_server_providers_test.go index 4d8df378b..117f542ee 100644 --- a/x/storage/keeper/msg_server_providers_test.go +++ b/x/storage/keeper/msg_server_providers_test.go @@ -147,14 +147,14 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { suite.storageKeeper.SetProviders(suite.ctx, provider) cases := []struct { - preRun func() *types.MsgSetProviderTotalspace + preRun func() *types.MsgSetProviderTotalSpace expErr bool expErrMsg string name string }{ { - preRun: func() *types.MsgSetProviderTotalspace { - return types.NewMsgSetProviderTotalspace( + preRun: func() *types.MsgSetProviderTotalSpace { + return types.NewMsgSetProviderTotalSpace( user, "1000000", ) @@ -163,8 +163,8 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { name: "set provider total space success", }, { - preRun: func() *types.MsgSetProviderTotalspace { - return types.NewMsgSetProviderTotalspace( + preRun: func() *types.MsgSetProviderTotalSpace { + return types.NewMsgSetProviderTotalSpace( "wrong address", "1000000", ) @@ -174,8 +174,8 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { name: "set provider total space fail", }, { - preRun: func() *types.MsgSetProviderTotalspace { - return types.NewMsgSetProviderTotalspace( + preRun: func() *types.MsgSetProviderTotalSpace { + return types.NewMsgSetProviderTotalSpace( user, "9@!0", ) @@ -190,7 +190,7 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { suite.Run(tc.name, func() { msg := tc.preRun() suite.Require().NoError(err) - res, err := msgSrvr.SetProviderTotalspace(context, msg) + res, err := msgSrvr.SetProviderTotalSpace(context, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) diff --git a/x/storage/keeper/msg_server_set_provider_totalspace.go b/x/storage/keeper/msg_server_set_provider_totalspace.go index eb6ea397d..b1c8b50fa 100644 --- a/x/storage/keeper/msg_server_set_provider_totalspace.go +++ b/x/storage/keeper/msg_server_set_provider_totalspace.go @@ -8,7 +8,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/storage/types" ) -func (k msgServer) SetProviderTotalspace(goCtx context.Context, msg *types.MsgSetProviderTotalspace) (*types.MsgSetProviderTotalspaceResponse, error) { +func (k msgServer) SetProviderTotalSpace(goCtx context.Context, msg *types.MsgSetProviderTotalSpace) (*types.MsgSetProviderTotalSpaceResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) provider, found := k.GetProviders(ctx, msg.Creator) @@ -27,7 +27,7 @@ func (k msgServer) SetProviderTotalspace(goCtx context.Context, msg *types.MsgSe k.SetProviders(ctx, provider) - return &types.MsgSetProviderTotalspaceResponse{}, nil + return &types.MsgSetProviderTotalSpaceResponse{}, nil } func isValidTotalSpace(totalSpace string) bool { diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 9d29e9dbe..67cb120f0 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -61,7 +61,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { Creator: user, Ip: "192.158.1.38", Keybase: "", - Totalspace: "9000", + TotalSpace: "9000", } _, err = msgSrvr.InitProvider(ctx, &initMsg) @@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { suite.Require().NoError(err) suite.Require().Equal(res.Providers.Address, user) suite.Require().Equal(res.Providers.Ip, initMsg.Ip) - suite.Require().Equal(res.Providers.Totalspace, initMsg.Totalspace) + suite.Require().Equal(res.Providers.Totalspace, initMsg.TotalSpace) suite.Require().Equal(res.Providers.BurnedContracts, "0") suite.Require().Equal(res.Providers.Creator, initMsg.Creator) diff --git a/x/storage/module_simulation.go b/x/storage/module_simulation.go index 630b5f4e9..e2cb1e54f 100644 --- a/x/storage/module_simulation.go +++ b/x/storage/module_simulation.go @@ -28,9 +28,9 @@ const ( defaultWeightMsgSetProviderIP int = 10 //nolint:all - opWeightMsgSetProviderTotalspace = "op_weight_msg_set_provider_totalspace" + opWeightMsgSetProviderTotalSpace = "op_weight_msg_set_provider_totalspace" // TODO: Determine the simulation weight value - defaultWeightMsgSetProviderTotalspace int = 10 + defaultWeightMsgSetProviderTotalSpace int = 10 //nolint:all opWeightMsgInitProvider = "op_weight_msg_init_provider" @@ -88,15 +88,15 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp storagesimulation.SimulateMsgSetProviderIP(am.accountKeeper, am.bankKeeper, am.keeper), )) - var weightMsgSetProviderTotalspace int - simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgSetProviderTotalspace, &weightMsgSetProviderTotalspace, nil, + var weightMsgSetProviderTotalSpace int + simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgSetProviderTotalSpace, &weightMsgSetProviderTotalSpace, nil, func(_ *rand.Rand) { - weightMsgSetProviderTotalspace = defaultWeightMsgSetProviderTotalspace + weightMsgSetProviderTotalSpace = defaultWeightMsgSetProviderTotalSpace }, ) operations = append(operations, simulation.NewWeightedOperation( - weightMsgSetProviderTotalspace, - storagesimulation.SimulateMsgSetProviderTotalspace(am.accountKeeper, am.bankKeeper, am.keeper), + weightMsgSetProviderTotalSpace, + storagesimulation.SimulateMsgSetProviderTotalSpace(am.accountKeeper, am.bankKeeper, am.keeper), )) var weightMsgInitProvider int diff --git a/x/storage/simulation/init_miner.go b/x/storage/simulation/init_miner.go index b2a1dd9c8..0712e8a6d 100644 --- a/x/storage/simulation/init_miner.go +++ b/x/storage/simulation/init_miner.go @@ -40,7 +40,7 @@ func SimulateMsgInitProvider( msg := &types.MsgInitProvider{ Creator: simAccount.Address.String(), Ip: RandIPv4Url(r), - Totalspace: strconv.Itoa(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), + TotalSpace: strconv.Itoa(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), Keybase: simtypes.RandStringOfLength(r, 10), } diff --git a/x/storage/simulation/set_miner_totalspace.go b/x/storage/simulation/set_miner_totalspace.go index a4f2bc0ca..eafcbba11 100644 --- a/x/storage/simulation/set_miner_totalspace.go +++ b/x/storage/simulation/set_miner_totalspace.go @@ -13,7 +13,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/storage/types" ) -func SimulateMsgSetProviderTotalspace( +func SimulateMsgSetProviderTotalSpace( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, @@ -31,7 +31,7 @@ func SimulateMsgSetProviderTotalspace( return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgSetProviderIP, "unable to find provider"), nil, nil } - msg := &types.MsgSetProviderTotalspace{ + msg := &types.MsgSetProviderTotalSpace{ Creator: provider.Creator, Space: strconv.Itoa(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), } @@ -39,7 +39,7 @@ func SimulateMsgSetProviderTotalspace( spendable := bk.SpendableCoins(ctx, simAccount.Address) fees, err := simtypes.RandomFees(r, ctx, spendable) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgSetProviderTotalspace, "unable to generate fees"), nil, err + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgSetProviderTotalSpace, "unable to generate fees"), nil, err } txCtx := simulation.OperationInput{ diff --git a/x/storage/types/codec.go b/x/storage/types/codec.go index 543e63039..2b72ed8f2 100644 --- a/x/storage/types/codec.go +++ b/x/storage/types/codec.go @@ -12,7 +12,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgPostFile{}, "storage/PostFile", nil) cdc.RegisterConcrete(&MsgPostProof{}, "storage/PostProof", nil) cdc.RegisterConcrete(&MsgSetProviderIP{}, "storage/SetProviderIp", nil) - cdc.RegisterConcrete(&MsgSetProviderTotalspace{}, "storage/SetProviderTotalspace", nil) + cdc.RegisterConcrete(&MsgSetProviderTotalSpace{}, "storage/SetProviderTotalSpace", nil) cdc.RegisterConcrete(&MsgInitProvider{}, "storage/InitProvider", nil) cdc.RegisterConcrete(&MsgDeleteFile{}, "storage/DeleteFile", nil) cdc.RegisterConcrete(&MsgBuyStorage{}, "storage/BuyStorage", nil) @@ -34,7 +34,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgSetProviderIP{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgSetProviderTotalspace{}, + &MsgSetProviderTotalSpace{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgInitProvider{}, diff --git a/x/storage/types/message_init_miner.go b/x/storage/types/message_init_miner.go index 894438a5f..5c2d8e6fc 100644 --- a/x/storage/types/message_init_miner.go +++ b/x/storage/types/message_init_miner.go @@ -18,7 +18,7 @@ func NewMsgInitProvider(creator string, ip string, totalspace string, keybase st return &MsgInitProvider{ Creator: creator, Ip: ip, - Totalspace: totalspace, + TotalSpace: totalspace, Keybase: keybase, } } @@ -58,7 +58,7 @@ func (msg *MsgInitProvider) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "invalid provider ip (%s)", err) } - if _, err := strconv.Atoi(msg.Totalspace); err != nil { + if _, err := strconv.Atoi(msg.TotalSpace); err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot parse totalspace (%s)", err) } return nil diff --git a/x/storage/types/message_init_miner_test.go b/x/storage/types/message_init_miner_test.go index 161e2cac2..700a8b994 100644 --- a/x/storage/types/message_init_miner_test.go +++ b/x/storage/types/message_init_miner_test.go @@ -18,7 +18,7 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "invalid_address", Ip: "http://localhost:3333", - Totalspace: "1000000000", + TotalSpace: "1000000000", }, err: sdkerrors.ErrInvalidAddress, }, { @@ -26,7 +26,7 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "fake/localhost:3333", - Totalspace: "1000000000", + TotalSpace: "1000000000", }, err: sdkerrors.ErrInvalidType, }, { @@ -34,7 +34,7 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "https://node.jackalprotocol.com", - Totalspace: "abd", + TotalSpace: "abd", }, err: sdkerrors.ErrInvalidType, }, { @@ -42,14 +42,14 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "https://node.jackalprotocol.com", - Totalspace: "1000000000", + TotalSpace: "1000000000", }, }, { name: "valid ip localhost", msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "localhost:3333", - Totalspace: "1000000000", + TotalSpace: "1000000000", }, }, } diff --git a/x/storage/types/message_set_miner_totalspace.go b/x/storage/types/message_set_miner_totalspace.go index da7a0a94c..1fce7c6e4 100644 --- a/x/storage/types/message_set_miner_totalspace.go +++ b/x/storage/types/message_set_miner_totalspace.go @@ -9,26 +9,26 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -const TypeMsgSetProviderTotalspace = "set_provider_totalspace" +const TypeMsgSetProviderTotalSpace = "set_provider_total_space" -var _ sdk.Msg = &MsgSetProviderTotalspace{} +var _ sdk.Msg = &MsgSetProviderTotalSpace{} -func NewMsgSetProviderTotalspace(creator string, space string) *MsgSetProviderTotalspace { - return &MsgSetProviderTotalspace{ +func NewMsgSetProviderTotalSpace(creator string, space string) *MsgSetProviderTotalSpace { + return &MsgSetProviderTotalSpace{ Creator: creator, Space: space, } } -func (msg *MsgSetProviderTotalspace) Route() string { +func (msg *MsgSetProviderTotalSpace) Route() string { return RouterKey } -func (msg *MsgSetProviderTotalspace) Type() string { - return TypeMsgSetProviderTotalspace +func (msg *MsgSetProviderTotalSpace) Type() string { + return TypeMsgSetProviderTotalSpace } -func (msg *MsgSetProviderTotalspace) GetSigners() []sdk.AccAddress { +func (msg *MsgSetProviderTotalSpace) GetSigners() []sdk.AccAddress { creator, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { panic(err) @@ -36,12 +36,12 @@ func (msg *MsgSetProviderTotalspace) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{creator} } -func (msg *MsgSetProviderTotalspace) GetSignBytes() []byte { +func (msg *MsgSetProviderTotalSpace) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(msg) return sdk.MustSortJSON(bz) } -func (msg *MsgSetProviderTotalspace) ValidateBasic() error { +func (msg *MsgSetProviderTotalSpace) ValidateBasic() error { prefix, _, err := bech32.DecodeAndConvert(msg.Creator) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) diff --git a/x/storage/types/message_set_miner_totalspace_test.go b/x/storage/types/message_set_miner_totalspace_test.go index 287e4abbf..2e503ed90 100644 --- a/x/storage/types/message_set_miner_totalspace_test.go +++ b/x/storage/types/message_set_miner_totalspace_test.go @@ -7,29 +7,29 @@ import ( "github.com/stretchr/testify/require" ) -func TestMsgSetProviderTotalspace_ValidateBasic(t *testing.T) { +func TestMsgSetProviderTotalSpace_ValidateBasic(t *testing.T) { tests := []struct { name string - msg MsgSetProviderTotalspace + msg MsgSetProviderTotalSpace err error }{ { name: "invalid address", - msg: MsgSetProviderTotalspace{ + msg: MsgSetProviderTotalSpace{ Creator: "invalid_address", Space: "1000000000", }, err: sdkerrors.ErrInvalidAddress, }, { name: "invalid ip", - msg: MsgSetProviderTotalspace{ + msg: MsgSetProviderTotalSpace{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Space: "abd", }, err: sdkerrors.ErrInvalidType, }, { name: "valid ip", - msg: MsgSetProviderTotalspace{ + msg: MsgSetProviderTotalSpace{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Space: "1000000000", }, diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index 9bfacb5b8..fe4a9ea1d 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -1182,22 +1182,22 @@ func (m *QueryAllReportResponse) GetPagination() *query.PageResponse { return nil } -type QueryFreespaceRequest struct { +type QueryFreeSpaceRequest struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryFreespaceRequest) Reset() { *m = QueryFreespaceRequest{} } -func (m *QueryFreespaceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFreespaceRequest) ProtoMessage() {} -func (*QueryFreespaceRequest) Descriptor() ([]byte, []int) { +func (m *QueryFreeSpaceRequest) Reset() { *m = QueryFreeSpaceRequest{} } +func (m *QueryFreeSpaceRequest) String() string { return proto.CompactTextString(m) } +func (*QueryFreeSpaceRequest) ProtoMessage() {} +func (*QueryFreeSpaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{23} } -func (m *QueryFreespaceRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFreeSpaceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFreespaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFreeSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFreespaceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFreeSpaceRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1207,19 +1207,19 @@ func (m *QueryFreespaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryFreespaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFreespaceRequest.Merge(m, src) +func (m *QueryFreeSpaceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFreeSpaceRequest.Merge(m, src) } -func (m *QueryFreespaceRequest) XXX_Size() int { +func (m *QueryFreeSpaceRequest) XXX_Size() int { return m.Size() } -func (m *QueryFreespaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFreespaceRequest.DiscardUnknown(m) +func (m *QueryFreeSpaceRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFreeSpaceRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryFreespaceRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFreeSpaceRequest proto.InternalMessageInfo -func (m *QueryFreespaceRequest) GetAddress() string { +func (m *QueryFreeSpaceRequest) GetAddress() string { if m != nil { return m.Address } @@ -1270,22 +1270,22 @@ func (m *QueryStoreCountRequest) GetAddress() string { return "" } -type QueryFreespaceResponse struct { +type QueryFreeSpaceResponse struct { Space string `protobuf:"bytes,1,opt,name=space,proto3" json:"space,omitempty"` } -func (m *QueryFreespaceResponse) Reset() { *m = QueryFreespaceResponse{} } -func (m *QueryFreespaceResponse) String() string { return proto.CompactTextString(m) } -func (*QueryFreespaceResponse) ProtoMessage() {} -func (*QueryFreespaceResponse) Descriptor() ([]byte, []int) { +func (m *QueryFreeSpaceResponse) Reset() { *m = QueryFreeSpaceResponse{} } +func (m *QueryFreeSpaceResponse) String() string { return proto.CompactTextString(m) } +func (*QueryFreeSpaceResponse) ProtoMessage() {} +func (*QueryFreeSpaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{25} } -func (m *QueryFreespaceResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryFreeSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFreespaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFreeSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFreespaceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFreeSpaceResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1295,19 +1295,19 @@ func (m *QueryFreespaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryFreespaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFreespaceResponse.Merge(m, src) +func (m *QueryFreeSpaceResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFreeSpaceResponse.Merge(m, src) } -func (m *QueryFreespaceResponse) XXX_Size() int { +func (m *QueryFreeSpaceResponse) XXX_Size() int { return m.Size() } -func (m *QueryFreespaceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFreespaceResponse.DiscardUnknown(m) +func (m *QueryFreeSpaceResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFreeSpaceResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryFreespaceResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryFreeSpaceResponse proto.InternalMessageInfo -func (m *QueryFreespaceResponse) GetSpace() string { +func (m *QueryFreeSpaceResponse) GetSpace() string { if m != nil { return m.Space } @@ -1491,7 +1491,7 @@ func (m *QueryClientFreeSpaceRequest) GetAddress() string { } type QueryClientFreeSpaceResponse struct { - Bytesfree int64 `protobuf:"varint,1,opt,name=bytesfree,proto3" json:"bytesfree,omitempty"` + BytesFree int64 `protobuf:"varint,1,opt,name=bytes_free,json=bytesFree,proto3" json:"bytes_free,omitempty"` } func (m *QueryClientFreeSpaceResponse) Reset() { *m = QueryClientFreeSpaceResponse{} } @@ -1527,9 +1527,9 @@ func (m *QueryClientFreeSpaceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryClientFreeSpaceResponse proto.InternalMessageInfo -func (m *QueryClientFreeSpaceResponse) GetBytesfree() int64 { +func (m *QueryClientFreeSpaceResponse) GetBytesFree() int64 { if m != nil { - return m.Bytesfree + return m.BytesFree } return 0 } @@ -2125,8 +2125,8 @@ var xxx_messageInfo_QueryStorageStatsRequest proto.InternalMessageInfo type QueryStorageStatsResponse struct { Purchased uint64 `protobuf:"varint,1,opt,name=purchased,proto3" json:"purchased,omitempty"` Used uint64 `protobuf:"varint,2,opt,name=used,proto3" json:"used,omitempty"` - UsedRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=usedRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"usedRatio"` - ActiveUsers uint64 `protobuf:"varint,4,opt,name=activeUsers,proto3" json:"activeUsers,omitempty"` + UsedRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=used_ratio,json=usedRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"used_ratio"` + ActiveUsers uint64 `protobuf:"varint,4,opt,name=active_users,json=activeUsers,proto3" json:"active_users,omitempty"` UsersByPlan map[int64]int64 `protobuf:"bytes,5,rep,name=users_by_plan,json=usersByPlan,proto3" json:"users_by_plan,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` } @@ -2215,9 +2215,9 @@ func init() { proto.RegisterType((*QueryReportResponse)(nil), "canine_chain.storage.QueryReportResponse") proto.RegisterType((*QueryAllReportRequest)(nil), "canine_chain.storage.QueryAllReportRequest") proto.RegisterType((*QueryAllReportResponse)(nil), "canine_chain.storage.QueryAllReportResponse") - proto.RegisterType((*QueryFreespaceRequest)(nil), "canine_chain.storage.QueryFreespaceRequest") + proto.RegisterType((*QueryFreeSpaceRequest)(nil), "canine_chain.storage.QueryFreeSpaceRequest") proto.RegisterType((*QueryStoreCountRequest)(nil), "canine_chain.storage.QueryStoreCountRequest") - proto.RegisterType((*QueryFreespaceResponse)(nil), "canine_chain.storage.QueryFreespaceResponse") + proto.RegisterType((*QueryFreeSpaceResponse)(nil), "canine_chain.storage.QueryFreeSpaceResponse") proto.RegisterType((*QueryStoreCountResponse)(nil), "canine_chain.storage.QueryStoreCountResponse") proto.RegisterType((*QueryFindFileRequest)(nil), "canine_chain.storage.QueryFindFileRequest") proto.RegisterType((*QueryFindFileResponse)(nil), "canine_chain.storage.QueryFindFileResponse") @@ -2243,135 +2243,136 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/query.proto", fileDescriptor_9fe03bff51a37284) } var fileDescriptor_9fe03bff51a37284 = []byte{ - // 2045 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x4f, 0x79, 0x6c, 0x27, 0x7e, 0xf6, 0x92, 0x50, 0x78, 0x17, 0x33, 0x04, 0xc7, 0x69, 0xb1, - 0x89, 0x63, 0xe2, 0xee, 0x78, 0x92, 0x6c, 0x76, 0xbd, 0x4b, 0x36, 0x76, 0x16, 0x87, 0xac, 0xb2, - 0x8a, 0xd3, 0x21, 0x20, 0xad, 0x10, 0x4d, 0x79, 0xa6, 0x3c, 0x69, 0x3c, 0xd3, 0xdd, 0xdb, 0xdd, - 0x13, 0x18, 0x59, 0xbe, 0x2c, 0x12, 0x07, 0x0e, 0x68, 0xa5, 0x3d, 0x71, 0x62, 0xc5, 0x06, 0x21, - 0x0e, 0x08, 0x69, 0x41, 0x88, 0x2b, 0x48, 0x48, 0x7b, 0x63, 0x25, 0x2e, 0x88, 0x43, 0x84, 0x12, - 0xfe, 0x10, 0x54, 0x55, 0xaf, 0xbf, 0x66, 0x7a, 0xba, 0x7b, 0xa2, 0x11, 0x7b, 0xf2, 0x54, 0x75, - 0xbd, 0xf7, 0x7e, 0xef, 0xa3, 0x5e, 0xd5, 0xaf, 0x64, 0x58, 0x69, 0x32, 0xc7, 0x76, 0xb8, 0xd5, - 0x7c, 0xc8, 0x6c, 0xc7, 0x08, 0x42, 0xd7, 0x67, 0x6d, 0x6e, 0xbc, 0xd7, 0xe3, 0x7e, 0x5f, 0xf7, - 0x7c, 0x37, 0x74, 0xe9, 0x62, 0x7a, 0x85, 0x8e, 0x2b, 0xea, 0x8b, 0x6d, 0xb7, 0xed, 0xca, 0x05, - 0x86, 0xf8, 0xa5, 0xd6, 0xd6, 0x4f, 0xb7, 0x5d, 0xb7, 0xdd, 0xe1, 0x06, 0xf3, 0x6c, 0x83, 0x39, - 0x8e, 0x1b, 0xb2, 0xd0, 0x76, 0x9d, 0x00, 0xbf, 0xae, 0x35, 0xdd, 0xa0, 0xeb, 0x06, 0xc6, 0x1e, - 0x0b, 0xd0, 0x84, 0xf1, 0x68, 0x63, 0x8f, 0x87, 0x6c, 0xc3, 0xf0, 0x58, 0xdb, 0x76, 0xe4, 0x62, - 0x5c, 0x7b, 0x36, 0x17, 0x97, 0xc7, 0x7c, 0xd6, 0x8d, 0xd4, 0x9d, 0xcf, 0x5d, 0xc2, 0x9a, 0xa1, - 0xfd, 0x88, 0x5b, 0x2d, 0xce, 0x3a, 0xd1, 0xc2, 0xaf, 0xe7, 0xeb, 0xf2, 0xdd, 0x47, 0x76, 0x8b, - 0xfb, 0xc5, 0xea, 0x3c, 0xd6, 0xef, 0x72, 0x27, 0xb4, 0x6c, 0x67, 0x1f, 0x9d, 0xd4, 0x16, 0x81, - 0xde, 0x13, 0xe0, 0x77, 0x25, 0x18, 0x93, 0xbf, 0xd7, 0xe3, 0x41, 0xa8, 0xdd, 0x83, 0x2f, 0x65, - 0x66, 0x03, 0xcf, 0x75, 0x02, 0x4e, 0x37, 0x61, 0x56, 0x81, 0x5e, 0x22, 0x2b, 0x64, 0x75, 0xbe, - 0x71, 0x5a, 0xcf, 0x0b, 0xa7, 0xae, 0xa4, 0xb6, 0xa7, 0x3f, 0x7d, 0x72, 0xe6, 0x98, 0x89, 0x12, - 0xda, 0xfb, 0x04, 0xbe, 0xa8, 0x74, 0xfa, 0xae, 0xbb, 0x8f, 0x86, 0xe8, 0x05, 0x38, 0x15, 0x41, - 0xb7, 0x58, 0xab, 0xe5, 0xf3, 0x40, 0xe9, 0x9e, 0x33, 0x4f, 0x46, 0xf3, 0x5b, 0x6a, 0x9a, 0xbe, - 0x04, 0xb3, 0x5d, 0xee, 0x1f, 0x74, 0xf8, 0xd2, 0xd4, 0x0a, 0x59, 0x5d, 0x30, 0x71, 0x44, 0x17, - 0x61, 0xc6, 0xfd, 0xb1, 0xc3, 0xfd, 0xa5, 0x9a, 0x94, 0x53, 0x03, 0x31, 0x1b, 0x84, 0xcc, 0x0f, - 0x97, 0xa6, 0x57, 0xc8, 0x6a, 0xcd, 0x54, 0x03, 0xed, 0x5e, 0xe4, 0xad, 0xc2, 0x80, 0x6e, 0xbd, - 0x0e, 0x33, 0x9e, 0x98, 0x40, 0xaf, 0xce, 0xe4, 0x7b, 0xb5, 0x63, 0x77, 0xb8, 0x94, 0x43, 0xc7, - 0x94, 0x8c, 0xf6, 0x01, 0x81, 0xaf, 0x26, 0x3a, 0x83, 0xed, 0x3e, 0xe2, 0x7d, 0x0e, 0x0f, 0x77, - 0x00, 0x92, 0xd2, 0x91, 0x5e, 0xce, 0x37, 0xce, 0xe9, 0xaa, 0xce, 0x74, 0x51, 0x67, 0xba, 0x2a, - 0x65, 0xac, 0x33, 0x7d, 0x97, 0xb5, 0x39, 0x9a, 0x31, 0x53, 0x92, 0xda, 0x63, 0x02, 0xa7, 0xf3, - 0x21, 0x0d, 0x3b, 0x5c, 0x1b, 0xd7, 0x61, 0x7a, 0x2b, 0x07, 0xe5, 0xf9, 0x52, 0x94, 0xca, 0x72, - 0x06, 0xe6, 0x77, 0xe1, 0x94, 0x44, 0x29, 0xec, 0x44, 0xd1, 0x4a, 0x92, 0x4c, 0xf2, 0x93, 0x3c, - 0x95, 0x9b, 0xe4, 0x5a, 0x3a, 0xc9, 0xbb, 0x58, 0x68, 0x4a, 0x6f, 0xec, 0xf2, 0xf4, 0xbe, 0x8d, - 0x6a, 0xe7, 0x1b, 0x67, 0xf3, 0x3d, 0x7e, 0xe0, 0xd8, 0xfb, 0x36, 0x6f, 0x09, 0x41, 0xf4, 0x59, - 0x0a, 0x69, 0x3f, 0x80, 0x45, 0xa9, 0x71, 0xab, 0xd3, 0x11, 0xdf, 0xe2, 0xdc, 0x66, 0x13, 0x46, - 0x9e, 0x3b, 0x61, 0x3f, 0x27, 0xf0, 0xa2, 0x34, 0x70, 0xd7, 0xe3, 0x4e, 0xc6, 0xc2, 0xe7, 0x50, - 0x3d, 0xbf, 0x8a, 0xc0, 0x24, 0xde, 0x62, 0x0c, 0xbf, 0x09, 0x33, 0x22, 0x1c, 0x01, 0x96, 0x4d, - 0xe5, 0x20, 0x2a, 0xa9, 0xc9, 0x15, 0xce, 0x25, 0x4c, 0xc7, 0x2e, 0x46, 0x20, 0x0a, 0xd6, 0x12, - 0x1c, 0xcf, 0xc6, 0x28, 0x1a, 0x6a, 0xdf, 0x47, 0x97, 0x12, 0x09, 0x74, 0xe9, 0x26, 0xcc, 0xc5, - 0xad, 0xb3, 0x78, 0xfb, 0x47, 0xa2, 0x51, 0x5f, 0x4b, 0xe4, 0xb4, 0x3d, 0x58, 0x8a, 0x02, 0x16, - 0xaf, 0x9a, 0x74, 0x89, 0xfc, 0x8e, 0xc0, 0x57, 0x72, 0x8c, 0xe4, 0xbb, 0x51, 0x7b, 0x1e, 0x37, - 0x26, 0x97, 0x9f, 0x1e, 0x7c, 0x59, 0x41, 0x0d, 0x43, 0x1e, 0xa8, 0x53, 0x33, 0xb5, 0xbf, 0x85, - 0x41, 0xee, 0x63, 0x86, 0x70, 0x34, 0x91, 0xe6, 0x6e, 0x47, 0x69, 0x48, 0x9b, 0xc5, 0x00, 0xbd, - 0x03, 0xf3, 0x2c, 0x99, 0xc6, 0x3c, 0xbc, 0x9c, 0x1f, 0xa2, 0x94, 0xfc, 0x8e, 0xeb, 0x77, 0x31, - 0x50, 0x69, 0x79, 0x8d, 0x63, 0xcf, 0xdf, 0xea, 0x74, 0x52, 0xab, 0x27, 0x9e, 0xf4, 0xbf, 0x44, - 0x8d, 0x7c, 0xc8, 0x0e, 0xba, 0x75, 0x17, 0x16, 0x52, 0xb0, 0xa2, 0xd4, 0x8f, 0xe5, 0x57, 0x46, - 0xc1, 0xe4, 0x6a, 0xc0, 0xc3, 0x93, 0xd6, 0xe4, 0x9e, 0xeb, 0x87, 0xff, 0x8f, 0xf4, 0x3f, 0xc0, - 0x3b, 0x4b, 0x64, 0x11, 0x43, 0x74, 0x1d, 0x66, 0x7d, 0x39, 0x83, 0x79, 0x58, 0xc9, 0x0f, 0x8e, - 0x92, 0x4a, 0xc5, 0x05, 0xa5, 0x34, 0x2b, 0xe9, 0x86, 0x59, 0x5f, 0x26, 0x95, 0xe4, 0x8f, 0x09, - 0xbc, 0x34, 0x68, 0x01, 0xb1, 0xdf, 0x80, 0xe3, 0x0a, 0x45, 0x94, 0xd9, 0xaa, 0xe0, 0x23, 0xb1, - 0xc9, 0xe5, 0x73, 0x03, 0xc3, 0xb0, 0xe3, 0x73, 0x1e, 0x78, 0xac, 0xc9, 0xcb, 0x9b, 0x6e, 0x03, - 0xfd, 0xba, 0x1f, 0xba, 0x3e, 0xbf, 0xe9, 0xf6, 0x9c, 0xb0, 0x5c, 0x46, 0x47, 0x99, 0x94, 0x19, - 0x8c, 0x85, 0x48, 0xba, 0x98, 0x40, 0x09, 0x35, 0xd0, 0x0c, 0x6c, 0x35, 0x69, 0x1b, 0x89, 0x40, - 0x53, 0x4c, 0x44, 0x02, 0x72, 0xa0, 0xe9, 0x78, 0x76, 0xec, 0xd8, 0x4e, 0xab, 0xc2, 0xc5, 0x43, - 0xdb, 0x8c, 0xfc, 0x8e, 0xd7, 0xa3, 0xfa, 0xb3, 0xb0, 0x10, 0x9f, 0xcc, 0xb6, 0x17, 0x39, 0x32, - 0x1f, 0xcd, 0xdd, 0xf6, 0x02, 0xed, 0x1a, 0x76, 0x89, 0x9b, 0x1d, 0x9b, 0x3b, 0xa1, 0x70, 0xe9, - 0x7e, 0xb5, 0xc8, 0xbd, 0x81, 0xdb, 0x7e, 0x48, 0x10, 0x6d, 0x9f, 0x86, 0xb9, 0xbd, 0x7e, 0xc8, - 0x83, 0x7d, 0x9f, 0x2b, 0xbc, 0x35, 0x33, 0x99, 0xd0, 0x8c, 0xf8, 0xf2, 0xde, 0x7f, 0x8b, 0x85, - 0xac, 0xdc, 0xdc, 0xfd, 0xe8, 0x3c, 0x8d, 0x04, 0xd0, 0xcc, 0xcb, 0xf0, 0x85, 0xd0, 0xee, 0x72, - 0xcb, 0xe7, 0x5d, 0x66, 0x3b, 0xb6, 0xd3, 0x46, 0x5b, 0x2f, 0x88, 0x59, 0x33, 0x9a, 0x14, 0x81, - 0x96, 0xc6, 0x65, 0x79, 0xd5, 0x4c, 0x35, 0xd0, 0x36, 0x61, 0x39, 0xce, 0x0c, 0x6b, 0xf3, 0x5d, - 0x45, 0x3d, 0x6e, 0x3b, 0xfb, 0x6e, 0x39, 0xa0, 0x9f, 0x12, 0x38, 0x33, 0x52, 0x18, 0xc1, 0xfd, - 0x10, 0x16, 0xb1, 0xfc, 0xad, 0x34, 0xad, 0xc1, 0x8d, 0xb8, 0x9a, 0xbf, 0x51, 0x86, 0xf5, 0xe1, - 0x86, 0xa1, 0xc1, 0xd0, 0x17, 0xed, 0x00, 0xce, 0x46, 0xfb, 0x72, 0xb4, 0x13, 0x93, 0xea, 0x02, - 0xff, 0x20, 0xa0, 0x15, 0x59, 0x2b, 0xf5, 0xba, 0x36, 0x19, 0xaf, 0x27, 0xd7, 0x31, 0xde, 0xc1, - 0xea, 0x17, 0xbb, 0xe6, 0x81, 0xd7, 0x71, 0x59, 0xeb, 0xe6, 0x43, 0xde, 0x3c, 0x28, 0xcd, 0xfe, - 0x88, 0x7a, 0xba, 0x82, 0x7b, 0x62, 0x48, 0x5d, 0xb2, 0xdd, 0x1f, 0xb1, 0x8e, 0xdd, 0x92, 0xda, - 0x4e, 0x98, 0x6a, 0xa0, 0xbd, 0x8d, 0xfd, 0x64, 0xd7, 0xb7, 0x9b, 0x3c, 0x63, 0xbf, 0x0e, 0x27, - 0x5a, 0x3d, 0x3f, 0x49, 0xdb, 0x9c, 0x19, 0x8f, 0x47, 0x20, 0x88, 0x7a, 0x4d, 0x5a, 0x57, 0x62, - 0xdc, 0x13, 0xb3, 0xb8, 0x41, 0xd4, 0x40, 0xfb, 0x5a, 0x74, 0x4b, 0x90, 0x2c, 0x7e, 0xf0, 0x6a, - 0xa8, 0xd9, 0xd1, 0xe1, 0x3e, 0xf8, 0x19, 0x95, 0xde, 0x1e, 0xbe, 0xd4, 0x8d, 0x3a, 0xd9, 0xb3, - 0x1a, 0x86, 0x6f, 0xa8, 0x75, 0xbc, 0x1a, 0x61, 0x25, 0xdc, 0x0f, 0x59, 0x18, 0xc3, 0x78, 0x36, - 0x85, 0x37, 0xcb, 0xec, 0xc7, 0xa4, 0xd5, 0x78, 0x3d, 0xbf, 0xf9, 0x90, 0x05, 0x5c, 0x85, 0x76, - 0xda, 0x4c, 0x26, 0x28, 0x85, 0xe9, 0x9e, 0xf8, 0x30, 0x25, 0x3f, 0xc8, 0xdf, 0xf4, 0x0e, 0xcc, - 0x89, 0xbf, 0xa6, 0x08, 0xa5, 0x3c, 0xb7, 0x17, 0xb6, 0x75, 0x81, 0xe7, 0xdf, 0x4f, 0xce, 0x9c, - 0x6b, 0xdb, 0xe1, 0xc3, 0xde, 0x9e, 0xde, 0x74, 0xbb, 0x06, 0x3e, 0x9f, 0xa8, 0x3f, 0xeb, 0x41, - 0xeb, 0xc0, 0x08, 0xfb, 0x1e, 0x0f, 0xf4, 0xb7, 0x78, 0xd3, 0x4c, 0x14, 0xd0, 0x15, 0x98, 0x57, - 0x8f, 0x20, 0x0f, 0x02, 0x11, 0x86, 0x69, 0x69, 0x28, 0x3d, 0x45, 0x5b, 0xf0, 0x42, 0x4f, 0xfc, - 0xb0, 0xf6, 0xfa, 0x96, 0xd7, 0x61, 0xce, 0xd2, 0x8c, 0x0c, 0xd5, 0x8d, 0xfc, 0x50, 0x8d, 0xf4, - 0x54, 0x97, 0xda, 0xb6, 0xfb, 0xbb, 0x1d, 0xe6, 0x7c, 0xcb, 0x09, 0xfd, 0xbe, 0x39, 0xdf, 0x4b, - 0x66, 0xea, 0xd7, 0xe1, 0xd4, 0xe0, 0x02, 0x7a, 0x0a, 0x6a, 0x07, 0xbc, 0x8f, 0x39, 0x17, 0x3f, - 0xb1, 0x08, 0x7b, 0x3c, 0x2a, 0x1c, 0x39, 0xd8, 0x9c, 0x7a, 0x95, 0x34, 0x7e, 0xb6, 0x0c, 0x33, - 0xd2, 0x36, 0xfd, 0x05, 0x81, 0x59, 0xf5, 0x42, 0x42, 0x57, 0x0b, 0x30, 0x66, 0x1e, 0x64, 0xea, - 0x17, 0x2a, 0xac, 0x54, 0x7e, 0x68, 0xc6, 0xfb, 0xff, 0xfc, 0xef, 0x87, 0x53, 0x17, 0xe8, 0x79, - 0xe3, 0x47, 0xac, 0x79, 0xc0, 0x3a, 0xeb, 0x2d, 0xe6, 0x1a, 0x4a, 0x7a, 0x3d, 0xef, 0x01, 0x8a, - 0x7e, 0x44, 0x60, 0x5a, 0xec, 0x2a, 0x7a, 0xae, 0xc0, 0x48, 0xea, 0xac, 0xac, 0x9f, 0x2f, 0x5d, - 0x87, 0x50, 0x6e, 0x49, 0x28, 0x5b, 0xf4, 0xcd, 0x52, 0x28, 0x92, 0x21, 0x1a, 0x87, 0xea, 0xd0, - 0x3d, 0x32, 0x0e, 0xe5, 0x45, 0xef, 0xc8, 0x38, 0x94, 0x57, 0xbb, 0x23, 0xfa, 0x21, 0x81, 0x13, - 0x92, 0x8b, 0x6e, 0x75, 0x3a, 0x74, 0xad, 0xc0, 0xfc, 0x00, 0x43, 0xaf, 0x7f, 0xa3, 0xd2, 0x5a, - 0x84, 0xab, 0x4b, 0xb8, 0xab, 0xf4, 0x5c, 0x35, 0xb8, 0xf4, 0xf7, 0x04, 0xe6, 0x62, 0xc6, 0x4e, - 0x8b, 0x4c, 0x0d, 0xf2, 0xfa, 0xf1, 0x70, 0xed, 0x48, 0x5c, 0x37, 0xe8, 0xf5, 0x52, 0x5c, 0xae, - 0xc7, 0x1d, 0x0b, 0x63, 0x39, 0xf8, 0x6e, 0x70, 0x44, 0xff, 0x4c, 0x60, 0x46, 0x3e, 0xe8, 0xd0, - 0xa2, 0x0c, 0xa6, 0xdf, 0xe7, 0xea, 0xab, 0xe5, 0x0b, 0x11, 0xe4, 0xbb, 0x12, 0xe4, 0x77, 0xa8, - 0x59, 0x5e, 0x76, 0x42, 0x2e, 0x07, 0xdf, 0xe8, 0xf4, 0xff, 0x9a, 0xc0, 0x5c, 0xdc, 0xdd, 0x0a, - 0xf3, 0x3f, 0xf0, 0x24, 0x50, 0x18, 0xe7, 0xc1, 0xc7, 0x00, 0xed, 0x0d, 0xe9, 0xc2, 0x2b, 0xf4, - 0x4a, 0x15, 0x17, 0x14, 0x18, 0xe3, 0x30, 0x8e, 0xee, 0xc7, 0x04, 0x16, 0x62, 0x90, 0xa2, 0x4e, - 0xf5, 0xe2, 0x1c, 0x0f, 0x9e, 0x07, 0x75, 0xa3, 0xf2, 0x7a, 0xc4, 0xdb, 0x90, 0x78, 0x2f, 0xd2, - 0xb5, 0xea, 0x78, 0xe9, 0xdf, 0x09, 0xcc, 0xa7, 0x88, 0x20, 0x5d, 0x2f, 0x32, 0x3a, 0xc4, 0xdf, - 0xeb, 0x7a, 0xd5, 0xe5, 0x08, 0xf1, 0x7b, 0x12, 0xe2, 0x3d, 0x7a, 0xb7, 0x14, 0x62, 0x9a, 0x86, - 0xaa, 0xe2, 0x90, 0x15, 0x30, 0xaa, 0x24, 0xfe, 0x40, 0xe0, 0x64, 0x9a, 0x12, 0x8b, 0x80, 0x6f, - 0x14, 0x07, 0x30, 0x87, 0xa9, 0xd7, 0x1b, 0xe3, 0x88, 0xa0, 0x4f, 0x57, 0xa5, 0x4f, 0x06, 0x5d, - 0x1f, 0xcb, 0x27, 0xfa, 0x09, 0x81, 0xe3, 0x26, 0xd2, 0xb2, 0xa2, 0x6d, 0x95, 0x61, 0x99, 0x85, - 0x8d, 0x3f, 0xcb, 0x16, 0x35, 0x53, 0xe2, 0xba, 0x43, 0xdf, 0x2e, 0xc5, 0x85, 0xec, 0xb0, 0x42, - 0x98, 0x7f, 0x49, 0x00, 0x10, 0xb4, 0x88, 0x70, 0x49, 0xdb, 0xca, 0x42, 0xbf, 0x58, 0x6d, 0x31, - 0xa2, 0xbf, 0x24, 0xd1, 0xaf, 0xd1, 0xd5, 0xaa, 0xe8, 0xe9, 0x63, 0x02, 0x73, 0x31, 0x4f, 0x2c, - 0x84, 0x36, 0x48, 0x5a, 0x0b, 0xa1, 0x0d, 0x51, 0xcf, 0x31, 0xfa, 0xc2, 0x7e, 0x24, 0x9b, 0xea, - 0x0b, 0xbf, 0x21, 0x00, 0x09, 0x3d, 0xa5, 0x17, 0x4b, 0xee, 0x25, 0x19, 0xa6, 0x5c, 0x5f, 0xaf, - 0xb8, 0x1a, 0x91, 0x6e, 0x4a, 0xa4, 0x57, 0x68, 0xa3, 0x14, 0xa9, 0xf8, 0x6b, 0x3b, 0xed, 0x14, - 0xce, 0x8f, 0xe4, 0x19, 0xab, 0x58, 0x6e, 0x61, 0x8f, 0x1d, 0xa0, 0xce, 0x85, 0x3d, 0x76, 0x90, - 0x36, 0x6b, 0xaf, 0x4b, 0x84, 0x57, 0xe9, 0xe5, 0x0a, 0x67, 0xac, 0xd3, 0x92, 0x67, 0x59, 0x5c, - 0x9d, 0xa2, 0x79, 0xd1, 0x5b, 0x3c, 0x1c, 0xa0, 0xc5, 0x85, 0xfb, 0x3e, 0x9f, 0x7b, 0x17, 0xee, - 0xfb, 0x11, 0xac, 0x5b, 0xfb, 0xb6, 0x84, 0xbe, 0x4d, 0x6f, 0x94, 0x42, 0x6f, 0xf3, 0xd0, 0x6a, - 0x4a, 0x2d, 0x96, 0xa8, 0x08, 0x6b, 0xb0, 0x24, 0x1e, 0x13, 0x80, 0x5b, 0x3c, 0x44, 0xbe, 0x4d, - 0x8b, 0x2f, 0x77, 0x69, 0x12, 0x5f, 0x5f, 0xab, 0xb2, 0x14, 0xf1, 0xbe, 0x29, 0xf1, 0xbe, 0x46, - 0xaf, 0x55, 0xc2, 0xeb, 0xb1, 0xbe, 0xd5, 0x62, 0x21, 0x4b, 0xc1, 0xfc, 0x1b, 0x01, 0x3a, 0xcc, - 0x1d, 0xe9, 0x95, 0xf2, 0x9b, 0xf5, 0x30, 0x51, 0xae, 0x5f, 0x1d, 0x53, 0x6a, 0x6c, 0x27, 0xd2, - 0x7c, 0x38, 0xe5, 0xc4, 0x5f, 0x09, 0xbc, 0x38, 0xac, 0x5f, 0x34, 0xb3, 0x6b, 0xc5, 0xfd, 0x69, - 0xb4, 0x2b, 0xaf, 0x8e, 0x2f, 0x38, 0xf6, 0xd1, 0x91, 0xf6, 0x86, 0xfe, 0x89, 0xc0, 0xc9, 0x01, - 0xde, 0x5b, 0x58, 0xf4, 0xf9, 0x94, 0xbb, 0xb0, 0xe8, 0x47, 0xd0, 0xea, 0x31, 0x3a, 0x8a, 0xd8, - 0xaa, 0x56, 0x4f, 0xaa, 0xb0, 0x9a, 0x12, 0xe2, 0x27, 0x04, 0x20, 0x21, 0xcb, 0x85, 0x9d, 0x6f, - 0x88, 0x9f, 0x17, 0x76, 0xbe, 0x61, 0x06, 0x3e, 0x06, 0xd5, 0x90, 0xdc, 0x5c, 0x21, 0x34, 0x0e, - 0x23, 0xca, 0x7f, 0x64, 0x1c, 0x4a, 0x92, 0x7f, 0x44, 0xff, 0x28, 0x2e, 0x16, 0x59, 0x3e, 0x5d, - 0x7c, 0xb1, 0xc8, 0x25, 0xf7, 0xc5, 0x17, 0x8b, 0x7c, 0xc2, 0xaf, 0xbd, 0x26, 0x7d, 0xb8, 0x4c, - 0x37, 0xca, 0x2f, 0x16, 0xea, 0xff, 0x02, 0x92, 0x6b, 0xdd, 0x6f, 0x09, 0x2c, 0xa4, 0x59, 0x6d, - 0xe1, 0xe5, 0x33, 0xe7, 0x15, 0xa0, 0xf0, 0xf2, 0x99, 0x47, 0x97, 0xb5, 0x57, 0x24, 0xd8, 0x4b, - 0x54, 0xaf, 0x74, 0xd4, 0xb0, 0x36, 0xb7, 0xc4, 0x4d, 0x28, 0xd8, 0xbe, 0xf3, 0xe9, 0xd3, 0x65, - 0xf2, 0xd9, 0xd3, 0x65, 0xf2, 0x9f, 0xa7, 0xcb, 0xe4, 0x83, 0x67, 0xcb, 0xc7, 0x3e, 0x7b, 0xb6, - 0x7c, 0xec, 0x5f, 0xcf, 0x96, 0x8f, 0xbd, 0xdb, 0x48, 0xbd, 0x0e, 0x28, 0x9d, 0x77, 0xd8, 0x5e, - 0x90, 0xd5, 0xf9, 0x93, 0x58, 0xab, 0x7c, 0x2d, 0xd8, 0x9b, 0x95, 0xff, 0xc5, 0x70, 0xf9, 0x7f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x42, 0xfb, 0x11, 0xb9, 0xfa, 0x21, 0x00, 0x00, + // 2060 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x1c, 0x49, + 0x15, 0x4e, 0x79, 0x6c, 0x27, 0xf3, 0xec, 0x25, 0xa1, 0xf0, 0x2e, 0x66, 0xc8, 0x3a, 0x4e, 0x8b, + 0x4d, 0x1c, 0x13, 0x77, 0xc7, 0x93, 0x64, 0xb3, 0xeb, 0x25, 0xd9, 0xd8, 0x59, 0x1c, 0xb2, 0x4a, + 0x14, 0xa7, 0x43, 0x40, 0x5a, 0x21, 0x9a, 0xf2, 0x4c, 0x79, 0xd2, 0x78, 0xa6, 0xbb, 0xb7, 0xbb, + 0xc7, 0x30, 0xb2, 0x7c, 0x59, 0x0e, 0x48, 0x1c, 0xd0, 0x4a, 0x7b, 0xe2, 0xc4, 0x8a, 0xdd, 0x15, + 0xe2, 0x80, 0x90, 0x16, 0x84, 0xb8, 0x82, 0x84, 0xb4, 0x37, 0x56, 0xe2, 0x82, 0x38, 0x44, 0x28, + 0x81, 0xff, 0x03, 0x55, 0xd5, 0xeb, 0xe9, 0xee, 0x99, 0x9e, 0xee, 0x9e, 0x68, 0x04, 0x27, 0x4f, + 0x55, 0xd7, 0x7b, 0xef, 0x7b, 0x3f, 0xea, 0x55, 0x7d, 0x25, 0xc3, 0x72, 0x83, 0x39, 0xb6, 0xc3, + 0xad, 0xc6, 0x63, 0x66, 0x3b, 0x46, 0x10, 0xba, 0x3e, 0x6b, 0x71, 0xe3, 0xdd, 0x2e, 0xf7, 0x7b, + 0xba, 0xe7, 0xbb, 0xa1, 0x4b, 0x17, 0x92, 0x2b, 0x74, 0x5c, 0x51, 0x5b, 0x68, 0xb9, 0x2d, 0x57, + 0x2e, 0x30, 0xc4, 0x2f, 0xb5, 0xb6, 0x76, 0xba, 0xe5, 0xba, 0xad, 0x36, 0x37, 0x98, 0x67, 0x1b, + 0xcc, 0x71, 0xdc, 0x90, 0x85, 0xb6, 0xeb, 0x04, 0xf8, 0x75, 0xb5, 0xe1, 0x06, 0x1d, 0x37, 0x30, + 0x76, 0x59, 0x80, 0x26, 0x8c, 0x83, 0xf5, 0x5d, 0x1e, 0xb2, 0x75, 0xc3, 0x63, 0x2d, 0xdb, 0x91, + 0x8b, 0x71, 0xed, 0xd9, 0x4c, 0x5c, 0x1e, 0xf3, 0x59, 0x27, 0x52, 0x77, 0x3e, 0x73, 0x09, 0x6b, + 0x84, 0xf6, 0x01, 0xb7, 0x9a, 0x9c, 0xb5, 0xa3, 0x85, 0x5f, 0xcb, 0xd6, 0xe5, 0xbb, 0x07, 0x76, + 0x93, 0xfb, 0xf9, 0xea, 0x3c, 0xd6, 0xeb, 0x70, 0x27, 0xb4, 0x6c, 0x67, 0x0f, 0x9d, 0xd4, 0x16, + 0x80, 0x3e, 0x10, 0xe0, 0x77, 0x24, 0x18, 0x93, 0xbf, 0xdb, 0xe5, 0x41, 0xa8, 0x3d, 0x80, 0x2f, + 0xa5, 0x66, 0x03, 0xcf, 0x75, 0x02, 0x4e, 0x37, 0x60, 0x56, 0x81, 0x5e, 0x24, 0xcb, 0x64, 0x65, + 0xae, 0x7e, 0x5a, 0xcf, 0x0a, 0xa7, 0xae, 0xa4, 0xb6, 0xa6, 0x3f, 0x7b, 0x72, 0xe6, 0x98, 0x89, + 0x12, 0xda, 0x7b, 0x04, 0xbe, 0xa8, 0x74, 0xfa, 0xae, 0xbb, 0x87, 0x86, 0xe8, 0x05, 0x38, 0x15, + 0x41, 0xb7, 0x58, 0xb3, 0xe9, 0xf3, 0x40, 0xe9, 0xae, 0x9a, 0x27, 0xa3, 0xf9, 0x4d, 0x35, 0x4d, + 0x5f, 0x82, 0xd9, 0x0e, 0xf7, 0xf7, 0xdb, 0x7c, 0x71, 0x6a, 0x99, 0xac, 0xcc, 0x9b, 0x38, 0xa2, + 0x0b, 0x30, 0xe3, 0xfe, 0xc8, 0xe1, 0xfe, 0x62, 0x45, 0xca, 0xa9, 0x81, 0x98, 0x0d, 0x42, 0xe6, + 0x87, 0x8b, 0xd3, 0xcb, 0x64, 0xa5, 0x62, 0xaa, 0x81, 0xf6, 0x20, 0xf2, 0x56, 0x61, 0x40, 0xb7, + 0xde, 0x80, 0x19, 0x4f, 0x4c, 0xa0, 0x57, 0x67, 0xb2, 0xbd, 0xda, 0xb6, 0xdb, 0x5c, 0xca, 0xa1, + 0x63, 0x4a, 0x46, 0x7b, 0x9f, 0xc0, 0x57, 0x63, 0x9d, 0xc1, 0x56, 0x0f, 0xf1, 0x3e, 0x87, 0x87, + 0xdb, 0x00, 0x71, 0xe9, 0x48, 0x2f, 0xe7, 0xea, 0xe7, 0x74, 0x55, 0x67, 0xba, 0xa8, 0x33, 0x5d, + 0x95, 0x32, 0xd6, 0x99, 0xbe, 0xc3, 0x5a, 0x1c, 0xcd, 0x98, 0x09, 0x49, 0xed, 0x63, 0x02, 0xa7, + 0xb3, 0x21, 0x0d, 0x3b, 0x5c, 0x19, 0xd7, 0x61, 0x7a, 0x3b, 0x03, 0xe5, 0xf9, 0x42, 0x94, 0xca, + 0x72, 0x0a, 0xe6, 0x77, 0xe0, 0x94, 0x44, 0x29, 0xec, 0x44, 0xd1, 0x8a, 0x93, 0x4c, 0xb2, 0x93, + 0x3c, 0x95, 0x99, 0xe4, 0x4a, 0x32, 0xc9, 0x3b, 0x58, 0x68, 0x4a, 0x6f, 0xdf, 0xe5, 0xe9, 0x3d, + 0x1b, 0xd5, 0xce, 0xd5, 0xcf, 0x66, 0x7b, 0xfc, 0xc8, 0xb1, 0xf7, 0x6c, 0xde, 0x14, 0x82, 0xe8, + 0xb3, 0x14, 0xd2, 0xbe, 0x0f, 0x0b, 0x52, 0xe3, 0x66, 0xbb, 0x2d, 0xbe, 0xf5, 0x73, 0x9b, 0x4e, + 0x18, 0x79, 0xee, 0x84, 0xfd, 0x8c, 0xc0, 0x8b, 0xd2, 0xc0, 0x7d, 0x8f, 0x3b, 0x29, 0x0b, 0xff, + 0x87, 0xea, 0xf9, 0x65, 0x04, 0x26, 0xf6, 0x16, 0x63, 0x78, 0x1d, 0x66, 0x44, 0x38, 0x02, 0x2c, + 0x9b, 0xd2, 0x41, 0x54, 0x52, 0x93, 0x2b, 0x9c, 0x4b, 0x98, 0x8e, 0x1d, 0x8c, 0x40, 0x14, 0xac, + 0x45, 0x38, 0x9e, 0x8e, 0x51, 0x34, 0xd4, 0xbe, 0x87, 0x2e, 0xc5, 0x12, 0xe8, 0xd2, 0x2d, 0xa8, + 0xf6, 0x5b, 0x67, 0xfe, 0xf6, 0x8f, 0x44, 0xa3, 0xbe, 0x16, 0xcb, 0x69, 0xbb, 0xb0, 0x18, 0x05, + 0xac, 0xbf, 0x6a, 0xd2, 0x25, 0xf2, 0x1b, 0x02, 0x5f, 0xc9, 0x30, 0x92, 0xed, 0x46, 0xe5, 0x79, + 0xdc, 0x98, 0x5c, 0x7e, 0xba, 0xf0, 0x65, 0x05, 0x35, 0x0c, 0x79, 0xa0, 0x4e, 0xcd, 0xc4, 0xfe, + 0x16, 0x06, 0xb9, 0x8f, 0x19, 0xc2, 0xd1, 0x44, 0x9a, 0xbb, 0x1d, 0xa5, 0x21, 0x69, 0x16, 0x03, + 0x74, 0x0f, 0xe6, 0x58, 0x3c, 0x8d, 0x79, 0x78, 0x25, 0x3b, 0x44, 0x09, 0xf9, 0x6d, 0xd7, 0xef, + 0x60, 0xa0, 0x92, 0xf2, 0x1a, 0xc7, 0x9e, 0xbf, 0xd9, 0x6e, 0x27, 0x56, 0x4f, 0x3c, 0xe9, 0x7f, + 0x8a, 0x1a, 0xf9, 0x90, 0x1d, 0x74, 0xeb, 0x3e, 0xcc, 0x27, 0x60, 0x45, 0xa9, 0x1f, 0xcb, 0xaf, + 0x94, 0x82, 0xc9, 0xd5, 0x80, 0x87, 0x27, 0xad, 0xc9, 0x3d, 0xd7, 0x0f, 0xff, 0x17, 0xe9, 0x7f, + 0x84, 0x77, 0x96, 0xc8, 0x22, 0x86, 0xe8, 0x06, 0xcc, 0xfa, 0x72, 0x06, 0xf3, 0xb0, 0x9c, 0x1d, + 0x1c, 0x25, 0x95, 0x88, 0x0b, 0x4a, 0x69, 0x56, 0xdc, 0x0d, 0xd3, 0xbe, 0x4c, 0x2a, 0xc9, 0x1f, + 0x11, 0x78, 0x69, 0xd0, 0x02, 0x62, 0xbf, 0x09, 0xc7, 0x15, 0x8a, 0x28, 0xb3, 0x65, 0xc1, 0x47, + 0x62, 0x93, 0xcb, 0xe7, 0x3a, 0x86, 0x61, 0xdb, 0xe7, 0xfc, 0xa1, 0xc7, 0x1a, 0xbc, 0xb8, 0xe9, + 0xd6, 0xd1, 0xaf, 0x87, 0xa1, 0xeb, 0xf3, 0x5b, 0x6e, 0xd7, 0x09, 0x8b, 0x65, 0x74, 0x94, 0x49, + 0x98, 0xc1, 0x58, 0x88, 0xa4, 0x8b, 0x09, 0x94, 0x50, 0x03, 0xcd, 0xc0, 0x56, 0x93, 0xb4, 0x11, + 0x0b, 0x34, 0xc4, 0x44, 0x24, 0x20, 0x07, 0x9a, 0x8e, 0x67, 0xc7, 0xb6, 0xed, 0x34, 0x4b, 0x5c, + 0x3c, 0xb4, 0x8d, 0xc8, 0xef, 0xfe, 0x7a, 0x54, 0x7f, 0x16, 0xe6, 0xfb, 0x27, 0xb3, 0xed, 0x45, + 0x8e, 0xcc, 0x45, 0x73, 0x77, 0xbc, 0x40, 0xbb, 0x86, 0x5d, 0xe2, 0x56, 0xdb, 0xe6, 0x4e, 0x38, + 0x46, 0xe4, 0xae, 0xe3, 0xb6, 0x1f, 0x12, 0x44, 0xdb, 0x2f, 0x03, 0xec, 0xf6, 0x42, 0x1e, 0x58, + 0x7b, 0x3e, 0x57, 0x80, 0x2b, 0x66, 0x55, 0xce, 0x88, 0xb5, 0x9a, 0xd1, 0xbf, 0xbd, 0xf7, 0xde, + 0x62, 0x21, 0x2b, 0xb6, 0xf7, 0x30, 0x3a, 0x50, 0x23, 0x01, 0xb4, 0xf3, 0x0a, 0x7c, 0x21, 0xb4, + 0x3b, 0xdc, 0xf2, 0x79, 0x87, 0xd9, 0x8e, 0xed, 0xb4, 0xd0, 0xd6, 0x0b, 0x62, 0xd6, 0x8c, 0x26, + 0x45, 0xa4, 0xa5, 0x71, 0x59, 0x5f, 0x15, 0x53, 0x0d, 0xb4, 0x0d, 0x58, 0xea, 0xa7, 0x86, 0xb5, + 0xf8, 0x8e, 0xe2, 0x1e, 0x77, 0x9c, 0x3d, 0xb7, 0x18, 0xd0, 0x4f, 0x08, 0x9c, 0x19, 0x29, 0x8c, + 0xe0, 0x7e, 0x00, 0x0b, 0x58, 0xff, 0x56, 0x92, 0xd7, 0xe0, 0x4e, 0x5c, 0xc9, 0xde, 0x29, 0xc3, + 0xfa, 0x70, 0xc7, 0xd0, 0x60, 0xe8, 0x8b, 0xb6, 0x0f, 0x67, 0xa3, 0x8d, 0x39, 0xda, 0x89, 0x49, + 0xb5, 0x81, 0xbf, 0x11, 0xd0, 0xf2, 0xac, 0x15, 0x7a, 0x5d, 0x99, 0x8c, 0xd7, 0x93, 0x6b, 0x19, + 0xf7, 0xb0, 0xfc, 0xc5, 0xb6, 0x79, 0xe4, 0xb5, 0x5d, 0xd6, 0xbc, 0xf5, 0x98, 0x37, 0xf6, 0x0b, + 0xb3, 0x3f, 0xa2, 0x9e, 0xae, 0xe0, 0xa6, 0x18, 0x52, 0x17, 0xef, 0xf7, 0x03, 0xd6, 0xb6, 0x9b, + 0x52, 0xdb, 0x09, 0x53, 0x0d, 0xb4, 0xb7, 0xb1, 0xa1, 0xec, 0xf8, 0x76, 0x83, 0xa7, 0xec, 0xd7, + 0xe0, 0x44, 0xb3, 0xeb, 0xc7, 0x69, 0xab, 0x9a, 0xfd, 0xf1, 0x08, 0x04, 0x51, 0xb3, 0x49, 0xea, + 0x8a, 0x8d, 0x7b, 0x62, 0x16, 0x37, 0x88, 0x1a, 0x68, 0x2f, 0x47, 0xd7, 0x04, 0x49, 0xe3, 0x07, + 0xef, 0x86, 0x9a, 0x1d, 0x9d, 0xee, 0x83, 0x9f, 0x51, 0xe9, 0x9d, 0xe1, 0x5b, 0xdd, 0xa8, 0xa3, + 0x3d, 0xad, 0x61, 0xf8, 0x8a, 0x5a, 0xc3, 0xbb, 0x11, 0x56, 0xc2, 0xc3, 0x90, 0x85, 0x7d, 0x18, + 0xff, 0x99, 0xc2, 0xab, 0x65, 0xfa, 0x23, 0x82, 0x38, 0x0d, 0x55, 0xaf, 0xeb, 0x37, 0x1e, 0xb3, + 0x80, 0xab, 0xd0, 0x4e, 0x9b, 0xf1, 0x04, 0xa5, 0x30, 0xdd, 0x15, 0x1f, 0xa6, 0xe4, 0x07, 0xf9, + 0x9b, 0xde, 0x03, 0x10, 0x7f, 0x2d, 0x19, 0x4b, 0x79, 0x72, 0xcf, 0x6f, 0xe9, 0x02, 0xd0, 0x3f, + 0x9f, 0x9c, 0x39, 0xd7, 0xb2, 0xc3, 0xc7, 0xdd, 0x5d, 0xbd, 0xe1, 0x76, 0x0c, 0x7c, 0x40, 0x51, + 0x7f, 0xd6, 0x82, 0xe6, 0xbe, 0x11, 0xf6, 0x3c, 0x1e, 0xe8, 0x6f, 0xf1, 0x86, 0x59, 0x15, 0x1a, + 0x4c, 0xa1, 0x40, 0x34, 0x5a, 0x7c, 0x06, 0xe9, 0x06, 0x22, 0x10, 0xd3, 0xd2, 0xd4, 0x9c, 0x9a, + 0x7b, 0x24, 0xa6, 0x68, 0x13, 0x5e, 0x90, 0xdf, 0xac, 0xdd, 0x9e, 0xe5, 0xb5, 0x99, 0xb3, 0x38, + 0x23, 0x83, 0x75, 0x33, 0x3b, 0x58, 0x23, 0x7d, 0xd5, 0xa5, 0xb6, 0xad, 0xde, 0x4e, 0x9b, 0x39, + 0xdf, 0x74, 0x42, 0xbf, 0x67, 0xce, 0x75, 0xe3, 0x99, 0xda, 0x0d, 0x38, 0x35, 0xb8, 0x80, 0x9e, + 0x82, 0xca, 0x3e, 0xef, 0x61, 0xd6, 0xc5, 0x4f, 0x2c, 0xc3, 0x2e, 0x8f, 0x4a, 0x47, 0x0e, 0x36, + 0xa6, 0x5e, 0x23, 0xf5, 0x9f, 0x2e, 0xc1, 0x8c, 0xb4, 0x4d, 0x7f, 0x4e, 0x60, 0x56, 0x3d, 0x92, + 0xd0, 0x95, 0x1c, 0x8c, 0xa9, 0x37, 0x99, 0xda, 0x85, 0x12, 0x2b, 0x95, 0x1f, 0x9a, 0xf1, 0xde, + 0xdf, 0xff, 0xfd, 0xc1, 0xd4, 0x05, 0x7a, 0xde, 0xf8, 0x21, 0x6b, 0xec, 0xb3, 0xf6, 0x5a, 0x93, + 0xb9, 0x86, 0x92, 0x5e, 0xcb, 0x7a, 0x83, 0xa2, 0x1f, 0x12, 0x98, 0x16, 0xfb, 0x8a, 0x9e, 0xcb, + 0x31, 0x92, 0x38, 0x2e, 0x6b, 0xe7, 0x0b, 0xd7, 0x21, 0x94, 0xdb, 0x12, 0xca, 0x26, 0x7d, 0xb3, + 0x10, 0x8a, 0x24, 0x89, 0xc6, 0xa1, 0x3a, 0x77, 0x8f, 0x8c, 0x43, 0x79, 0xd7, 0x3b, 0x32, 0x0e, + 0xe5, 0xed, 0xee, 0x88, 0x7e, 0x40, 0xe0, 0x84, 0xa4, 0xa3, 0x9b, 0xed, 0x36, 0x5d, 0xcd, 0x31, + 0x3f, 0x40, 0xd2, 0x6b, 0x5f, 0x2f, 0xb5, 0x16, 0xe1, 0xea, 0x12, 0xee, 0x0a, 0x3d, 0x57, 0x0e, + 0x2e, 0xfd, 0x2d, 0x81, 0x6a, 0x9f, 0xb4, 0xd3, 0x3c, 0x53, 0x83, 0xd4, 0x7e, 0x3c, 0x5c, 0xdb, + 0x12, 0xd7, 0x4d, 0x7a, 0xa3, 0x10, 0x97, 0xeb, 0x71, 0xc7, 0xc2, 0x58, 0x0e, 0x3e, 0x1d, 0x1c, + 0xd1, 0x3f, 0x12, 0x98, 0x91, 0x6f, 0x3a, 0x34, 0x2f, 0x83, 0xc9, 0x27, 0xba, 0xda, 0x4a, 0xf1, + 0x42, 0x04, 0xf9, 0x8e, 0x04, 0xf9, 0x6d, 0x6a, 0x16, 0x97, 0x9d, 0x90, 0xcb, 0xc0, 0x37, 0x3a, + 0xfd, 0xbf, 0x22, 0x50, 0xed, 0xf7, 0xb7, 0xdc, 0xfc, 0x0f, 0xbc, 0x0a, 0xe4, 0xc6, 0x79, 0xf0, + 0x3d, 0x40, 0xfb, 0x86, 0x74, 0xe1, 0x55, 0x7a, 0xa5, 0x8c, 0x0b, 0x0a, 0x8c, 0x71, 0xd8, 0x8f, + 0xee, 0x47, 0x04, 0xe6, 0xfb, 0x20, 0x45, 0x9d, 0xea, 0xf9, 0x39, 0x1e, 0x3c, 0x11, 0x6a, 0x46, + 0xe9, 0xf5, 0x88, 0xb7, 0x2e, 0xf1, 0x5e, 0xa4, 0xab, 0xe5, 0xf1, 0xd2, 0xbf, 0x12, 0x98, 0x4b, + 0x70, 0x41, 0xba, 0x96, 0x67, 0x74, 0x88, 0xc2, 0xd7, 0xf4, 0xb2, 0xcb, 0x11, 0xe2, 0x77, 0x25, + 0xc4, 0x07, 0xf4, 0x7e, 0x21, 0xc4, 0x24, 0x13, 0x55, 0xc5, 0x21, 0x2b, 0x60, 0x54, 0x49, 0xfc, + 0x8e, 0xc0, 0xc9, 0x24, 0x2b, 0x16, 0x01, 0x5f, 0xcf, 0x0f, 0x60, 0x06, 0x59, 0xaf, 0xd5, 0xc7, + 0x11, 0x41, 0x9f, 0xae, 0x4a, 0x9f, 0x0c, 0xba, 0x36, 0x96, 0x4f, 0xf4, 0x53, 0x02, 0xc7, 0x4d, + 0x64, 0x66, 0x79, 0xdb, 0x2a, 0x45, 0x34, 0x73, 0x1b, 0x7f, 0x9a, 0x30, 0x6a, 0xa6, 0xc4, 0x75, + 0x97, 0xbe, 0x5d, 0x88, 0x0b, 0x09, 0x62, 0x89, 0x30, 0xff, 0x82, 0x00, 0x20, 0x68, 0x11, 0xe1, + 0x82, 0xb6, 0x95, 0x86, 0x7e, 0xb1, 0xdc, 0x62, 0x44, 0x7f, 0x49, 0xa2, 0x5f, 0xa5, 0x2b, 0x65, + 0xd1, 0xd3, 0x4f, 0x08, 0x54, 0x05, 0xe5, 0x91, 0x64, 0x30, 0x17, 0xda, 0x20, 0xfb, 0xca, 0x85, + 0x36, 0xc4, 0xb8, 0xb4, 0xeb, 0x12, 0xda, 0x35, 0x7a, 0xb5, 0xf8, 0x5c, 0xf0, 0x39, 0xb7, 0x24, + 0x9e, 0x44, 0x63, 0xf8, 0x84, 0x00, 0xc4, 0x14, 0x95, 0x5e, 0x2c, 0xb8, 0x98, 0xa4, 0xd8, 0x72, + 0x6d, 0xad, 0xe4, 0x6a, 0x84, 0xba, 0x21, 0xa1, 0x5e, 0xa1, 0xf5, 0x42, 0xa8, 0xe2, 0xaf, 0xed, + 0xb4, 0x12, 0x38, 0x3f, 0x94, 0x87, 0xac, 0x62, 0xba, 0xb9, 0x4d, 0x76, 0x80, 0x3e, 0xe7, 0x36, + 0xd9, 0x41, 0xea, 0xac, 0xbd, 0x21, 0x11, 0x5e, 0xa5, 0x97, 0x4b, 0x1c, 0xb2, 0x4e, 0x53, 0x1e, + 0x66, 0xfd, 0xf2, 0x14, 0xdd, 0x8b, 0xde, 0xe6, 0xe1, 0x00, 0x35, 0xce, 0xdd, 0xf8, 0xd9, 0xfc, + 0x3b, 0x77, 0xe3, 0x8f, 0x60, 0xde, 0xda, 0xb7, 0x24, 0xf4, 0x2d, 0x7a, 0xb3, 0x10, 0x7a, 0x8b, + 0x87, 0x56, 0x43, 0x6a, 0xb1, 0x32, 0x4b, 0xe2, 0x63, 0x02, 0x70, 0x9b, 0x87, 0x48, 0xb9, 0x69, + 0xfe, 0xed, 0x2e, 0xc9, 0xe3, 0x6b, 0xab, 0x65, 0x96, 0x22, 0xde, 0x37, 0x25, 0xde, 0xd7, 0xe9, + 0xb5, 0x52, 0x78, 0x3d, 0xd6, 0xb3, 0x9a, 0x2c, 0x64, 0x09, 0x98, 0x7f, 0x21, 0x40, 0x87, 0xe9, + 0x23, 0xbd, 0x52, 0x7c, 0xb5, 0x1e, 0xe6, 0xca, 0xb5, 0xab, 0x63, 0x4a, 0x8d, 0xed, 0x44, 0x92, + 0x12, 0x27, 0x9c, 0xf8, 0x33, 0x81, 0x17, 0x87, 0xf5, 0x8b, 0x6e, 0x76, 0x2d, 0xbf, 0x41, 0x8d, + 0x76, 0xe5, 0xb5, 0xf1, 0x05, 0xc7, 0x3e, 0x3b, 0x92, 0xde, 0xd0, 0x3f, 0x10, 0x38, 0x39, 0x40, + 0x7d, 0x73, 0x8b, 0x3e, 0x9b, 0x75, 0xe7, 0x16, 0xfd, 0x08, 0x66, 0x3d, 0x46, 0x47, 0x11, 0x5b, + 0xd5, 0xea, 0x4a, 0x15, 0x56, 0x43, 0x42, 0xfc, 0x94, 0x00, 0xc4, 0x7c, 0x39, 0xb7, 0xf3, 0x0d, + 0x51, 0xf4, 0xdc, 0xce, 0x37, 0x4c, 0xc2, 0xc7, 0xe0, 0x1a, 0x92, 0x9e, 0x2b, 0x84, 0xc6, 0x61, + 0xc4, 0xfa, 0x8f, 0x8c, 0x43, 0xc9, 0xf3, 0x8f, 0xe8, 0xef, 0xc5, 0xcd, 0x22, 0x4d, 0xa9, 0xf3, + 0x6f, 0x16, 0x99, 0xfc, 0x3e, 0xff, 0x66, 0x91, 0xcd, 0xf9, 0xb5, 0xd7, 0xa5, 0x0f, 0x97, 0xe9, + 0x7a, 0xf1, 0xcd, 0x42, 0x91, 0xe2, 0xf8, 0x5e, 0xf7, 0x6b, 0x02, 0xf3, 0x49, 0x5a, 0x9b, 0x7b, + 0xfb, 0xcc, 0x78, 0x08, 0xc8, 0xbd, 0x7d, 0x66, 0xf1, 0x65, 0xed, 0x55, 0x09, 0xf6, 0x12, 0xd5, + 0x4b, 0x1d, 0x35, 0xac, 0xc5, 0x2d, 0x71, 0x15, 0x0a, 0xb6, 0xee, 0x7e, 0xf6, 0x74, 0x89, 0x7c, + 0xfe, 0x74, 0x89, 0xfc, 0xeb, 0xe9, 0x12, 0x79, 0xff, 0xd9, 0xd2, 0xb1, 0xcf, 0x9f, 0x2d, 0x1d, + 0xfb, 0xc7, 0xb3, 0xa5, 0x63, 0xef, 0xd4, 0x13, 0xef, 0x03, 0x4a, 0xe7, 0x5d, 0xb6, 0x1b, 0xa4, + 0x75, 0xfe, 0xb8, 0xaf, 0x55, 0xbe, 0x17, 0xec, 0xce, 0xca, 0xff, 0x64, 0xb8, 0xfc, 0xdf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x12, 0x85, 0x70, 0xf5, 0xfe, 0x21, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2409,7 +2410,7 @@ type QueryClient interface { // Queries a list of Attestation items. ReportsAll(ctx context.Context, in *QueryAllReportRequest, opts ...grpc.CallOption) (*QueryAllReportResponse, error) // Queries a list of Freespace items. - Freespace(ctx context.Context, in *QueryFreespaceRequest, opts ...grpc.CallOption) (*QueryFreespaceResponse, error) + Freespace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) // Queries a list of Freespace items. StoreCount(ctx context.Context, in *QueryStoreCountRequest, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. @@ -2539,8 +2540,8 @@ func (c *queryClient) ReportsAll(ctx context.Context, in *QueryAllReportRequest, return out, nil } -func (c *queryClient) Freespace(ctx context.Context, in *QueryFreespaceRequest, opts ...grpc.CallOption) (*QueryFreespaceResponse, error) { - out := new(QueryFreespaceResponse) +func (c *queryClient) Freespace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) { + out := new(QueryFreeSpaceResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Freespace", in, out, opts...) if err != nil { return nil, err @@ -2663,7 +2664,7 @@ type QueryServer interface { // Queries a list of Attestation items. ReportsAll(context.Context, *QueryAllReportRequest) (*QueryAllReportResponse, error) // Queries a list of Freespace items. - Freespace(context.Context, *QueryFreespaceRequest) (*QueryFreespaceResponse, error) + Freespace(context.Context, *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) // Queries a list of Freespace items. StoreCount(context.Context, *QueryStoreCountRequest) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. @@ -2723,7 +2724,7 @@ func (*UnimplementedQueryServer) Reports(ctx context.Context, req *QueryReportRe func (*UnimplementedQueryServer) ReportsAll(ctx context.Context, req *QueryAllReportRequest) (*QueryAllReportResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ReportsAll not implemented") } -func (*UnimplementedQueryServer) Freespace(ctx context.Context, req *QueryFreespaceRequest) (*QueryFreespaceResponse, error) { +func (*UnimplementedQueryServer) Freespace(ctx context.Context, req *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Freespace not implemented") } func (*UnimplementedQueryServer) StoreCount(ctx context.Context, req *QueryStoreCountRequest) (*QueryStoreCountResponse, error) { @@ -2960,7 +2961,7 @@ func _Query_ReportsAll_Handler(srv interface{}, ctx context.Context, dec func(in } func _Query_Freespace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFreespaceRequest) + in := new(QueryFreeSpaceRequest) if err := dec(in); err != nil { return nil, err } @@ -2972,7 +2973,7 @@ func _Query_Freespace_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/canine_chain.storage.Query/Freespace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Freespace(ctx, req.(*QueryFreespaceRequest)) + return srv.(QueryServer).Freespace(ctx, req.(*QueryFreeSpaceRequest)) } return interceptor(ctx, in, info, handler) } @@ -4163,7 +4164,7 @@ func (m *QueryAllReportResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryFreespaceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFreeSpaceRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4173,12 +4174,12 @@ func (m *QueryFreespaceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFreespaceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFreeSpaceRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFreespaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFreeSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4223,7 +4224,7 @@ func (m *QueryStoreCountRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryFreespaceResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryFreeSpaceResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4233,12 +4234,12 @@ func (m *QueryFreespaceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFreespaceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFreeSpaceResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFreespaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFreeSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4393,8 +4394,8 @@ func (m *QueryClientFreeSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l - if m.Bytesfree != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Bytesfree)) + if m.BytesFree != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.BytesFree)) i-- dAtA[i] = 0x8 } @@ -5260,7 +5261,7 @@ func (m *QueryAllReportResponse) Size() (n int) { return n } -func (m *QueryFreespaceRequest) Size() (n int) { +func (m *QueryFreeSpaceRequest) Size() (n int) { if m == nil { return 0 } @@ -5286,7 +5287,7 @@ func (m *QueryStoreCountRequest) Size() (n int) { return n } -func (m *QueryFreespaceResponse) Size() (n int) { +func (m *QueryFreeSpaceResponse) Size() (n int) { if m == nil { return 0 } @@ -5357,8 +5358,8 @@ func (m *QueryClientFreeSpaceResponse) Size() (n int) { } var l int _ = l - if m.Bytesfree != 0 { - n += 1 + sovQuery(uint64(m.Bytesfree)) + if m.BytesFree != 0 { + n += 1 + sovQuery(uint64(m.BytesFree)) } return n } @@ -8016,7 +8017,7 @@ func (m *QueryAllReportResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFreespaceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFreeSpaceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8039,10 +8040,10 @@ func (m *QueryFreespaceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFreespaceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFreeSpaceRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFreespaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFreeSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8180,7 +8181,7 @@ func (m *QueryStoreCountRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFreespaceResponse) Unmarshal(dAtA []byte) error { +func (m *QueryFreeSpaceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8203,10 +8204,10 @@ func (m *QueryFreespaceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFreespaceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFreeSpaceResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFreespaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFreeSpaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8623,9 +8624,9 @@ func (m *QueryClientFreeSpaceResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Bytesfree", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BytesFree", wireType) } - m.Bytesfree = 0 + m.BytesFree = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8635,7 +8636,7 @@ func (m *QueryClientFreeSpaceResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Bytesfree |= int64(b&0x7F) << shift + m.BytesFree |= int64(b&0x7F) << shift if b < 0x80 { break } diff --git a/x/storage/types/query.pb.gw.go b/x/storage/types/query.pb.gw.go index 7a546bc2c..304e49a32 100644 --- a/x/storage/types/query.pb.gw.go +++ b/x/storage/types/query.pb.gw.go @@ -780,7 +780,7 @@ func local_request_Query_ReportsAll_0(ctx context.Context, marshaler runtime.Mar } func request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFreespaceRequest + var protoReq QueryFreeSpaceRequest var metadata runtime.ServerMetadata var ( @@ -807,7 +807,7 @@ func request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFreespaceRequest + var protoReq QueryFreeSpaceRequest var metadata runtime.ServerMetadata var ( @@ -2306,7 +2306,7 @@ var ( pattern_Query_ReportsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "reports"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Freespace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "freespace", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Freespace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "free_space", "address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_StoreCount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "storing", "address"}, "", runtime.AssumeColonVerbOpt(false))) diff --git a/x/storage/types/tx.pb.go b/x/storage/types/tx.pb.go index b40103a76..d30d14323 100644 --- a/x/storage/types/tx.pb.go +++ b/x/storage/types/tx.pb.go @@ -265,7 +265,7 @@ func (m *MsgPostProof) GetStart() int64 { type MsgPostProofResponse struct { Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - ErrorMessage string `protobuf:"bytes,2,opt,name=errorMessage,proto3" json:"errorMessage,omitempty"` + ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` } func (m *MsgPostProofResponse) Reset() { *m = MsgPostProofResponse{} } @@ -587,23 +587,23 @@ func (m *MsgSetProviderKeybaseResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSetProviderKeybaseResponse proto.InternalMessageInfo -type MsgSetProviderTotalspace struct { +type MsgSetProviderTotalSpace struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Space string `protobuf:"bytes,2,opt,name=space,proto3" json:"space,omitempty"` } -func (m *MsgSetProviderTotalspace) Reset() { *m = MsgSetProviderTotalspace{} } -func (m *MsgSetProviderTotalspace) String() string { return proto.CompactTextString(m) } -func (*MsgSetProviderTotalspace) ProtoMessage() {} -func (*MsgSetProviderTotalspace) Descriptor() ([]byte, []int) { +func (m *MsgSetProviderTotalSpace) Reset() { *m = MsgSetProviderTotalSpace{} } +func (m *MsgSetProviderTotalSpace) String() string { return proto.CompactTextString(m) } +func (*MsgSetProviderTotalSpace) ProtoMessage() {} +func (*MsgSetProviderTotalSpace) Descriptor() ([]byte, []int) { return fileDescriptor_2194ba0b2c3d6a97, []int{10} } -func (m *MsgSetProviderTotalspace) XXX_Unmarshal(b []byte) error { +func (m *MsgSetProviderTotalSpace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSetProviderTotalspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSetProviderTotalSpace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSetProviderTotalspace.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSetProviderTotalSpace.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -613,47 +613,47 @@ func (m *MsgSetProviderTotalspace) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgSetProviderTotalspace) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSetProviderTotalspace.Merge(m, src) +func (m *MsgSetProviderTotalSpace) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetProviderTotalSpace.Merge(m, src) } -func (m *MsgSetProviderTotalspace) XXX_Size() int { +func (m *MsgSetProviderTotalSpace) XXX_Size() int { return m.Size() } -func (m *MsgSetProviderTotalspace) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSetProviderTotalspace.DiscardUnknown(m) +func (m *MsgSetProviderTotalSpace) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetProviderTotalSpace.DiscardUnknown(m) } -var xxx_messageInfo_MsgSetProviderTotalspace proto.InternalMessageInfo +var xxx_messageInfo_MsgSetProviderTotalSpace proto.InternalMessageInfo -func (m *MsgSetProviderTotalspace) GetCreator() string { +func (m *MsgSetProviderTotalSpace) GetCreator() string { if m != nil { return m.Creator } return "" } -func (m *MsgSetProviderTotalspace) GetSpace() string { +func (m *MsgSetProviderTotalSpace) GetSpace() string { if m != nil { return m.Space } return "" } -type MsgSetProviderTotalspaceResponse struct { +type MsgSetProviderTotalSpaceResponse struct { } -func (m *MsgSetProviderTotalspaceResponse) Reset() { *m = MsgSetProviderTotalspaceResponse{} } -func (m *MsgSetProviderTotalspaceResponse) String() string { return proto.CompactTextString(m) } -func (*MsgSetProviderTotalspaceResponse) ProtoMessage() {} -func (*MsgSetProviderTotalspaceResponse) Descriptor() ([]byte, []int) { +func (m *MsgSetProviderTotalSpaceResponse) Reset() { *m = MsgSetProviderTotalSpaceResponse{} } +func (m *MsgSetProviderTotalSpaceResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSetProviderTotalSpaceResponse) ProtoMessage() {} +func (*MsgSetProviderTotalSpaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2194ba0b2c3d6a97, []int{11} } -func (m *MsgSetProviderTotalspaceResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgSetProviderTotalSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSetProviderTotalspaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSetProviderTotalSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSetProviderTotalspaceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSetProviderTotalSpaceResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -663,17 +663,17 @@ func (m *MsgSetProviderTotalspaceResponse) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } -func (m *MsgSetProviderTotalspaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSetProviderTotalspaceResponse.Merge(m, src) +func (m *MsgSetProviderTotalSpaceResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetProviderTotalSpaceResponse.Merge(m, src) } -func (m *MsgSetProviderTotalspaceResponse) XXX_Size() int { +func (m *MsgSetProviderTotalSpaceResponse) XXX_Size() int { return m.Size() } -func (m *MsgSetProviderTotalspaceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSetProviderTotalspaceResponse.DiscardUnknown(m) +func (m *MsgSetProviderTotalSpaceResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetProviderTotalSpaceResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgSetProviderTotalspaceResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgSetProviderTotalSpaceResponse proto.InternalMessageInfo type MsgAddClaimer struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` @@ -855,7 +855,7 @@ type MsgInitProvider struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` Keybase string `protobuf:"bytes,3,opt,name=keybase,proto3" json:"keybase,omitempty"` - Totalspace string `protobuf:"bytes,4,opt,name=totalspace,proto3" json:"totalspace,omitempty"` + TotalSpace string `protobuf:"bytes,4,opt,name=total_space,json=totalSpace,proto3" json:"total_space,omitempty"` } func (m *MsgInitProvider) Reset() { *m = MsgInitProvider{} } @@ -912,9 +912,9 @@ func (m *MsgInitProvider) GetKeybase() string { return "" } -func (m *MsgInitProvider) GetTotalspace() string { +func (m *MsgInitProvider) GetTotalSpace() string { if m != nil { - return m.Totalspace + return m.TotalSpace } return "" } @@ -1854,8 +1854,8 @@ func init() { proto.RegisterType((*MsgSetProviderIPResponse)(nil), "canine_chain.storage.MsgSetProviderIPResponse") proto.RegisterType((*MsgSetProviderKeybase)(nil), "canine_chain.storage.MsgSetProviderKeybase") proto.RegisterType((*MsgSetProviderKeybaseResponse)(nil), "canine_chain.storage.MsgSetProviderKeybaseResponse") - proto.RegisterType((*MsgSetProviderTotalspace)(nil), "canine_chain.storage.MsgSetProviderTotalspace") - proto.RegisterType((*MsgSetProviderTotalspaceResponse)(nil), "canine_chain.storage.MsgSetProviderTotalspaceResponse") + proto.RegisterType((*MsgSetProviderTotalSpace)(nil), "canine_chain.storage.MsgSetProviderTotalSpace") + proto.RegisterType((*MsgSetProviderTotalSpaceResponse)(nil), "canine_chain.storage.MsgSetProviderTotalSpaceResponse") proto.RegisterType((*MsgAddClaimer)(nil), "canine_chain.storage.MsgAddClaimer") proto.RegisterType((*MsgAddClaimerResponse)(nil), "canine_chain.storage.MsgAddClaimerResponse") proto.RegisterType((*MsgRemoveClaimer)(nil), "canine_chain.storage.MsgRemoveClaimer") @@ -1883,84 +1883,85 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/tx.proto", fileDescriptor_2194ba0b2c3d6a97) } var fileDescriptor_2194ba0b2c3d6a97 = []byte{ - // 1231 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x2d, 0xd9, 0x96, 0xc6, 0xb2, 0xeb, 0x30, 0x76, 0xc2, 0xd0, 0xb1, 0x6c, 0x33, 0x48, - 0xe3, 0x26, 0x88, 0x84, 0x3a, 0x40, 0x7b, 0xe9, 0xc5, 0x6e, 0x10, 0xc0, 0x8d, 0x55, 0xb8, 0xb4, - 0x8b, 0xfe, 0xa2, 0xc2, 0x4a, 0x5c, 0xcb, 0x8c, 0x25, 0x2e, 0xb3, 0xbb, 0x72, 0xac, 0x5c, 0x8a, - 0xf6, 0xdc, 0x43, 0x5f, 0x20, 0x87, 0x1e, 0xfa, 0x2e, 0x3d, 0xe6, 0xd8, 0x63, 0x61, 0x3f, 0x40, - 0x5f, 0xa1, 0xe0, 0x72, 0xb9, 0x22, 0x65, 0x92, 0x92, 0x83, 0x06, 0xed, 0x4d, 0x3b, 0xfb, 0xed, - 0xcc, 0xf7, 0xcd, 0xac, 0x76, 0x06, 0x84, 0xd5, 0x36, 0xf2, 0x5c, 0x0f, 0x37, 0xdb, 0xc7, 0xc8, - 0xf5, 0xea, 0x8c, 0x13, 0x8a, 0x3a, 0xb8, 0xce, 0xcf, 0x6a, 0x3e, 0x25, 0x9c, 0xe8, 0x4b, 0xf1, - 0xed, 0x9a, 0xdc, 0xb6, 0xfe, 0xd6, 0x60, 0xae, 0xc1, 0x3a, 0xfb, 0x84, 0xf1, 0xa7, 0x6e, 0x17, - 0xeb, 0x06, 0xcc, 0xb6, 0x29, 0x46, 0x9c, 0x50, 0x43, 0x5b, 0xd7, 0x36, 0xcb, 0x76, 0xb4, 0xd4, - 0x6f, 0xc2, 0x4c, 0x0f, 0xd3, 0x93, 0x2e, 0x36, 0xa6, 0xd6, 0xb5, 0xcd, 0x8a, 0x2d, 0x57, 0xfa, - 0x0a, 0x94, 0x8f, 0xdc, 0x2e, 0x6e, 0x32, 0xf7, 0x15, 0x36, 0x0a, 0xeb, 0xda, 0x66, 0xc1, 0x2e, - 0x05, 0x86, 0x03, 0xf7, 0x15, 0xd6, 0xef, 0xc1, 0x82, 0x4f, 0x09, 0x39, 0x6a, 0xba, 0x1e, 0xc7, - 0xf4, 0x14, 0x75, 0x8d, 0xa2, 0x40, 0xcc, 0x0b, 0xeb, 0xae, 0x34, 0xea, 0xab, 0x00, 0x21, 0x8c, - 0x0f, 0x7c, 0x6c, 0x4c, 0x0b, 0x48, 0x59, 0x58, 0x0e, 0x07, 0x3e, 0x0e, 0xb6, 0x7b, 0xe8, 0xac, - 0x29, 0x0c, 0xcc, 0x98, 0x09, 0xb7, 0x7b, 0xe8, 0x6c, 0x5f, 0x18, 0x02, 0xce, 0xf8, 0xcc, 0x77, - 0x29, 0x66, 0xc6, 0xac, 0xd8, 0x8b, 0x96, 0xba, 0x0e, 0x45, 0x8f, 0x70, 0x6c, 0x94, 0x84, 0x14, - 0xf1, 0xdb, 0xfa, 0x06, 0x6e, 0xc4, 0x04, 0xdb, 0x98, 0xf9, 0xc4, 0x63, 0x58, 0xdf, 0x80, 0x8a, - 0x4f, 0xc9, 0xa9, 0xeb, 0x60, 0xda, 0x74, 0x7d, 0x66, 0x68, 0xeb, 0x85, 0xcd, 0xb2, 0x3d, 0x17, - 0xd9, 0x76, 0x7d, 0xa6, 0xaf, 0xc1, 0x1c, 0xe3, 0x88, 0xf2, 0x66, 0xab, 0x4b, 0xda, 0x27, 0x22, - 0x0d, 0x05, 0x1b, 0x84, 0x69, 0x27, 0xb0, 0x58, 0xaf, 0x35, 0xa8, 0x48, 0xdf, 0x82, 0x5a, 0x4e, - 0x36, 0x75, 0x28, 0xba, 0x1c, 0xf7, 0x64, 0x2e, 0xc5, 0xef, 0x20, 0x93, 0xc7, 0x88, 0x1d, 0x37, - 0xbb, 0x2e, 0xe3, 0x22, 0x93, 0x15, 0xbb, 0x14, 0x18, 0xf6, 0x5c, 0xc6, 0x63, 0xe9, 0x2f, 0x26, - 0xd2, 0xbf, 0x04, 0xd3, 0xe4, 0xa5, 0x87, 0xa9, 0xc8, 0x5a, 0xd9, 0x0e, 0x17, 0x81, 0x55, 0xf0, - 0x92, 0xc9, 0x0a, 0x17, 0xd6, 0x21, 0x2c, 0xc5, 0xe9, 0x29, 0xed, 0x06, 0xcc, 0xb2, 0x7e, 0xbb, - 0x8d, 0x19, 0x13, 0x34, 0x4b, 0x76, 0xb4, 0xd4, 0x2d, 0xa8, 0x60, 0x4a, 0x09, 0x6d, 0x60, 0xc6, - 0x50, 0x27, 0x2c, 0x7d, 0xd9, 0x4e, 0xd8, 0xac, 0xaf, 0x60, 0xbe, 0xc1, 0x3a, 0x4f, 0x70, 0x17, - 0x73, 0xfc, 0x96, 0x77, 0x48, 0xd1, 0x2d, 0xc4, 0xe9, 0xde, 0x82, 0xe5, 0x84, 0xe3, 0x88, 0xaf, - 0xf5, 0x09, 0x2c, 0x36, 0x58, 0xe7, 0x00, 0x07, 0x32, 0xc2, 0xea, 0xec, 0xe7, 0x04, 0x5d, 0x80, - 0x29, 0xd7, 0x97, 0xcc, 0xa7, 0x5c, 0xdf, 0x32, 0xc1, 0x18, 0x3d, 0xad, 0x3c, 0x3f, 0x13, 0x21, - 0x63, 0x7b, 0xcf, 0xf0, 0xa0, 0x85, 0x58, 0x9e, 0x26, 0x03, 0x66, 0x4f, 0x42, 0x90, 0x8c, 0x11, - 0x2d, 0xad, 0x35, 0x58, 0x4d, 0x75, 0xa6, 0xa2, 0x7d, 0x36, 0xca, 0xe4, 0x90, 0x70, 0xd4, 0x65, - 0x3e, 0x6a, 0xe7, 0x05, 0x0c, 0x92, 0x15, 0x40, 0x64, 0xb8, 0x70, 0x61, 0x59, 0xb0, 0x9e, 0xe5, - 0x4b, 0xc5, 0xfb, 0x5c, 0x54, 0x6a, 0xdb, 0x71, 0x3e, 0xed, 0x22, 0xb7, 0x87, 0x69, 0x4e, 0x90, - 0xbb, 0x30, 0xdf, 0x0e, 0x40, 0x4d, 0xe4, 0x38, 0x34, 0xb8, 0x18, 0xb2, 0xf2, 0xc2, 0xb8, 0x1d, - 0xda, 0x64, 0x81, 0x86, 0xfe, 0x54, 0xa0, 0x2f, 0x44, 0x81, 0x6c, 0xdc, 0x23, 0xa7, 0xf8, 0x5f, - 0x8a, 0x15, 0x56, 0x2d, 0xe1, 0x52, 0x85, 0xeb, 0xc3, 0x7b, 0x0d, 0xd6, 0xd9, 0xf5, 0x5c, 0x25, - 0x7e, 0xf2, 0xeb, 0x10, 0xaf, 0x5f, 0x21, 0x51, 0x3f, 0xbd, 0x0a, 0xc0, 0x55, 0x12, 0xc5, 0xdf, - 0xae, 0x6c, 0xc7, 0x2c, 0xd6, 0x6d, 0xb8, 0x35, 0x12, 0x56, 0x31, 0xaa, 0x8b, 0x47, 0xe6, 0xe0, - 0xb8, 0xcf, 0x1d, 0xf2, 0xd2, 0x1b, 0xcf, 0xca, 0x5a, 0x85, 0x95, 0x94, 0x03, 0xca, 0xdf, 0x6f, - 0x9a, 0x28, 0xdd, 0x4e, 0x7f, 0x70, 0x10, 0x3e, 0xdc, 0x39, 0x02, 0xd7, 0x60, 0xee, 0x88, 0xd0, - 0x91, 0x64, 0xc2, 0x11, 0xa1, 0x32, 0x95, 0xba, 0x09, 0x25, 0xa7, 0x4f, 0x11, 0x77, 0x89, 0x27, - 0x25, 0xab, 0x75, 0x70, 0xb9, 0x5a, 0x03, 0x8e, 0x99, 0x94, 0x1b, 0x2e, 0x82, 0x0a, 0xf9, 0x68, - 0xd0, 0xc3, 0x1e, 0x6f, 0x3a, 0xd8, 0x23, 0x3d, 0xf9, 0xd8, 0x54, 0xa4, 0xf1, 0x49, 0x60, 0x93, - 0xb7, 0x61, 0x48, 0x51, 0x91, 0xff, 0x5e, 0x70, 0x17, 0x45, 0x3b, 0xe0, 0x14, 0x0d, 0x72, 0xb8, - 0x2f, 0x42, 0xa1, 0xed, 0x3a, 0x92, 0x73, 0xf0, 0x73, 0x54, 0x4d, 0x61, 0x54, 0x8d, 0x0c, 0x3b, - 0xf4, 0xae, 0xc2, 0xfe, 0xae, 0xc1, 0xf5, 0x06, 0xeb, 0x7c, 0xe9, 0x77, 0x28, 0x72, 0xf0, 0xff, - 0x37, 0x6f, 0x2b, 0x70, 0xfb, 0x12, 0x4d, 0x25, 0x62, 0x20, 0x36, 0x6d, 0xfc, 0xa2, 0x8f, 0x19, - 0xdf, 0xe6, 0x1c, 0x33, 0x2e, 0x02, 0x3e, 0x25, 0xb4, 0xf7, 0x76, 0x0f, 0x6d, 0xd8, 0x2d, 0x0a, - 0xa9, 0xdd, 0xa2, 0x18, 0x7f, 0x7e, 0x5f, 0xc0, 0x46, 0x66, 0x68, 0xd5, 0x3a, 0xee, 0x40, 0x39, - 0x6a, 0x91, 0x51, 0xcf, 0x1c, 0x1a, 0xe2, 0x8d, 0x65, 0x2a, 0xd9, 0x58, 0x96, 0x60, 0x5a, 0x34, - 0x91, 0x88, 0x88, 0x58, 0x58, 0x3f, 0x69, 0x50, 0x0e, 0x5e, 0x14, 0x11, 0x2c, 0x5f, 0x5e, 0x10, - 0x04, 0x53, 0x59, 0x25, 0xb9, 0x8a, 0xc9, 0x2e, 0xa4, 0xcb, 0x2e, 0xa6, 0xca, 0x9e, 0x8e, 0xcb, - 0xbe, 0x21, 0x6e, 0x4d, 0x48, 0x41, 0x95, 0xe1, 0x17, 0x4d, 0xb4, 0x4e, 0x99, 0x0c, 0x1b, 0xfb, - 0x84, 0xf2, 0xf1, 0x25, 0x78, 0x67, 0x1c, 0xbb, 0x70, 0x27, 0x8d, 0xcd, 0xbb, 0xad, 0x4a, 0x18, - 0xe7, 0x3f, 0xad, 0x4a, 0x48, 0x21, 0x92, 0xb9, 0xf5, 0x7a, 0x1e, 0x0a, 0x0d, 0xd6, 0xd1, 0xbf, - 0x86, 0x92, 0x1a, 0x60, 0x37, 0x6a, 0x69, 0x73, 0x6e, 0x2d, 0x36, 0xf2, 0x99, 0x1f, 0x8c, 0x85, - 0xa8, 0x44, 0x7e, 0x07, 0xe5, 0xe1, 0x34, 0x67, 0xe5, 0x9e, 0x13, 0x18, 0xf3, 0xc1, 0x78, 0x8c, - 0x72, 0xfe, 0x03, 0x40, 0x6c, 0x6a, 0xba, 0x9b, 0x79, 0x72, 0x08, 0x32, 0x1f, 0x4e, 0x00, 0x52, - 0xfe, 0x3b, 0x30, 0x9f, 0x9c, 0x91, 0xde, 0xcf, 0x3c, 0x9d, 0xc0, 0x99, 0xb5, 0xc9, 0x70, 0x2a, - 0xd0, 0x29, 0xe8, 0x29, 0x23, 0xd3, 0xc3, 0x49, 0xbc, 0x48, 0xb0, 0xf9, 0xf8, 0x0a, 0x60, 0x15, - 0xf7, 0x47, 0x58, 0x4e, 0x1f, 0x9e, 0x26, 0x12, 0x30, 0xc4, 0x9b, 0x1f, 0x5d, 0x0d, 0xaf, 0x08, - 0x38, 0x50, 0x49, 0x4c, 0x1d, 0xf7, 0x32, 0xfd, 0xc4, 0x61, 0xe6, 0xa3, 0x89, 0x60, 0x2a, 0x8a, - 0x0f, 0x8b, 0x97, 0x26, 0x89, 0xec, 0x3b, 0x3c, 0x0a, 0x35, 0x3f, 0x9c, 0x18, 0x1a, 0xbf, 0x99, - 0xb1, 0x51, 0x23, 0xfb, 0x66, 0x0e, 0x41, 0x39, 0x37, 0xf3, 0xf2, 0x44, 0xa0, 0x3f, 0x87, 0x85, - 0x91, 0xb6, 0x7c, 0x3f, 0xf3, 0x78, 0x12, 0x68, 0xd6, 0x27, 0x04, 0xaa, 0x58, 0x47, 0xa0, 0x6f, - 0x3b, 0x4e, 0x24, 0x31, 0x9a, 0x46, 0xb3, 0x35, 0x0d, 0xc7, 0xd9, 0x1c, 0x4d, 0x97, 0x67, 0x5e, - 0x9d, 0xc0, 0x72, 0x38, 0x9d, 0x8e, 0x86, 0xca, 0xfe, 0xd7, 0x25, 0xa6, 0xd9, 0x9c, 0x7f, 0x5d, - 0xea, 0xd4, 0xab, 0xff, 0xac, 0xc1, 0xcd, 0x8c, 0xc1, 0xa0, 0x9e, 0xe3, 0x2a, 0xed, 0x80, 0xf9, - 0xf1, 0x15, 0x0f, 0x28, 0x12, 0x36, 0xcc, 0xc8, 0x6e, 0xbd, 0x96, 0x9d, 0x2c, 0x01, 0x30, 0xef, - 0x8f, 0x01, 0x28, 0x9f, 0x0c, 0xae, 0x5f, 0x6e, 0xb4, 0x0f, 0xc6, 0x31, 0x1c, 0x62, 0xcd, 0xad, - 0xc9, 0xb1, 0x71, 0x21, 0xb2, 0xc1, 0xad, 0xe5, 0x9c, 0x0e, 0x00, 0x39, 0x42, 0x92, 0xfd, 0x69, - 0x67, 0xef, 0x8f, 0xf3, 0xaa, 0xf6, 0xe6, 0xbc, 0xaa, 0xfd, 0x75, 0x5e, 0xd5, 0x7e, 0xbd, 0xa8, - 0x5e, 0x7b, 0x73, 0x51, 0xbd, 0xf6, 0xe7, 0x45, 0xf5, 0xda, 0xb7, 0x5b, 0x1d, 0x97, 0x1f, 0xf7, - 0x5b, 0xb5, 0x36, 0xe9, 0xd5, 0x9f, 0xa3, 0xf6, 0x09, 0xea, 0xee, 0xa1, 0x16, 0xab, 0x87, 0x7e, - 0x1f, 0x85, 0x5f, 0x70, 0xce, 0x86, 0xdf, 0x70, 0x06, 0x3e, 0x66, 0xad, 0x19, 0xf1, 0x1d, 0xe7, - 0xf1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x67, 0x18, 0xd6, 0x3f, 0xe8, 0x11, 0x00, 0x00, + // 1240 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6e, 0xdb, 0xc6, + 0x13, 0x0e, 0x2d, 0xd9, 0x96, 0xc6, 0x92, 0x7f, 0x0e, 0x63, 0x27, 0x0c, 0x1d, 0xcb, 0x36, 0x8d, + 0xfc, 0xe2, 0x26, 0x88, 0x84, 0x3a, 0x40, 0x7b, 0xe9, 0xc5, 0x6e, 0x10, 0xc0, 0x8d, 0x55, 0xb8, + 0x54, 0x82, 0xfe, 0x45, 0x85, 0x95, 0xb8, 0x96, 0x19, 0x4b, 0x5c, 0x66, 0x77, 0xe5, 0x58, 0xb9, + 0x14, 0xed, 0xb9, 0x87, 0xbe, 0x40, 0x0e, 0x3d, 0xf4, 0x5d, 0x7a, 0xcc, 0xb1, 0xc7, 0xc2, 0x7e, + 0x80, 0xbe, 0x42, 0xc1, 0xe5, 0x72, 0x45, 0xc9, 0x24, 0x25, 0x07, 0x0d, 0xda, 0x9b, 0x76, 0xf6, + 0xdb, 0x99, 0xef, 0x9b, 0x59, 0xed, 0x0c, 0x08, 0x6b, 0x6d, 0xe4, 0xb9, 0x1e, 0x6e, 0xb6, 0x8f, + 0x91, 0xeb, 0xd5, 0x18, 0x27, 0x14, 0x75, 0x70, 0x8d, 0x9f, 0x55, 0x7d, 0x4a, 0x38, 0xd1, 0x97, + 0xe3, 0xdb, 0x55, 0xb9, 0x6d, 0xfd, 0xa5, 0xc1, 0x42, 0x9d, 0x75, 0x0e, 0x09, 0xe3, 0x4f, 0xdc, + 0x2e, 0xd6, 0x0d, 0x98, 0x6f, 0x53, 0x8c, 0x38, 0xa1, 0x86, 0xb6, 0xa1, 0x6d, 0x17, 0xed, 0x68, + 0xa9, 0xdf, 0x84, 0xb9, 0x1e, 0xa6, 0x27, 0x5d, 0x6c, 0xcc, 0x6c, 0x68, 0xdb, 0x25, 0x5b, 0xae, + 0xf4, 0x55, 0x28, 0x1e, 0xb9, 0x5d, 0xdc, 0x64, 0xee, 0x6b, 0x6c, 0xe4, 0x36, 0xb4, 0xed, 0x9c, + 0x5d, 0x08, 0x0c, 0x0d, 0xf7, 0x35, 0xd6, 0xef, 0xc2, 0xa2, 0x4f, 0x09, 0x39, 0x6a, 0xba, 0x1e, + 0xc7, 0xf4, 0x14, 0x75, 0x8d, 0xbc, 0x40, 0x94, 0x85, 0x75, 0x5f, 0x1a, 0xf5, 0x35, 0x80, 0x10, + 0xc6, 0x07, 0x3e, 0x36, 0x66, 0x05, 0xa4, 0x28, 0x2c, 0xcf, 0x06, 0x3e, 0x0e, 0xb6, 0x7b, 0xe8, + 0xac, 0x29, 0x0c, 0xcc, 0x98, 0x0b, 0xb7, 0x7b, 0xe8, 0xec, 0x50, 0x18, 0x02, 0xce, 0xf8, 0xcc, + 0x77, 0x29, 0x66, 0xc6, 0xbc, 0xd8, 0x8b, 0x96, 0xba, 0x0e, 0x79, 0x8f, 0x70, 0x6c, 0x14, 0x84, + 0x14, 0xf1, 0xdb, 0xfa, 0x1a, 0x6e, 0xc4, 0x04, 0xdb, 0x98, 0xf9, 0xc4, 0x63, 0x58, 0xdf, 0x84, + 0x92, 0x4f, 0xc9, 0xa9, 0xeb, 0x60, 0xda, 0x74, 0x7d, 0x66, 0x68, 0x1b, 0xb9, 0xed, 0xa2, 0xbd, + 0x10, 0xd9, 0xf6, 0x7d, 0xa6, 0xaf, 0xc3, 0x02, 0xe3, 0x88, 0xf2, 0x66, 0xab, 0x4b, 0xda, 0x27, + 0x22, 0x0d, 0x39, 0x1b, 0x84, 0x69, 0x2f, 0xb0, 0x58, 0x6f, 0x34, 0x28, 0x49, 0xdf, 0x82, 0x5a, + 0x46, 0x36, 0x75, 0xc8, 0xbb, 0x1c, 0xf7, 0x64, 0x2e, 0xc5, 0xef, 0x20, 0x93, 0xc7, 0x88, 0x1d, + 0x37, 0xbb, 0x2e, 0xe3, 0x22, 0x93, 0x25, 0xbb, 0x10, 0x18, 0x0e, 0x5c, 0xc6, 0x63, 0xe9, 0xcf, + 0x8f, 0xa4, 0x7f, 0x19, 0x66, 0xc9, 0x2b, 0x0f, 0x53, 0x91, 0xb5, 0xa2, 0x1d, 0x2e, 0x02, 0xab, + 0xe0, 0x25, 0x93, 0x15, 0x2e, 0xac, 0xe7, 0xb0, 0x1c, 0xa7, 0xa7, 0xb4, 0x1b, 0x30, 0xcf, 0xfa, + 0xed, 0x36, 0x66, 0x4c, 0xd0, 0x2c, 0xd8, 0xd1, 0x52, 0xdf, 0x82, 0x32, 0xa6, 0x94, 0xd0, 0x66, + 0x0f, 0x33, 0x86, 0x3a, 0x61, 0xed, 0x8b, 0x76, 0x49, 0x18, 0xeb, 0xa1, 0xcd, 0xfa, 0x12, 0xca, + 0x75, 0xd6, 0x79, 0x8c, 0xbb, 0x98, 0xe3, 0x77, 0xbc, 0x44, 0x8a, 0x6f, 0x2e, 0xce, 0xf7, 0x16, + 0xac, 0x8c, 0x38, 0x8e, 0x08, 0x5b, 0x9f, 0xc0, 0x52, 0x9d, 0x75, 0x1a, 0x38, 0xd0, 0x11, 0x96, + 0xe7, 0x30, 0x23, 0xe8, 0x22, 0xcc, 0xb8, 0xbe, 0x64, 0x3e, 0xe3, 0xfa, 0x96, 0x09, 0xc6, 0xf8, + 0x69, 0xe5, 0xf9, 0xa9, 0x08, 0x19, 0xdb, 0x7b, 0x8a, 0x07, 0x2d, 0xc4, 0xb2, 0x34, 0x19, 0x30, + 0x7f, 0x12, 0x82, 0x64, 0x8c, 0x68, 0x69, 0xad, 0xc3, 0x5a, 0xa2, 0x33, 0x15, 0xed, 0xb3, 0x71, + 0x26, 0xcf, 0x08, 0x47, 0xdd, 0x86, 0x8f, 0xda, 0x59, 0x01, 0x83, 0x64, 0x05, 0x10, 0x19, 0x2e, + 0x5c, 0x58, 0x16, 0x6c, 0xa4, 0xf9, 0x52, 0xf1, 0x3e, 0x17, 0x95, 0xda, 0x75, 0x9c, 0x4f, 0xbb, + 0xc8, 0xed, 0x61, 0x9a, 0x11, 0x64, 0x0b, 0xca, 0xed, 0x00, 0xd4, 0x44, 0x8e, 0x43, 0x83, 0x9b, + 0x21, 0x2b, 0x2f, 0x8c, 0xbb, 0xa1, 0x4d, 0x16, 0x68, 0xe8, 0x4f, 0x05, 0xfa, 0x42, 0x14, 0xc8, + 0xc6, 0x3d, 0x72, 0x8a, 0xff, 0xa1, 0x58, 0x61, 0xd5, 0x46, 0x5c, 0xaa, 0x70, 0xa7, 0xf0, 0xbf, + 0x3a, 0xeb, 0xec, 0x7b, 0xae, 0x12, 0x3f, 0xfd, 0x75, 0x88, 0xd7, 0x2f, 0x37, 0x52, 0xbf, 0xe0, + 0x0f, 0xcf, 0x83, 0x24, 0x36, 0xc3, 0x74, 0xe7, 0xc5, 0x2e, 0x70, 0x95, 0x57, 0xeb, 0x36, 0xdc, + 0x1a, 0x8b, 0xab, 0x28, 0xd5, 0xc4, 0x33, 0xd3, 0x38, 0xee, 0x73, 0x87, 0xbc, 0xf2, 0x26, 0xd3, + 0xb2, 0xd6, 0x60, 0x35, 0xe1, 0x80, 0xf2, 0xf7, 0xab, 0x26, 0x6a, 0xb7, 0xd7, 0x1f, 0x34, 0xc2, + 0xa7, 0x3b, 0x43, 0xe1, 0x3a, 0x2c, 0x1c, 0x11, 0x3a, 0x96, 0x4d, 0x38, 0x22, 0x54, 0xe6, 0x52, + 0x37, 0xa1, 0xe0, 0xf4, 0x29, 0xe2, 0x2e, 0xf1, 0xa4, 0x66, 0xb5, 0x0e, 0x6e, 0x57, 0x6b, 0xc0, + 0x31, 0x93, 0x72, 0xc3, 0x45, 0x50, 0x22, 0x1f, 0x0d, 0x7a, 0xd8, 0xe3, 0x4d, 0x07, 0x7b, 0xa4, + 0x27, 0x9f, 0x9b, 0x92, 0x34, 0x3e, 0x0e, 0x6c, 0xf2, 0x3a, 0x0c, 0x29, 0x2a, 0xf2, 0xdf, 0x09, + 0xee, 0xa2, 0x6a, 0x0d, 0x4e, 0xd1, 0x20, 0x83, 0xfb, 0x12, 0xe4, 0xda, 0xae, 0x23, 0x39, 0x07, + 0x3f, 0xc7, 0xd5, 0xe4, 0xc6, 0xd5, 0xc8, 0xb0, 0x43, 0xef, 0x2a, 0xec, 0x6f, 0x1a, 0x5c, 0xaf, + 0xb3, 0xce, 0x73, 0xbf, 0x43, 0x91, 0x83, 0xff, 0xbb, 0x79, 0x5b, 0x85, 0xdb, 0x97, 0x68, 0x2a, + 0x11, 0x03, 0xb1, 0x69, 0xe3, 0x97, 0x7d, 0xcc, 0xf8, 0x2e, 0xe7, 0x98, 0x71, 0x11, 0xf0, 0x09, + 0xa1, 0xbd, 0x77, 0x7b, 0x69, 0xc3, 0x7e, 0x91, 0x4b, 0xec, 0x17, 0xf9, 0xf8, 0xfb, 0xfb, 0x12, + 0x36, 0x53, 0x43, 0xab, 0xe6, 0x71, 0x07, 0x8a, 0x51, 0x93, 0x8c, 0xba, 0xe6, 0xd0, 0x10, 0x6f, + 0x2d, 0x33, 0xa3, 0xad, 0x65, 0x19, 0x66, 0x45, 0x17, 0x89, 0x88, 0x88, 0x85, 0xf5, 0xa3, 0x06, + 0xc5, 0xe0, 0x49, 0x11, 0xc1, 0xb2, 0xe5, 0x05, 0x41, 0x30, 0x95, 0x55, 0x92, 0xab, 0x98, 0xec, + 0x5c, 0xb2, 0xec, 0x7c, 0xa2, 0xec, 0xd9, 0xb8, 0xec, 0x1b, 0xe2, 0xd6, 0x84, 0x14, 0x54, 0x19, + 0x7e, 0xd6, 0x44, 0xf3, 0x94, 0xc9, 0xb0, 0xb1, 0x4f, 0x28, 0x9f, 0x5c, 0x82, 0xf7, 0xc6, 0xb1, + 0x0b, 0x77, 0x92, 0xd8, 0xbc, 0xdf, 0xaa, 0x84, 0x71, 0xfe, 0xd5, 0xaa, 0x84, 0x14, 0x22, 0x99, + 0x3b, 0x6f, 0xca, 0x90, 0xab, 0xb3, 0x8e, 0xfe, 0x15, 0x14, 0xd4, 0x08, 0xbb, 0x59, 0x4d, 0x9a, + 0x74, 0xab, 0xb1, 0xa1, 0xcf, 0xfc, 0x60, 0x22, 0x44, 0x25, 0xf2, 0x5b, 0x28, 0x0e, 0xe7, 0x39, + 0x2b, 0xf3, 0x9c, 0xc0, 0x98, 0xf7, 0x27, 0x63, 0x94, 0xf3, 0xef, 0x01, 0x62, 0x63, 0xd3, 0x56, + 0xea, 0xc9, 0x21, 0xc8, 0x7c, 0x30, 0x05, 0x48, 0xf9, 0xef, 0x40, 0x79, 0x74, 0x48, 0xfa, 0x7f, + 0xea, 0xe9, 0x11, 0x9c, 0x59, 0x9d, 0x0e, 0xa7, 0x02, 0x9d, 0x82, 0x9e, 0x30, 0x33, 0x3d, 0x98, + 0xc6, 0x8b, 0x04, 0x9b, 0x8f, 0xae, 0x00, 0x56, 0x71, 0x7f, 0x80, 0x95, 0xe4, 0xe9, 0x69, 0x2a, + 0x01, 0x43, 0xbc, 0xf9, 0xd1, 0xd5, 0xf0, 0x8a, 0x80, 0x03, 0xa5, 0x91, 0xb1, 0xe3, 0x6e, 0xaa, + 0x9f, 0x38, 0xcc, 0x7c, 0x38, 0x15, 0x4c, 0x45, 0xf1, 0x61, 0xe9, 0xd2, 0x24, 0x91, 0x7e, 0x87, + 0xc7, 0xa1, 0xe6, 0x87, 0x53, 0x43, 0xe3, 0x37, 0x33, 0x36, 0x6a, 0xa4, 0xdf, 0xcc, 0x21, 0x28, + 0xe3, 0x66, 0x5e, 0x9e, 0x08, 0xf4, 0x17, 0xb0, 0x38, 0xd6, 0x96, 0xef, 0xa5, 0x1e, 0x1f, 0x05, + 0x9a, 0xb5, 0x29, 0x81, 0x2a, 0xd6, 0x11, 0xe8, 0xbb, 0x8e, 0x13, 0x49, 0x8c, 0xc6, 0xd1, 0x74, + 0x4d, 0xc3, 0x79, 0x36, 0x43, 0xd3, 0xe5, 0xa1, 0x57, 0x27, 0xb0, 0x12, 0x8e, 0xa7, 0xe3, 0xa1, + 0xd2, 0xff, 0x75, 0x23, 0xe3, 0x6c, 0xc6, 0xbf, 0x2e, 0x71, 0xec, 0xd5, 0x7f, 0xd2, 0xe0, 0x66, + 0xca, 0x60, 0x50, 0xcb, 0x70, 0x95, 0x74, 0xc0, 0xfc, 0xf8, 0x8a, 0x07, 0x14, 0x09, 0x1b, 0xe6, + 0x64, 0xb7, 0x5e, 0x4f, 0x4f, 0x96, 0x00, 0x98, 0xf7, 0x26, 0x00, 0x94, 0x4f, 0x06, 0xd7, 0x2f, + 0x37, 0xda, 0xfb, 0x93, 0x18, 0x0e, 0xb1, 0xe6, 0xce, 0xf4, 0xd8, 0xb8, 0x10, 0xd9, 0xe0, 0xd6, + 0x33, 0x4e, 0x07, 0x80, 0x0c, 0x21, 0xa3, 0xfd, 0x69, 0xef, 0xe0, 0xf7, 0xf3, 0x8a, 0xf6, 0xf6, + 0xbc, 0xa2, 0xfd, 0x79, 0x5e, 0xd1, 0x7e, 0xb9, 0xa8, 0x5c, 0x7b, 0x7b, 0x51, 0xb9, 0xf6, 0xc7, + 0x45, 0xe5, 0xda, 0x37, 0x3b, 0x1d, 0x97, 0x1f, 0xf7, 0x5b, 0xd5, 0x36, 0xe9, 0xd5, 0x5e, 0xa0, + 0xf6, 0x09, 0xea, 0x1e, 0xa0, 0x16, 0xab, 0x85, 0x7e, 0x1f, 0x86, 0xdf, 0x70, 0xce, 0x86, 0x5f, + 0x71, 0x06, 0x3e, 0x66, 0xad, 0x39, 0xf1, 0x25, 0xe7, 0xd1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xf8, 0xd1, 0xc2, 0xf3, 0xea, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1980,7 +1981,7 @@ type MsgClient interface { DeleteFile(ctx context.Context, in *MsgDeleteFile, opts ...grpc.CallOption) (*MsgDeleteFileResponse, error) SetProviderIP(ctx context.Context, in *MsgSetProviderIP, opts ...grpc.CallOption) (*MsgSetProviderIPResponse, error) SetProviderKeybase(ctx context.Context, in *MsgSetProviderKeybase, opts ...grpc.CallOption) (*MsgSetProviderKeybaseResponse, error) - SetProviderTotalspace(ctx context.Context, in *MsgSetProviderTotalspace, opts ...grpc.CallOption) (*MsgSetProviderTotalspaceResponse, error) + SetProviderTotalSpace(ctx context.Context, in *MsgSetProviderTotalSpace, opts ...grpc.CallOption) (*MsgSetProviderTotalSpaceResponse, error) InitProvider(ctx context.Context, in *MsgInitProvider, opts ...grpc.CallOption) (*MsgInitProviderResponse, error) ShutdownProvider(ctx context.Context, in *MsgShutdownProvider, opts ...grpc.CallOption) (*MsgShutdownProviderResponse, error) BuyStorage(ctx context.Context, in *MsgBuyStorage, opts ...grpc.CallOption) (*MsgBuyStorageResponse, error) @@ -2046,9 +2047,9 @@ func (c *msgClient) SetProviderKeybase(ctx context.Context, in *MsgSetProviderKe return out, nil } -func (c *msgClient) SetProviderTotalspace(ctx context.Context, in *MsgSetProviderTotalspace, opts ...grpc.CallOption) (*MsgSetProviderTotalspaceResponse, error) { - out := new(MsgSetProviderTotalspaceResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Msg/SetProviderTotalspace", in, out, opts...) +func (c *msgClient) SetProviderTotalSpace(ctx context.Context, in *MsgSetProviderTotalSpace, opts ...grpc.CallOption) (*MsgSetProviderTotalSpaceResponse, error) { + out := new(MsgSetProviderTotalSpaceResponse) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Msg/SetProviderTotalSpace", in, out, opts...) if err != nil { return nil, err } @@ -2152,7 +2153,7 @@ type MsgServer interface { DeleteFile(context.Context, *MsgDeleteFile) (*MsgDeleteFileResponse, error) SetProviderIP(context.Context, *MsgSetProviderIP) (*MsgSetProviderIPResponse, error) SetProviderKeybase(context.Context, *MsgSetProviderKeybase) (*MsgSetProviderKeybaseResponse, error) - SetProviderTotalspace(context.Context, *MsgSetProviderTotalspace) (*MsgSetProviderTotalspaceResponse, error) + SetProviderTotalSpace(context.Context, *MsgSetProviderTotalSpace) (*MsgSetProviderTotalSpaceResponse, error) InitProvider(context.Context, *MsgInitProvider) (*MsgInitProviderResponse, error) ShutdownProvider(context.Context, *MsgShutdownProvider) (*MsgShutdownProviderResponse, error) BuyStorage(context.Context, *MsgBuyStorage) (*MsgBuyStorageResponse, error) @@ -2184,8 +2185,8 @@ func (*UnimplementedMsgServer) SetProviderIP(ctx context.Context, req *MsgSetPro func (*UnimplementedMsgServer) SetProviderKeybase(ctx context.Context, req *MsgSetProviderKeybase) (*MsgSetProviderKeybaseResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SetProviderKeybase not implemented") } -func (*UnimplementedMsgServer) SetProviderTotalspace(ctx context.Context, req *MsgSetProviderTotalspace) (*MsgSetProviderTotalspaceResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SetProviderTotalspace not implemented") +func (*UnimplementedMsgServer) SetProviderTotalSpace(ctx context.Context, req *MsgSetProviderTotalSpace) (*MsgSetProviderTotalSpaceResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetProviderTotalSpace not implemented") } func (*UnimplementedMsgServer) InitProvider(ctx context.Context, req *MsgInitProvider) (*MsgInitProviderResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method InitProvider not implemented") @@ -2312,20 +2313,20 @@ func _Msg_SetProviderKeybase_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } -func _Msg_SetProviderTotalspace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSetProviderTotalspace) +func _Msg_SetProviderTotalSpace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSetProviderTotalSpace) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).SetProviderTotalspace(ctx, in) + return srv.(MsgServer).SetProviderTotalSpace(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Msg/SetProviderTotalspace", + FullMethod: "/canine_chain.storage.Msg/SetProviderTotalSpace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SetProviderTotalspace(ctx, req.(*MsgSetProviderTotalspace)) + return srv.(MsgServer).SetProviderTotalSpace(ctx, req.(*MsgSetProviderTotalSpace)) } return interceptor(ctx, in, info, handler) } @@ -2535,8 +2536,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_SetProviderKeybase_Handler, }, { - MethodName: "SetProviderTotalspace", - Handler: _Msg_SetProviderTotalspace_Handler, + MethodName: "SetProviderTotalSpace", + Handler: _Msg_SetProviderTotalSpace_Handler, }, { MethodName: "InitProvider", @@ -2977,7 +2978,7 @@ func (m *MsgSetProviderKeybaseResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *MsgSetProviderTotalspace) Marshal() (dAtA []byte, err error) { +func (m *MsgSetProviderTotalSpace) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2987,12 +2988,12 @@ func (m *MsgSetProviderTotalspace) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSetProviderTotalspace) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSetProviderTotalSpace) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSetProviderTotalspace) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSetProviderTotalSpace) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3014,7 +3015,7 @@ func (m *MsgSetProviderTotalspace) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *MsgSetProviderTotalspaceResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgSetProviderTotalSpaceResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3024,12 +3025,12 @@ func (m *MsgSetProviderTotalspaceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSetProviderTotalspaceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSetProviderTotalSpaceResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSetProviderTotalspaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSetProviderTotalSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3177,10 +3178,10 @@ func (m *MsgInitProvider) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Totalspace) > 0 { - i -= len(m.Totalspace) - copy(dAtA[i:], m.Totalspace) - i = encodeVarintTx(dAtA, i, uint64(len(m.Totalspace))) + if len(m.TotalSpace) > 0 { + i -= len(m.TotalSpace) + copy(dAtA[i:], m.TotalSpace) + i = encodeVarintTx(dAtA, i, uint64(len(m.TotalSpace))) i-- dAtA[i] = 0x22 } @@ -4068,7 +4069,7 @@ func (m *MsgSetProviderKeybaseResponse) Size() (n int) { return n } -func (m *MsgSetProviderTotalspace) Size() (n int) { +func (m *MsgSetProviderTotalSpace) Size() (n int) { if m == nil { return 0 } @@ -4085,7 +4086,7 @@ func (m *MsgSetProviderTotalspace) Size() (n int) { return n } -func (m *MsgSetProviderTotalspaceResponse) Size() (n int) { +func (m *MsgSetProviderTotalSpaceResponse) Size() (n int) { if m == nil { return 0 } @@ -4164,7 +4165,7 @@ func (m *MsgInitProvider) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Totalspace) + l = len(m.TotalSpace) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -5678,7 +5679,7 @@ func (m *MsgSetProviderKeybaseResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSetProviderTotalspace) Unmarshal(dAtA []byte) error { +func (m *MsgSetProviderTotalSpace) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5701,10 +5702,10 @@ func (m *MsgSetProviderTotalspace) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSetProviderTotalspace: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetProviderTotalSpace: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSetProviderTotalspace: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetProviderTotalSpace: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5792,7 +5793,7 @@ func (m *MsgSetProviderTotalspace) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSetProviderTotalspaceResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSetProviderTotalSpaceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5815,10 +5816,10 @@ func (m *MsgSetProviderTotalspaceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSetProviderTotalspaceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSetProviderTotalSpaceResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSetProviderTotalspaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSetProviderTotalSpaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -6297,7 +6298,7 @@ func (m *MsgInitProvider) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Totalspace", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TotalSpace", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6325,7 +6326,7 @@ func (m *MsgInitProvider) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Totalspace = string(dAtA[iNdEx:postIndex]) + m.TotalSpace = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex From 5e78401b4be3eb7039c2154847623b43198777cd Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 15:29:19 -0500 Subject: [PATCH 02/14] query and txs are complete --- proto/canine_chain/filetree/genesis.proto | 4 +- proto/canine_chain/filetree/query.proto | 20 +- proto/canine_chain/filetree/tx.proto | 46 +- proto/canine_chain/jklmint/params.proto | 2 +- proto/canine_chain/rns/query.proto | 20 +- proto/canine_chain/rns/tx.proto | 8 +- x/filetree/client/cli/query_pubkey.go | 8 +- x/filetree/client/cli/tx_add_editors.go | 4 +- x/filetree/client/cli/tx_add_viewers.go | 4 +- x/filetree/client/cli/tx_postkey.go | 2 +- x/filetree/client/cli/utils.go | 4 +- x/filetree/genesis.go | 4 +- x/filetree/handler.go | 4 +- x/filetree/keeper/grpc_query_pubkey.go | 8 +- x/filetree/keeper/msg_server_add_editors.go | 2 +- x/filetree/keeper/msg_server_add_viewers.go | 2 +- .../keeper/msg_server_add_viewers_test.go | 6 +- x/filetree/keeper/msg_server_post_key_test.go | 10 +- x/filetree/keeper/msg_server_postkey.go | 4 +- .../keeper/msg_server_remove_editors.go | 2 +- .../keeper/msg_server_remove_viewers.go | 2 +- x/filetree/keeper/msg_server_reset_editors.go | 2 +- x/filetree/keeper/msg_server_reset_viewers.go | 2 +- x/filetree/simulation/add_editors.go | 2 +- x/filetree/simulation/add_viewers.go | 2 +- x/filetree/simulation/postkey.go | 6 +- x/filetree/simulation/remove_editors.go | 2 +- x/filetree/simulation/remove_viewers.go | 2 +- x/filetree/simulation/reset_editors.go | 2 +- x/filetree/simulation/reset_viewers.go | 2 +- x/filetree/types/codec.go | 5 +- x/filetree/types/genesis.go | 4 +- x/filetree/types/genesis.pb.go | 48 ++- x/filetree/types/genesis_test.go | 4 +- x/filetree/types/message_add_editors.go | 6 +- x/filetree/types/message_add_viewers.go | 6 +- x/filetree/types/message_postkey.go | 20 +- x/filetree/types/message_postkey_test.go | 2 +- x/filetree/types/message_remove_editors.go | 6 +- x/filetree/types/message_remove_viewers.go | 6 +- x/filetree/types/message_reset_editors.go | 6 +- x/filetree/types/message_reset_viewers.go | 6 +- x/filetree/types/query.pb.go | 361 ++++++++-------- x/filetree/types/query.pb.gw.go | 76 ++-- x/filetree/types/tx.pb.go | 378 ++++++++-------- x/oracle/simulation/delist.go | 2 +- x/rns/client/cli/query_forsale.go | 8 +- x/rns/client/cli/tx_delist.go | 2 +- x/rns/client/cli/tx_register.go | 6 +- x/rns/handler.go | 4 +- x/rns/keeper/bidding_test.go | 2 +- x/rns/keeper/grpc_query_forsale.go | 8 +- x/rns/keeper/msg_server_basics_test.go | 25 +- x/rns/keeper/msg_server_bidding_test.go | 8 +- x/rns/keeper/msg_server_buy_test.go | 2 +- x/rns/keeper/msg_server_delist.go | 4 +- x/rns/keeper/msg_server_delist_test.go | 26 +- x/rns/keeper/msg_server_record_test.go | 4 +- x/rns/keeper/msg_server_register.go | 11 +- x/rns/keeper/register_test.go | 4 +- x/rns/keeper/transfer_test.go | 2 +- x/rns/simulation/delist.go | 2 +- x/rns/simulation/register.go | 3 +- x/rns/types/codec.go | 4 +- x/rns/types/message_delist.go | 16 +- x/rns/types/message_delist_test.go | 8 +- x/rns/types/message_register.go | 7 +- x/rns/types/message_register_test.go | 15 +- x/rns/types/query.pb.go | 403 +++++++++--------- x/rns/types/query.pb.gw.go | 62 +-- x/rns/types/tx.pb.go | 242 +++++------ 71 files changed, 982 insertions(+), 1020 deletions(-) diff --git a/proto/canine_chain/filetree/genesis.proto b/proto/canine_chain/filetree/genesis.proto index f30087847..216e28917 100644 --- a/proto/canine_chain/filetree/genesis.proto +++ b/proto/canine_chain/filetree/genesis.proto @@ -11,6 +11,6 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types"; // GenesisState defines the filetree module's genesis state. message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; - repeated Files filesList = 2 [ (gogoproto.nullable) = false ]; - repeated Pubkey pubkeyList = 3 [ (gogoproto.nullable) = false ]; + repeated Files files_list = 2 [ (gogoproto.nullable) = false ]; + repeated Pubkey pub_key_list = 3 [ (gogoproto.nullable) = false ]; } diff --git a/proto/canine_chain/filetree/query.proto b/proto/canine_chain/filetree/query.proto index ed1a38806..6385ec491 100644 --- a/proto/canine_chain/filetree/query.proto +++ b/proto/canine_chain/filetree/query.proto @@ -20,7 +20,7 @@ service Query { // Queries a Files by index. rpc Files(QueryFileRequest) returns (QueryFileResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/filetree/files/{address}/{ownerAddress}"; + "/jackal-dao/canine-chain/filetree/files/{address}/{owner_address}"; } // Queries a list of Files items. @@ -29,13 +29,13 @@ service Query { } // Queries a Pubkey by index. - rpc Pubkey(QueryPubkeyRequest) returns (QueryPubkeyResponse) { + rpc PubKey(QueryPubKeyRequest) returns (QueryPubKeyResponse) { option (google.api.http).get = "/jackal-dao/canine-chain/filetree/pubkeys/{address}"; } // Queries a list of Pubkey items. - rpc PubkeyAll(QueryAllPubkeysRequest) returns (QueryAllPubkeysResponse) { + rpc PubKeyAll(QueryAllPubKeysRequest) returns (QueryAllPubKeysResponse) { option (google.api.http).get = "/jackal-dao/canine-chain/filetree/pubkeys"; } } @@ -51,7 +51,7 @@ message QueryParamsResponse { message QueryFileRequest { string address = 1; - string ownerAddress = 2; + string owner_address = 2; } message QueryFileResponse { Files files = 1 [ (gogoproto.nullable) = false ]; } @@ -65,17 +65,17 @@ message QueryAllFilesResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryPubkeyRequest { string address = 1; } +message QueryPubKeyRequest { string address = 1; } -message QueryPubkeyResponse { - Pubkey pubkey = 1 [ (gogoproto.nullable) = false ]; +message QueryPubKeyResponse { + Pubkey pub_key = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllPubkeysRequest { +message QueryAllPubKeysRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; } -message QueryAllPubkeysResponse { - repeated Pubkey pubkey = 1 [ (gogoproto.nullable) = false ]; +message QueryAllPubKeysResponse { + repeated Pubkey pub_key = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/canine_chain/filetree/tx.proto b/proto/canine_chain/filetree/tx.proto index d18c20e65..e10fae56d 100644 --- a/proto/canine_chain/filetree/tx.proto +++ b/proto/canine_chain/filetree/tx.proto @@ -7,7 +7,7 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types"; service Msg { rpc PostFile(MsgPostFile) returns (MsgPostFileResponse); rpc AddViewers(MsgAddViewers) returns (MsgAddViewersResponse); - rpc Postkey(MsgPostkey) returns (MsgPostkeyResponse); + rpc PostKey(MsgPostKey) returns (MsgPostKeyResponse); rpc DeleteFile(MsgDeleteFile) returns (MsgDeleteFileResponse); rpc RemoveViewers(MsgRemoveViewers) returns (MsgRemoveViewersResponse); rpc MakeRoot(MsgMakeRoot) returns (MsgMakeRootResponse); @@ -23,36 +23,36 @@ service Msg { message MsgPostFile { string creator = 1; string account = 2; - string hashParent = 3; - string hashChild = 4; + string hash_parent = 3; + string hash_child = 4; string contents = 5; string viewers = 6; string editors = 7; - string trackingNumber = 8; + string tracking_number = 8; } message MsgPostFileResponse { string path = 1; } message MsgAddViewers { string creator = 1; - string viewerIds = 2; - string viewerKeys = 3; + string viewer_ids = 2; + string viewer_keys = 3; string address = 4; - string fileowner = 5; + string file_owner = 5; } message MsgAddViewersResponse {} -message MsgPostkey { +message MsgPostKey { string creator = 1; string key = 2; } -message MsgPostkeyResponse {} +message MsgPostKeyResponse {} message MsgDeleteFile { string creator = 1; - string hashPath = 2; + string hash_path = 2; string account = 3; } @@ -60,9 +60,9 @@ message MsgDeleteFileResponse {} message MsgRemoveViewers { string creator = 1; - string viewerIds = 2; + string viewer_ids = 2; string address = 3; - string fileowner = 4; + string file_owner = 4; } message MsgRemoveViewersResponse {} @@ -70,11 +70,11 @@ message MsgRemoveViewersResponse {} message MsgMakeRoot { string creator = 1; string account = 2; - string rootHashPath = 3; + string root_hash_path = 3; string contents = 4; string editors = 5; string viewers = 6; - string trackingNumber = 7; + string tracking_number = 7; } message MsgMakeRootResponse {} @@ -83,24 +83,24 @@ message MsgMakeRootV2 { string creator = 1; string editors = 2; string viewers = 3; - string trackingNumber = 4; + string tracking_number = 4; } message MsgAddEditors { string creator = 1; - string editorIds = 2; - string editorKeys = 3; + string editor_ids = 2; + string editor_keys = 3; string address = 4; - string fileowner = 5; + string file_owner = 5; } message MsgAddEditorsResponse {} message MsgRemoveEditors { string creator = 1; - string editorIds = 2; + string editor_ids = 2; string address = 3; - string fileowner = 4; + string file_owner = 4; } message MsgRemoveEditorsResponse {} @@ -108,7 +108,7 @@ message MsgRemoveEditorsResponse {} message MsgResetEditors { string creator = 1; string address = 2; - string fileowner = 3; + string file_owner = 3; } message MsgResetEditorsResponse {} @@ -116,7 +116,7 @@ message MsgResetEditorsResponse {} message MsgResetViewers { string creator = 1; string address = 2; - string fileowner = 3; + string file_owner = 3; } message MsgResetViewersResponse {} @@ -124,7 +124,7 @@ message MsgResetViewersResponse {} message MsgChangeOwner { string creator = 1; string address = 2; - string fileOwner = 3; + string file_owner = 3; string newOwner = 4; } diff --git a/proto/canine_chain/jklmint/params.proto b/proto/canine_chain/jklmint/params.proto index d98b2a7b2..2a3e8c6d0 100644 --- a/proto/canine_chain/jklmint/params.proto +++ b/proto/canine_chain/jklmint/params.proto @@ -10,7 +10,7 @@ message Params { option (gogoproto.goproto_stringer) = false; string mint_denom = 1 [ (gogoproto.moretags) = "yaml:\"mint_denom\"" ]; - int64 providerRatio = 2 [ (gogoproto.moretags) = "yaml:\"provider_ratio\"" ]; + int64 providerRatio = 2 [ (gogoproto.moretags) = "yaml:\"provider_ratio\"" ]; // TODO: fix casing int64 tokensPerBlock = 3 [ (gogoproto.moretags) = "yaml:\"tokens_per_block\"" ]; diff --git a/proto/canine_chain/rns/query.proto b/proto/canine_chain/rns/query.proto index 0c0d27549..f2a0238a9 100644 --- a/proto/canine_chain/rns/query.proto +++ b/proto/canine_chain/rns/query.proto @@ -41,14 +41,14 @@ service Query { } // Queries a Listing by index. - rpc Forsale(QueryForsaleRequest) returns (QueryForsaleResponse) { + rpc ForSale(QueryForSaleRequest) returns (QueryForSaleResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/rns/forsale/{name}"; + "/jackal-dao/canine-chain/rns/for_sale/{name}"; } // Queries all Listings. - rpc ForsaleAll(QueryAllForsalesRequest) returns (QueryAllForsalesResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/forsale"; + rpc ForSaleAll(QueryAllForSalesRequest) returns (QueryAllForSalesResponse) { + option (google.api.http).get = "/jackal-dao/canine-chain/rns/for_sale"; } // Queries a Init by index. @@ -118,18 +118,18 @@ message QueryAllBidsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryForsaleRequest { string name = 1; } +message QueryForSaleRequest { string name = 1; } -message QueryForsaleResponse { - Forsale forsale = 1 [ (gogoproto.nullable) = false ]; +message QueryForSaleResponse { + Forsale for_sale = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllForsalesRequest { +message QueryAllForSalesRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; } -message QueryAllForsalesResponse { - repeated Forsale forsale = 1 [ (gogoproto.nullable) = false ]; +message QueryAllForSalesResponse { + repeated Forsale for_sale = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/canine_chain/rns/tx.proto b/proto/canine_chain/rns/tx.proto index 5ace7c167..dd8610474 100644 --- a/proto/canine_chain/rns/tx.proto +++ b/proto/canine_chain/rns/tx.proto @@ -11,7 +11,7 @@ service Msg { rpc CancelBid(MsgCancelBid) returns (MsgCancelBidResponse); rpc List(MsgList) returns (MsgListResponse); rpc Buy(MsgBuy) returns (MsgBuyResponse); - rpc Delist(MsgDelist) returns (MsgDelistResponse); + rpc DeList(MsgDeList) returns (MsgDeListResponse); rpc Transfer(MsgTransfer) returns (MsgTransferResponse); rpc AddRecord(MsgAddRecord) returns (MsgAddRecordResponse); rpc DelRecord(MsgDelRecord) returns (MsgDelRecordResponse); @@ -23,7 +23,7 @@ service Msg { message MsgRegister { string creator = 1; string name = 2; - string years = 3; + int64 years = 3; string data = 4; } @@ -75,12 +75,12 @@ message MsgBuy { message MsgBuyResponse {} -message MsgDelist { +message MsgDeList { string creator = 1; string name = 2; } -message MsgDelistResponse {} +message MsgDeListResponse {} message MsgTransfer { string creator = 1; diff --git a/x/filetree/client/cli/query_pubkey.go b/x/filetree/client/cli/query_pubkey.go index 606ed140b..056b74cb1 100644 --- a/x/filetree/client/cli/query_pubkey.go +++ b/x/filetree/client/cli/query_pubkey.go @@ -23,11 +23,11 @@ func CmdListPubkey() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllPubkeysRequest{ + params := &types.QueryAllPubKeysRequest{ Pagination: pageReq, } - res, err := queryClient.PubkeyAll(context.Background(), params) + res, err := queryClient.PubKeyAll(context.Background(), params) if err != nil { return err } @@ -54,11 +54,11 @@ func CmdShowPubkey() *cobra.Command { argAddress := args[0] - params := &types.QueryPubkeyRequest{ + params := &types.QueryPubKeyRequest{ Address: argAddress, } - res, err := queryClient.Pubkey(context.Background(), params) + res, err := queryClient.PubKey(context.Background(), params) if err != nil { return err } diff --git a/x/filetree/client/cli/tx_add_editors.go b/x/filetree/client/cli/tx_add_editors.go index 4cd2ac105..7df2c08d4 100644 --- a/x/filetree/client/cli/tx_add_editors.go +++ b/x/filetree/client/cli/tx_add_editors.go @@ -57,12 +57,12 @@ func CmdAddEditors() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Pubkey(cmd.Context(), &types.QueryPubkeyRequest{Address: key.String()}) + res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKeyRequest{Address: key.String()}) if err != nil { return types.ErrPubKeyNotFound } - pkey, err := eciesgo.NewPublicKeyFromHex(res.Pubkey.Key) + pkey, err := eciesgo.NewPublicKeyFromHex(res.PubKey.Key) if err != nil { return err } diff --git a/x/filetree/client/cli/tx_add_viewers.go b/x/filetree/client/cli/tx_add_viewers.go index 92ec7c446..3dc07ba10 100644 --- a/x/filetree/client/cli/tx_add_viewers.go +++ b/x/filetree/client/cli/tx_add_viewers.go @@ -56,12 +56,12 @@ func CmdAddViewers() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Pubkey(cmd.Context(), &types.QueryPubkeyRequest{Address: key.String()}) + res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKeyRequest{Address: key.String()}) if err != nil { return types.ErrPubKeyNotFound } - pkey, err := eciesgo.NewPublicKeyFromHex(res.Pubkey.Key) + pkey, err := eciesgo.NewPublicKeyFromHex(res.PubKey.Key) if err != nil { return err } diff --git a/x/filetree/client/cli/tx_postkey.go b/x/filetree/client/cli/tx_postkey.go index 0c73ed9ed..c27c8048e 100644 --- a/x/filetree/client/cli/tx_postkey.go +++ b/x/filetree/client/cli/tx_postkey.go @@ -31,7 +31,7 @@ func CmdPostkey() *cobra.Command { pubKey := newKey.PublicKey.Bytes(false) - msg := types.NewMsgPostkey( + msg := types.NewMsgPostKey( clientCtx.GetFromAddress().String(), fmt.Sprintf("%x", pubKey), ) diff --git a/x/filetree/client/cli/utils.go b/x/filetree/client/cli/utils.go index 4a2efb49d..4c20a3a07 100644 --- a/x/filetree/client/cli/utils.go +++ b/x/filetree/client/cli/utils.go @@ -66,12 +66,12 @@ func encryptFileAESKey(cmd *cobra.Command, key string, argKeys string) ([]byte, queryClient := filetypes.NewQueryClient(clientCtx) - res, err := queryClient.Pubkey(cmd.Context(), &filetypes.QueryPubkeyRequest{Address: key}) + res, err := queryClient.PubKey(cmd.Context(), &filetypes.QueryPubKeyRequest{Address: key}) if err != nil { return nil, filetypes.ErrPubKeyNotFound } - pkey, err := eciesgo.NewPublicKeyFromHex(res.Pubkey.Key) + pkey, err := eciesgo.NewPublicKeyFromHex(res.PubKey.Key) if err != nil { return nil, err } diff --git a/x/filetree/genesis.go b/x/filetree/genesis.go index a14b89185..7893e1bee 100644 --- a/x/filetree/genesis.go +++ b/x/filetree/genesis.go @@ -14,7 +14,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) k.SetFiles(ctx, elem) } // Set all the pubkey - for _, elem := range genState.PubkeyList { + for _, elem := range genState.PubKeyList { k.SetPubkey(ctx, elem) } // this line is used by starport scaffolding # genesis/module/init @@ -27,7 +27,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { genesis.Params = k.GetParams(ctx) genesis.FilesList = k.GetAllFiles(ctx) - genesis.PubkeyList = k.GetAllPubkey(ctx) + genesis.PubKeyList = k.GetAllPubkey(ctx) // this line is used by starport scaffolding # genesis/module/export return genesis diff --git a/x/filetree/handler.go b/x/filetree/handler.go index 75f48c9a8..98dcb443f 100644 --- a/x/filetree/handler.go +++ b/x/filetree/handler.go @@ -23,8 +23,8 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgAddViewers: res, err := msgServer.AddViewers(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgPostkey: - res, err := msgServer.Postkey(sdk.WrapSDKContext(ctx), msg) + case *types.MsgPostKey: + res, err := msgServer.PostKey(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) case *types.MsgDeleteFile: res, err := msgServer.DeleteFile(sdk.WrapSDKContext(ctx), msg) diff --git a/x/filetree/keeper/grpc_query_pubkey.go b/x/filetree/keeper/grpc_query_pubkey.go index 39090d54a..24cdfa655 100644 --- a/x/filetree/keeper/grpc_query_pubkey.go +++ b/x/filetree/keeper/grpc_query_pubkey.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) PubkeyAll(c context.Context, req *types.QueryAllPubkeysRequest) (*types.QueryAllPubkeysResponse, error) { +func (k Keeper) PubKeyAll(c context.Context, req *types.QueryAllPubKeysRequest) (*types.QueryAllPubKeysResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -35,10 +35,10 @@ func (k Keeper) PubkeyAll(c context.Context, req *types.QueryAllPubkeysRequest) return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryAllPubkeysResponse{Pubkey: pubkeys, Pagination: pageRes}, nil + return &types.QueryAllPubKeysResponse{PubKey: pubkeys, Pagination: pageRes}, nil } -func (k Keeper) Pubkey(c context.Context, req *types.QueryPubkeyRequest) (*types.QueryPubkeyResponse, error) { +func (k Keeper) PubKey(c context.Context, req *types.QueryPubKeyRequest) (*types.QueryPubKeyResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -52,5 +52,5 @@ func (k Keeper) Pubkey(c context.Context, req *types.QueryPubkeyRequest) (*types return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryPubkeyResponse{Pubkey: val}, nil + return &types.QueryPubKeyResponse{PubKey: val}, nil } diff --git a/x/filetree/keeper/msg_server_add_editors.go b/x/filetree/keeper/msg_server_add_editors.go index e001ef50b..ab80b7d83 100644 --- a/x/filetree/keeper/msg_server_add_editors.go +++ b/x/filetree/keeper/msg_server_add_editors.go @@ -12,7 +12,7 @@ import ( func (k msgServer) AddEditors(goCtx context.Context, msg *types.MsgAddEditors) (*types.MsgAddEditorsResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/keeper/msg_server_add_viewers.go b/x/filetree/keeper/msg_server_add_viewers.go index bd7e56a5f..4db265fcd 100644 --- a/x/filetree/keeper/msg_server_add_viewers.go +++ b/x/filetree/keeper/msg_server_add_viewers.go @@ -12,7 +12,7 @@ import ( func (k msgServer) AddViewers(goCtx context.Context, msg *types.MsgAddViewers) (*types.MsgAddViewersResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/keeper/msg_server_add_viewers_test.go b/x/filetree/keeper/msg_server_add_viewers_test.go index 540ad3bc7..2175a6b12 100644 --- a/x/filetree/keeper/msg_server_add_viewers_test.go +++ b/x/filetree/keeper/msg_server_add_viewers_test.go @@ -85,14 +85,14 @@ func (suite *KeeperTestSuite) TestMsgAddViewers() { // If alice wants to share pepe with bob, she will take bob's public key from chain and use ECIES to encrypt pepeAESKeyAndIV - pubKeyReq := types.QueryPubkeyRequest{ + pubKeyReq := types.QueryPubKeyRequest{ Address: bob, } - res, err := suite.queryClient.Pubkey(suite.ctx.Context(), &pubKeyReq) + res, err := suite.queryClient.PubKey(suite.ctx.Context(), &pubKeyReq) suite.Require().NoError(err) // bob uploaded his public key in hex format so we decode it from hex format - pkey, err := eciesgo.NewPublicKeyFromHex(res.Pubkey.Key) + pkey, err := eciesgo.NewPublicKeyFromHex(res.PubKey.Key) suite.Require().NoError(err) encryptedPepeAESKeyAndIV, err := eciesgo.Encrypt(pkey, []byte(pepeAESKeyAndIV)) // convert to hex diff --git a/x/filetree/keeper/msg_server_post_key_test.go b/x/filetree/keeper/msg_server_post_key_test.go index f9795aa21..6cbdcf63d 100644 --- a/x/filetree/keeper/msg_server_post_key_test.go +++ b/x/filetree/keeper/msg_server_post_key_test.go @@ -23,14 +23,14 @@ func (suite *KeeperTestSuite) TestMsgPostKey() { pubKey := privateKey.PublicKey.Bytes(false) cases := []struct { - preRun func() *types.MsgPostkey + preRun func() *types.MsgPostKey expErr bool expErrMsg string name string }{ { - preRun: func() *types.MsgPostkey { - return types.NewMsgPostkey( + preRun: func() *types.MsgPostKey { + return types.NewMsgPostKey( alice, fmt.Sprintf("%x", pubKey), ) @@ -44,13 +44,13 @@ func (suite *KeeperTestSuite) TestMsgPostKey() { suite.Run(tc.name, func() { msg := tc.preRun() suite.Require().NoError(err) - res, err := msgSrvr.Postkey(context, msg) + res, err := msgSrvr.PostKey(context, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) } else { suite.Require().NoError(err) - suite.Require().EqualValues(types.MsgPostkeyResponse{}, *res) + suite.Require().EqualValues(types.MsgPostKeyResponse{}, *res) } }) diff --git a/x/filetree/keeper/msg_server_postkey.go b/x/filetree/keeper/msg_server_postkey.go index b9ec63031..480e9be4d 100644 --- a/x/filetree/keeper/msg_server_postkey.go +++ b/x/filetree/keeper/msg_server_postkey.go @@ -7,7 +7,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/filetree/types" ) -func (k msgServer) Postkey(goCtx context.Context, msg *types.MsgPostkey) (*types.MsgPostkeyResponse, error) { +func (k msgServer) PostKey(goCtx context.Context, msg *types.MsgPostKey) (*types.MsgPostKeyResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) pubKey := types.Pubkey{ @@ -16,5 +16,5 @@ func (k msgServer) Postkey(goCtx context.Context, msg *types.MsgPostkey) (*types } k.SetPubkey(ctx, pubKey) - return &types.MsgPostkeyResponse{}, nil + return &types.MsgPostKeyResponse{}, nil } diff --git a/x/filetree/keeper/msg_server_remove_editors.go b/x/filetree/keeper/msg_server_remove_editors.go index a6e3ad8a1..9e2cdbf61 100644 --- a/x/filetree/keeper/msg_server_remove_editors.go +++ b/x/filetree/keeper/msg_server_remove_editors.go @@ -12,7 +12,7 @@ import ( func (k msgServer) RemoveEditors(goCtx context.Context, msg *types.MsgRemoveEditors) (*types.MsgRemoveEditorsResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/keeper/msg_server_remove_viewers.go b/x/filetree/keeper/msg_server_remove_viewers.go index b218529d5..44e2da707 100644 --- a/x/filetree/keeper/msg_server_remove_viewers.go +++ b/x/filetree/keeper/msg_server_remove_viewers.go @@ -12,7 +12,7 @@ import ( func (k msgServer) RemoveViewers(goCtx context.Context, msg *types.MsgRemoveViewers) (*types.MsgRemoveViewersResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/keeper/msg_server_reset_editors.go b/x/filetree/keeper/msg_server_reset_editors.go index 5321c90c8..31776641b 100644 --- a/x/filetree/keeper/msg_server_reset_editors.go +++ b/x/filetree/keeper/msg_server_reset_editors.go @@ -11,7 +11,7 @@ import ( func (k msgServer) ResetEditors(goCtx context.Context, msg *types.MsgResetEditors) (*types.MsgResetEditorsResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/keeper/msg_server_reset_viewers.go b/x/filetree/keeper/msg_server_reset_viewers.go index 135b1cb75..07eec7998 100644 --- a/x/filetree/keeper/msg_server_reset_viewers.go +++ b/x/filetree/keeper/msg_server_reset_viewers.go @@ -11,7 +11,7 @@ import ( func (k msgServer) ResetViewers(goCtx context.Context, msg *types.MsgResetViewers) (*types.MsgResetViewersResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - file, found := k.GetFiles(ctx, msg.Address, msg.Fileowner) + file, found := k.GetFiles(ctx, msg.Address, msg.FileOwner) if !found { return nil, types.ErrFileNotFound } diff --git a/x/filetree/simulation/add_editors.go b/x/filetree/simulation/add_editors.go index 3f84d1b66..83f5219a9 100644 --- a/x/filetree/simulation/add_editors.go +++ b/x/filetree/simulation/add_editors.go @@ -59,7 +59,7 @@ func SimulateMsgAddEditors( EditorIds: editIds, EditorKeys: editKeys, Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/simulation/add_viewers.go b/x/filetree/simulation/add_viewers.go index 8af0ef515..bba2c87af 100644 --- a/x/filetree/simulation/add_viewers.go +++ b/x/filetree/simulation/add_viewers.go @@ -60,7 +60,7 @@ func SimulateMsgAddViewers( ViewerIds: viewIds, ViewerKeys: viewKeys, Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/simulation/postkey.go b/x/filetree/simulation/postkey.go index c87b9650c..17a4ffe91 100644 --- a/x/filetree/simulation/postkey.go +++ b/x/filetree/simulation/postkey.go @@ -25,11 +25,11 @@ func SimulateMsgPostkey( privateKey, err := types.MakePrivateKey(address) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgPostkey, "unable to create privateKey"), nil, err + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgPostKey, "unable to create privateKey"), nil, err } pubKey := privateKey.PublicKey.Bytes(false) - msg := &types.MsgPostkey{ + msg := &types.MsgPostKey{ Creator: simAccount.Address.String(), Key: fmt.Sprintf("%x", pubKey), } @@ -37,7 +37,7 @@ func SimulateMsgPostkey( spendable := bk.SpendableCoins(ctx, simAccount.Address) fees, err := simtypes.RandomFees(r, ctx, spendable) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgPostkey, "failed to generate fee"), nil, err + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgPostKey, "failed to generate fee"), nil, err } txCtx := simulation.OperationInput{ diff --git a/x/filetree/simulation/remove_editors.go b/x/filetree/simulation/remove_editors.go index 7c2423590..f7160027c 100644 --- a/x/filetree/simulation/remove_editors.go +++ b/x/filetree/simulation/remove_editors.go @@ -49,7 +49,7 @@ func SimulateMsgRemoveEditors( Creator: simAccount.Address.String(), EditorIds: editIds, Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/simulation/remove_viewers.go b/x/filetree/simulation/remove_viewers.go index 6764a8c89..48d303228 100644 --- a/x/filetree/simulation/remove_viewers.go +++ b/x/filetree/simulation/remove_viewers.go @@ -49,7 +49,7 @@ func SimulateMsgRemoveViewers( Creator: simAccount.Address.String(), ViewerIds: viewIds, Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/simulation/reset_editors.go b/x/filetree/simulation/reset_editors.go index 37ae75c90..fa8792d47 100644 --- a/x/filetree/simulation/reset_editors.go +++ b/x/filetree/simulation/reset_editors.go @@ -43,7 +43,7 @@ func SimulateMsgResetEditors( msg := &types.MsgResetEditors{ Creator: simAccount.Address.String(), Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/simulation/reset_viewers.go b/x/filetree/simulation/reset_viewers.go index 67c8c7275..2e4368ee1 100644 --- a/x/filetree/simulation/reset_viewers.go +++ b/x/filetree/simulation/reset_viewers.go @@ -43,7 +43,7 @@ func SimulateMsgResetViewers( msg := &types.MsgResetViewers{ Creator: simAccount.Address.String(), Address: merklePath, - Fileowner: ownerAddress, + FileOwner: ownerAddress, } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/filetree/types/codec.go b/x/filetree/types/codec.go index 62bd73c9c..b444c4b42 100644 --- a/x/filetree/types/codec.go +++ b/x/filetree/types/codec.go @@ -11,7 +11,7 @@ import ( func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgPostFile{}, "filetree/PostFile", nil) cdc.RegisterConcrete(&MsgAddViewers{}, "filetree/AddViewers", nil) - cdc.RegisterConcrete(&MsgPostkey{}, "filetree/Postkey", nil) + cdc.RegisterConcrete(&MsgPostKey{}, "filetree/PostKey", nil) cdc.RegisterConcrete(&MsgDeleteFile{}, "filetree/DeleteFile", nil) cdc.RegisterConcrete(&MsgRemoveViewers{}, "filetree/RemoveViewers", nil) cdc.RegisterConcrete(&MsgMakeRoot{}, "filetree/MakeRoot", nil) @@ -20,7 +20,6 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgResetEditors{}, "filetree/ResetEditors", nil) cdc.RegisterConcrete(&MsgResetViewers{}, "filetree/ResetViewers", nil) cdc.RegisterConcrete(&MsgChangeOwner{}, "filetree/ChangeOwner", nil) - // this line is used by starport scaffolding # 2 } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { @@ -31,7 +30,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgAddViewers{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgPostkey{}, + &MsgPostKey{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgDeleteFile{}, diff --git a/x/filetree/types/genesis.go b/x/filetree/types/genesis.go index f807ea99b..43632dda0 100644 --- a/x/filetree/types/genesis.go +++ b/x/filetree/types/genesis.go @@ -11,7 +11,7 @@ const DefaultIndex uint64 = 1 func DefaultGenesis() *GenesisState { return &GenesisState{ FilesList: []Files{}, - PubkeyList: []Pubkey{}, + PubKeyList: []Pubkey{}, // this line is used by starport scaffolding # genesis/types/default Params: DefaultParams(), } @@ -33,7 +33,7 @@ func (gs GenesisState) Validate() error { // Check for duplicated index in pubkey pubkeyIndexMap := make(map[string]struct{}) - for _, elem := range gs.PubkeyList { + for _, elem := range gs.PubKeyList { index := string(PubkeyKey(elem.Address)) if _, ok := pubkeyIndexMap[index]; ok { return fmt.Errorf("duplicated index for pubkey") diff --git a/x/filetree/types/genesis.pb.go b/x/filetree/types/genesis.pb.go index b801df78a..16b557124 100644 --- a/x/filetree/types/genesis.pb.go +++ b/x/filetree/types/genesis.pb.go @@ -26,8 +26,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the filetree module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - FilesList []Files `protobuf:"bytes,2,rep,name=filesList,proto3" json:"filesList"` - PubkeyList []Pubkey `protobuf:"bytes,3,rep,name=pubkeyList,proto3" json:"pubkeyList"` + FilesList []Files `protobuf:"bytes,2,rep,name=files_list,json=filesList,proto3" json:"files_list"` + PubKeyList []Pubkey `protobuf:"bytes,3,rep,name=pub_key_list,json=pubKeyList,proto3" json:"pub_key_list"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -77,9 +77,9 @@ func (m *GenesisState) GetFilesList() []Files { return nil } -func (m *GenesisState) GetPubkeyList() []Pubkey { +func (m *GenesisState) GetPubKeyList() []Pubkey { if m != nil { - return m.PubkeyList + return m.PubKeyList } return nil } @@ -93,24 +93,26 @@ func init() { } var fileDescriptor_c254ae20e1613e96 = []byte{ - // 272 bytes of a gzipped FileDescriptorProto + // 290 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0x4e, 0xcc, 0xcb, 0xcc, 0x4b, 0x8d, 0x4f, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x4f, 0xcb, 0xcc, 0x49, 0x2d, 0x29, 0x4a, 0x4d, 0xd5, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0x56, 0xa4, 0x07, 0x53, 0x24, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa1, 0x0f, 0x62, 0x41, 0x14, 0x4b, 0x29, 0x61, 0x37, 0xb1, 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, 0xa0, 0x94, 0x22, 0x76, 0x35, 0x20, 0x46, 0x31, 0x01, 0x63, 0x4a, 0x93, 0xb2, 0x53, 0x2b, 0x21, 0x6a, 0x94, - 0x2e, 0x31, 0x72, 0xf1, 0xb8, 0x43, 0x5c, 0x1a, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xcd, 0xc5, + 0xae, 0x32, 0x72, 0xf1, 0xb8, 0x43, 0x5c, 0x1a, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xcd, 0xc5, 0x06, 0xb1, 0x47, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x56, 0x0f, 0xab, 0xcb, 0xf5, 0x02, - 0xc0, 0x8a, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x11, 0x72, 0xe0, 0xe2, 0x04, - 0x3b, 0xc0, 0x27, 0xb3, 0xb8, 0x44, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x06, 0x87, 0x7e, - 0x37, 0x90, 0x3a, 0xa8, 0x76, 0x84, 0x26, 0x21, 0x67, 0x2e, 0x2e, 0x88, 0xfb, 0xc0, 0x46, 0x30, - 0x83, 0x8d, 0xc0, 0xe9, 0x04, 0xb0, 0x42, 0xa8, 0x19, 0x48, 0xda, 0x9c, 0x7c, 0x4f, 0x3c, 0x92, - 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, - 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x38, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0x3f, 0x2b, 0x31, 0x39, 0x3b, 0x31, 0xc7, 0x27, 0x31, 0xa9, 0x58, 0x1f, 0x62, - 0xbe, 0x2e, 0x24, 0xa0, 0x2a, 0x10, 0x41, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, - 0x2a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x16, 0xe6, 0x04, 0xee, 0xe9, 0x01, 0x00, 0x00, + 0xc0, 0x8a, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x6a, 0x11, 0x72, 0xe4, 0xe2, 0x02, + 0x3b, 0x20, 0x3e, 0x27, 0xb3, 0xb8, 0x44, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x06, 0x87, + 0x01, 0x6e, 0x20, 0x85, 0x50, 0xfd, 0x9c, 0x60, 0x5d, 0x3e, 0x99, 0xc5, 0x25, 0x42, 0xae, 0x5c, + 0x3c, 0x05, 0xa5, 0x49, 0xf1, 0xd9, 0xa9, 0x95, 0x10, 0x43, 0x98, 0xc1, 0x86, 0xe0, 0x74, 0x05, + 0xd8, 0x2f, 0x50, 0x53, 0xb8, 0x0a, 0x4a, 0x93, 0xbc, 0x53, 0x2b, 0x41, 0xc6, 0x38, 0xf9, 0x9e, + 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, + 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x71, 0x7a, 0x66, 0x49, 0x46, 0x69, + 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x56, 0x62, 0x72, 0x76, 0x62, 0x8e, 0x4f, 0x62, 0x52, 0xb1, + 0x3e, 0xc4, 0x7c, 0x5d, 0x48, 0x58, 0x55, 0x20, 0x42, 0xab, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, + 0x0d, 0x1c, 0x5a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xd1, 0x56, 0x55, 0xec, 0x01, + 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -133,10 +135,10 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.PubkeyList) > 0 { - for iNdEx := len(m.PubkeyList) - 1; iNdEx >= 0; iNdEx-- { + if len(m.PubKeyList) > 0 { + for iNdEx := len(m.PubKeyList) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.PubkeyList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PubKeyList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -199,8 +201,8 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - if len(m.PubkeyList) > 0 { - for _, e := range m.PubkeyList { + if len(m.PubKeyList) > 0 { + for _, e := range m.PubKeyList { l = e.Size() n += 1 + l + sovGenesis(uint64(l)) } @@ -312,7 +314,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PubkeyList", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PubKeyList", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -339,8 +341,8 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PubkeyList = append(m.PubkeyList, Pubkey{}) - if err := m.PubkeyList[len(m.PubkeyList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.PubKeyList = append(m.PubKeyList, Pubkey{}) + if err := m.PubKeyList[len(m.PubKeyList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/filetree/types/genesis_test.go b/x/filetree/types/genesis_test.go index 98da83b90..ed66bda9e 100644 --- a/x/filetree/types/genesis_test.go +++ b/x/filetree/types/genesis_test.go @@ -29,7 +29,7 @@ func TestGenesisState_Validate(t *testing.T) { Address: "1", }, }, - PubkeyList: []types.Pubkey{ + PubKeyList: []types.Pubkey{ { Address: "0", }, @@ -58,7 +58,7 @@ func TestGenesisState_Validate(t *testing.T) { { desc: "duplicated pubkey", genState: &types.GenesisState{ - PubkeyList: []types.Pubkey{ + PubKeyList: []types.Pubkey{ { Address: "0", }, diff --git a/x/filetree/types/message_add_editors.go b/x/filetree/types/message_add_editors.go index 7dbdd407b..00b68c538 100644 --- a/x/filetree/types/message_add_editors.go +++ b/x/filetree/types/message_add_editors.go @@ -15,7 +15,7 @@ func NewMsgAddEditors(creator string, editorIds string, editorKeys string, addre EditorIds: editorIds, EditorKeys: editorKeys, Address: address, - Fileowner: fileowner, + FileOwner: fileowner, } } @@ -59,9 +59,9 @@ func (msg *MsgAddEditors) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/message_add_viewers.go b/x/filetree/types/message_add_viewers.go index dc3250a94..274b7f60d 100644 --- a/x/filetree/types/message_add_viewers.go +++ b/x/filetree/types/message_add_viewers.go @@ -15,7 +15,7 @@ func NewMsgAddViewers(creator string, viewerIds string, viewerKeys string, addre ViewerIds: viewerIds, ViewerKeys: viewerKeys, Address: address, - Fileowner: owner, + FileOwner: owner, } } @@ -59,9 +59,9 @@ func (msg *MsgAddViewers) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/message_postkey.go b/x/filetree/types/message_postkey.go index 78bea6e4a..1211dbb68 100644 --- a/x/filetree/types/message_postkey.go +++ b/x/filetree/types/message_postkey.go @@ -5,26 +5,26 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -const TypeMsgPostkey = "postkey" +const TypeMsgPostKey = "post_key" -var _ sdk.Msg = &MsgPostkey{} +var _ sdk.Msg = &MsgPostKey{} -func NewMsgPostkey(creator string, key string) *MsgPostkey { - return &MsgPostkey{ +func NewMsgPostKey(creator string, key string) *MsgPostKey { + return &MsgPostKey{ Creator: creator, Key: key, } } -func (msg *MsgPostkey) Route() string { +func (msg *MsgPostKey) Route() string { return RouterKey } -func (msg *MsgPostkey) Type() string { - return TypeMsgPostkey +func (msg *MsgPostKey) Type() string { + return TypeMsgPostKey } -func (msg *MsgPostkey) GetSigners() []sdk.AccAddress { +func (msg *MsgPostKey) GetSigners() []sdk.AccAddress { creator, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { panic(err) @@ -32,12 +32,12 @@ func (msg *MsgPostkey) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{creator} } -func (msg *MsgPostkey) GetSignBytes() []byte { +func (msg *MsgPostKey) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(msg) return sdk.MustSortJSON(bz) } -func (msg *MsgPostkey) ValidateBasic() error { +func (msg *MsgPostKey) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) diff --git a/x/filetree/types/message_postkey_test.go b/x/filetree/types/message_postkey_test.go index 760f08490..b48fa52a3 100644 --- a/x/filetree/types/message_postkey_test.go +++ b/x/filetree/types/message_postkey_test.go @@ -34,7 +34,7 @@ func TestMsgPostkey_ValidateBasic(t *testing.T) { for name, tt := range tests { t.Run(name, func(t *testing.T) { - msg := NewMsgPostkey( + msg := NewMsgPostKey( tt.Creator, tt.Key, ) diff --git a/x/filetree/types/message_remove_editors.go b/x/filetree/types/message_remove_editors.go index 2b73c5b12..f0adf46b7 100644 --- a/x/filetree/types/message_remove_editors.go +++ b/x/filetree/types/message_remove_editors.go @@ -14,7 +14,7 @@ func NewMsgRemoveEditors(creator string, editorIds string, address string, fileo Creator: creator, EditorIds: editorIds, Address: address, - Fileowner: fileowner, + FileOwner: fileowner, } } @@ -53,9 +53,9 @@ func (msg *MsgRemoveEditors) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/message_remove_viewers.go b/x/filetree/types/message_remove_viewers.go index ac5e58d52..3b0187c34 100644 --- a/x/filetree/types/message_remove_viewers.go +++ b/x/filetree/types/message_remove_viewers.go @@ -14,7 +14,7 @@ func NewMsgRemoveViewers(creator string, viewerIds string, address string, fileo Creator: creator, ViewerIds: viewerIds, Address: address, - Fileowner: fileowner, + FileOwner: fileowner, } } @@ -53,9 +53,9 @@ func (msg *MsgRemoveViewers) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/message_reset_editors.go b/x/filetree/types/message_reset_editors.go index 75dd87aa0..128bbc2d2 100644 --- a/x/filetree/types/message_reset_editors.go +++ b/x/filetree/types/message_reset_editors.go @@ -13,7 +13,7 @@ func NewMsgResetEditors(creator string, address string, fileowner string) *MsgRe return &MsgResetEditors{ Creator: creator, Address: address, - Fileowner: fileowner, + FileOwner: fileowner, } } @@ -48,9 +48,9 @@ func (msg *MsgResetEditors) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/message_reset_viewers.go b/x/filetree/types/message_reset_viewers.go index cce515be8..d0fd823bb 100644 --- a/x/filetree/types/message_reset_viewers.go +++ b/x/filetree/types/message_reset_viewers.go @@ -13,7 +13,7 @@ func NewMsgResetViewers(creator string, address string, fileowner string) *MsgRe return &MsgResetViewers{ Creator: creator, Address: address, - Fileowner: fileowner, + FileOwner: fileowner, } } @@ -48,9 +48,9 @@ func (msg *MsgResetViewers) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid address: %s", msg.Address) } - if msg.Fileowner == "" { + if msg.FileOwner == "" { return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid file owner: %s", msg.Fileowner) + "invalid file owner: %s", msg.FileOwner) } return nil diff --git a/x/filetree/types/query.pb.go b/x/filetree/types/query.pb.go index d47cb8cfe..937b72143 100644 --- a/x/filetree/types/query.pb.go +++ b/x/filetree/types/query.pb.go @@ -115,7 +115,7 @@ func (m *QueryParamsResponse) GetParams() Params { type QueryFileRequest struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - OwnerAddress string `protobuf:"bytes,2,opt,name=ownerAddress,proto3" json:"ownerAddress,omitempty"` + OwnerAddress string `protobuf:"bytes,2,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` } func (m *QueryFileRequest) Reset() { *m = QueryFileRequest{} } @@ -305,22 +305,22 @@ func (m *QueryAllFilesResponse) GetPagination() *query.PageResponse { return nil } -type QueryPubkeyRequest struct { +type QueryPubKeyRequest struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryPubkeyRequest) Reset() { *m = QueryPubkeyRequest{} } -func (m *QueryPubkeyRequest) String() string { return proto.CompactTextString(m) } -func (*QueryPubkeyRequest) ProtoMessage() {} -func (*QueryPubkeyRequest) Descriptor() ([]byte, []int) { +func (m *QueryPubKeyRequest) Reset() { *m = QueryPubKeyRequest{} } +func (m *QueryPubKeyRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPubKeyRequest) ProtoMessage() {} +func (*QueryPubKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{6} } -func (m *QueryPubkeyRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPubKeyRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryPubkeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPubKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryPubkeyRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPubKeyRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -330,41 +330,41 @@ func (m *QueryPubkeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryPubkeyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPubkeyRequest.Merge(m, src) +func (m *QueryPubKeyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPubKeyRequest.Merge(m, src) } -func (m *QueryPubkeyRequest) XXX_Size() int { +func (m *QueryPubKeyRequest) XXX_Size() int { return m.Size() } -func (m *QueryPubkeyRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPubkeyRequest.DiscardUnknown(m) +func (m *QueryPubKeyRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPubKeyRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryPubkeyRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPubKeyRequest proto.InternalMessageInfo -func (m *QueryPubkeyRequest) GetAddress() string { +func (m *QueryPubKeyRequest) GetAddress() string { if m != nil { return m.Address } return "" } -type QueryPubkeyResponse struct { - Pubkey Pubkey `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey"` +type QueryPubKeyResponse struct { + PubKey Pubkey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"` } -func (m *QueryPubkeyResponse) Reset() { *m = QueryPubkeyResponse{} } -func (m *QueryPubkeyResponse) String() string { return proto.CompactTextString(m) } -func (*QueryPubkeyResponse) ProtoMessage() {} -func (*QueryPubkeyResponse) Descriptor() ([]byte, []int) { +func (m *QueryPubKeyResponse) Reset() { *m = QueryPubKeyResponse{} } +func (m *QueryPubKeyResponse) String() string { return proto.CompactTextString(m) } +func (*QueryPubKeyResponse) ProtoMessage() {} +func (*QueryPubKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{7} } -func (m *QueryPubkeyResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryPubKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryPubkeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPubKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryPubkeyResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPubKeyResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -374,41 +374,41 @@ func (m *QueryPubkeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryPubkeyResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPubkeyResponse.Merge(m, src) +func (m *QueryPubKeyResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPubKeyResponse.Merge(m, src) } -func (m *QueryPubkeyResponse) XXX_Size() int { +func (m *QueryPubKeyResponse) XXX_Size() int { return m.Size() } -func (m *QueryPubkeyResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPubkeyResponse.DiscardUnknown(m) +func (m *QueryPubKeyResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPubKeyResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryPubkeyResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryPubKeyResponse proto.InternalMessageInfo -func (m *QueryPubkeyResponse) GetPubkey() Pubkey { +func (m *QueryPubKeyResponse) GetPubKey() Pubkey { if m != nil { - return m.Pubkey + return m.PubKey } return Pubkey{} } -type QueryAllPubkeysRequest struct { +type QueryAllPubKeysRequest struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllPubkeysRequest) Reset() { *m = QueryAllPubkeysRequest{} } -func (m *QueryAllPubkeysRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllPubkeysRequest) ProtoMessage() {} -func (*QueryAllPubkeysRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllPubKeysRequest) Reset() { *m = QueryAllPubKeysRequest{} } +func (m *QueryAllPubKeysRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllPubKeysRequest) ProtoMessage() {} +func (*QueryAllPubKeysRequest) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{8} } -func (m *QueryAllPubkeysRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllPubKeysRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllPubkeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllPubKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllPubkeysRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllPubKeysRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -418,42 +418,42 @@ func (m *QueryAllPubkeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryAllPubkeysRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPubkeysRequest.Merge(m, src) +func (m *QueryAllPubKeysRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPubKeysRequest.Merge(m, src) } -func (m *QueryAllPubkeysRequest) XXX_Size() int { +func (m *QueryAllPubKeysRequest) XXX_Size() int { return m.Size() } -func (m *QueryAllPubkeysRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPubkeysRequest.DiscardUnknown(m) +func (m *QueryAllPubKeysRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPubKeysRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllPubkeysRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllPubKeysRequest proto.InternalMessageInfo -func (m *QueryAllPubkeysRequest) GetPagination() *query.PageRequest { +func (m *QueryAllPubKeysRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -type QueryAllPubkeysResponse struct { - Pubkey []Pubkey `protobuf:"bytes,1,rep,name=pubkey,proto3" json:"pubkey"` +type QueryAllPubKeysResponse struct { + PubKey []Pubkey `protobuf:"bytes,1,rep,name=pub_key,json=pubKey,proto3" json:"pub_key"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllPubkeysResponse) Reset() { *m = QueryAllPubkeysResponse{} } -func (m *QueryAllPubkeysResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllPubkeysResponse) ProtoMessage() {} -func (*QueryAllPubkeysResponse) Descriptor() ([]byte, []int) { +func (m *QueryAllPubKeysResponse) Reset() { *m = QueryAllPubKeysResponse{} } +func (m *QueryAllPubKeysResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllPubKeysResponse) ProtoMessage() {} +func (*QueryAllPubKeysResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{9} } -func (m *QueryAllPubkeysResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryAllPubKeysResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllPubkeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllPubKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllPubkeysResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllPubKeysResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -463,26 +463,26 @@ func (m *QueryAllPubkeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryAllPubkeysResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPubkeysResponse.Merge(m, src) +func (m *QueryAllPubKeysResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPubKeysResponse.Merge(m, src) } -func (m *QueryAllPubkeysResponse) XXX_Size() int { +func (m *QueryAllPubKeysResponse) XXX_Size() int { return m.Size() } -func (m *QueryAllPubkeysResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPubkeysResponse.DiscardUnknown(m) +func (m *QueryAllPubKeysResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPubKeysResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllPubkeysResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryAllPubKeysResponse proto.InternalMessageInfo -func (m *QueryAllPubkeysResponse) GetPubkey() []Pubkey { +func (m *QueryAllPubKeysResponse) GetPubKey() []Pubkey { if m != nil { - return m.Pubkey + return m.PubKey } return nil } -func (m *QueryAllPubkeysResponse) GetPagination() *query.PageResponse { +func (m *QueryAllPubKeysResponse) GetPagination() *query.PageResponse { if m != nil { return m.Pagination } @@ -496,57 +496,58 @@ func init() { proto.RegisterType((*QueryFileResponse)(nil), "canine_chain.filetree.QueryFileResponse") proto.RegisterType((*QueryAllFilesRequest)(nil), "canine_chain.filetree.QueryAllFilesRequest") proto.RegisterType((*QueryAllFilesResponse)(nil), "canine_chain.filetree.QueryAllFilesResponse") - proto.RegisterType((*QueryPubkeyRequest)(nil), "canine_chain.filetree.QueryPubkeyRequest") - proto.RegisterType((*QueryPubkeyResponse)(nil), "canine_chain.filetree.QueryPubkeyResponse") - proto.RegisterType((*QueryAllPubkeysRequest)(nil), "canine_chain.filetree.QueryAllPubkeysRequest") - proto.RegisterType((*QueryAllPubkeysResponse)(nil), "canine_chain.filetree.QueryAllPubkeysResponse") + proto.RegisterType((*QueryPubKeyRequest)(nil), "canine_chain.filetree.QueryPubKeyRequest") + proto.RegisterType((*QueryPubKeyResponse)(nil), "canine_chain.filetree.QueryPubKeyResponse") + proto.RegisterType((*QueryAllPubKeysRequest)(nil), "canine_chain.filetree.QueryAllPubKeysRequest") + proto.RegisterType((*QueryAllPubKeysResponse)(nil), "canine_chain.filetree.QueryAllPubKeysResponse") } func init() { proto.RegisterFile("canine_chain/filetree/query.proto", fileDescriptor_f2d116acb9d238bd) } var fileDescriptor_f2d116acb9d238bd = []byte{ - // 649 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xc7, 0xe3, 0x96, 0x06, 0x7a, 0x30, 0xc0, 0x91, 0x42, 0x65, 0x15, 0x43, 0x8d, 0x44, 0x9a, - 0x96, 0xdc, 0x29, 0x8d, 0x90, 0x90, 0xba, 0x90, 0x0c, 0x85, 0x81, 0x4a, 0x21, 0x23, 0x03, 0x70, - 0x4e, 0x0e, 0xd7, 0xd4, 0xf1, 0xb9, 0x3e, 0x07, 0xa8, 0xaa, 0x2e, 0x8c, 0x4c, 0x48, 0x95, 0x18, - 0x10, 0x88, 0x85, 0x0f, 0xd3, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x1f, 0x04, 0xf9, 0xee, 0x4c, - 0xec, 0xbc, 0x39, 0x95, 0xba, 0xc5, 0xbe, 0xff, 0xf3, 0x7f, 0x7e, 0x7e, 0x5e, 0x2e, 0x60, 0xb5, - 0x45, 0x3c, 0xc7, 0xa3, 0x2f, 0x5b, 0xbb, 0xc4, 0xf1, 0xf0, 0x6b, 0xc7, 0xa5, 0x61, 0x40, 0x29, - 0xde, 0xef, 0xd2, 0xe0, 0x00, 0xf9, 0x01, 0x0b, 0x19, 0x5c, 0x4a, 0x4a, 0x50, 0x2c, 0xd1, 0x0b, - 0x36, 0xb3, 0x99, 0x50, 0xe0, 0xe8, 0x97, 0x14, 0xeb, 0x2b, 0x36, 0x63, 0xb6, 0x4b, 0x31, 0xf1, - 0x1d, 0x4c, 0x3c, 0x8f, 0x85, 0x24, 0x74, 0x98, 0xc7, 0xd5, 0xe9, 0x7a, 0x8b, 0xf1, 0x0e, 0xe3, - 0xd8, 0x22, 0x5c, 0xe5, 0xc0, 0x6f, 0x2b, 0x16, 0x0d, 0x49, 0x05, 0xfb, 0xc4, 0x76, 0x3c, 0x21, - 0x56, 0x5a, 0x73, 0x3c, 0x99, 0x4f, 0x02, 0xd2, 0x89, 0xfd, 0x26, 0xd0, 0x47, 0x3f, 0x78, 0x86, - 0x4d, 0xd7, 0xda, 0xa3, 0xea, 0x0b, 0xcd, 0x02, 0x80, 0xcf, 0x22, 0x98, 0x86, 0xf0, 0x6e, 0xd2, - 0xfd, 0x2e, 0xe5, 0xa1, 0xd9, 0x04, 0xd7, 0x53, 0x6f, 0xb9, 0xcf, 0x3c, 0x4e, 0xe1, 0x16, 0xc8, - 0x4b, 0x86, 0x65, 0xed, 0x8e, 0xb6, 0x76, 0x79, 0xf3, 0x16, 0x1a, 0x5b, 0x1f, 0x24, 0xc3, 0xea, - 0x17, 0x4e, 0x7e, 0xdf, 0xce, 0x35, 0x55, 0x88, 0xd9, 0x00, 0x57, 0x85, 0xe7, 0xb6, 0xe3, 0x52, - 0x95, 0x07, 0x2e, 0x83, 0x8b, 0xa4, 0xdd, 0x0e, 0x28, 0x97, 0x8e, 0x8b, 0xcd, 0xf8, 0x11, 0x9a, - 0xe0, 0x0a, 0x7b, 0xe7, 0xd1, 0xa0, 0xa6, 0x8e, 0xe7, 0xc4, 0x71, 0xea, 0x9d, 0xb9, 0x03, 0xae, - 0x25, 0x1c, 0x15, 0xe3, 0x43, 0xb0, 0x20, 0x6a, 0xa0, 0x10, 0x57, 0x26, 0x20, 0x46, 0x31, 0x31, - 0xa1, 0x0c, 0x30, 0x5f, 0x80, 0x82, 0xb0, 0xab, 0xb9, 0xae, 0x38, 0x8d, 0x21, 0xb7, 0x01, 0x18, - 0x74, 0x48, 0xd9, 0xde, 0x43, 0xb2, 0x9d, 0x28, 0x6a, 0x27, 0x92, 0x23, 0xa3, 0xda, 0x89, 0x1a, - 0xc4, 0x8e, 0x3f, 0xb0, 0x99, 0x88, 0x34, 0xbf, 0x68, 0x60, 0x69, 0x28, 0xc1, 0x28, 0xf3, 0xfc, - 0x99, 0x98, 0xe1, 0xe3, 0x14, 0xdb, 0x9c, 0x60, 0x2b, 0x66, 0xb2, 0xc9, 0xb4, 0x29, 0x38, 0x14, - 0xcf, 0x81, 0x18, 0x8e, 0xcc, 0xfe, 0x0c, 0x26, 0x44, 0xe9, 0x13, 0x13, 0x22, 0xde, 0x64, 0x4d, - 0x88, 0x10, 0xfd, 0x9f, 0x10, 0xf1, 0x64, 0xbe, 0x02, 0x37, 0xe2, 0xfa, 0xc8, 0xf3, 0x73, 0x6f, - 0xc1, 0x77, 0x0d, 0xdc, 0x1c, 0x49, 0x31, 0x06, 0x7d, 0xfe, 0x8c, 0xe8, 0xe7, 0xd6, 0x87, 0xcd, - 0xe3, 0x3c, 0x58, 0x10, 0x84, 0xf0, 0xa3, 0x06, 0xf2, 0x72, 0x91, 0x60, 0x69, 0x02, 0xca, 0xe8, - 0xe6, 0xea, 0xeb, 0xb3, 0x48, 0x65, 0x5e, 0xb3, 0xf4, 0xe1, 0xe7, 0xdf, 0xe3, 0xb9, 0xbb, 0x70, - 0x15, 0xbf, 0x21, 0xad, 0x3d, 0xe2, 0xb6, 0x09, 0xc3, 0x32, 0x7a, 0xf8, 0xce, 0x81, 0x3f, 0x34, - 0xb0, 0x20, 0xc6, 0x0f, 0x16, 0xa7, 0x25, 0x48, 0xec, 0xb6, 0xbe, 0x96, 0x2d, 0x54, 0x1c, 0x4f, - 0x04, 0x47, 0x1d, 0x3e, 0x52, 0x1c, 0xe5, 0x01, 0x48, 0x79, 0xdc, 0xf5, 0x86, 0x0f, 0xd5, 0x14, - 0x1e, 0xe1, 0xc3, 0xe4, 0x85, 0x70, 0x04, 0x3f, 0x6b, 0xe0, 0x92, 0xc0, 0xac, 0xb9, 0x2e, 0xdc, - 0x98, 0x06, 0x30, 0xb4, 0xe4, 0xfa, 0xfd, 0xd9, 0xc4, 0x8a, 0x18, 0x0b, 0xe2, 0x12, 0x2c, 0xce, - 0x48, 0x0c, 0xbf, 0x46, 0xcd, 0x94, 0xa3, 0x32, 0xbd, 0x99, 0xc9, 0xf5, 0xcb, 0x68, 0x66, 0x6a, - 0xf3, 0xcc, 0x2d, 0x81, 0xf4, 0x00, 0x56, 0xb3, 0x91, 0xe4, 0xcc, 0x26, 0xca, 0x08, 0xbf, 0x69, - 0x60, 0x51, 0xfa, 0x45, 0x85, 0x2b, 0x67, 0xd4, 0x22, 0xbd, 0x9c, 0x3a, 0x9a, 0x55, 0xae, 0x48, - 0x2b, 0x82, 0x74, 0x03, 0x96, 0x66, 0x26, 0xad, 0xef, 0x9c, 0xf4, 0x0c, 0xed, 0xb4, 0x67, 0x68, - 0x7f, 0x7a, 0x86, 0xf6, 0xa9, 0x6f, 0xe4, 0x4e, 0xfb, 0x46, 0xee, 0x57, 0xdf, 0xc8, 0x3d, 0xaf, - 0xda, 0x4e, 0xb8, 0xdb, 0xb5, 0x50, 0x8b, 0x75, 0x94, 0xdd, 0x53, 0x62, 0xf1, 0xb4, 0xdd, 0xfb, - 0x81, 0x61, 0x78, 0xe0, 0x53, 0x6e, 0xe5, 0xc5, 0x7f, 0x5f, 0xf5, 0x5f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xb5, 0xb4, 0xdc, 0x21, 0x02, 0x08, 0x00, 0x00, + // 666 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x6b, 0x13, 0x41, + 0x18, 0xc7, 0xb3, 0xad, 0x49, 0xed, 0xa8, 0xa0, 0x63, 0xaa, 0x65, 0xa9, 0xab, 0xdd, 0x82, 0x69, + 0x5a, 0xb3, 0x43, 0x1a, 0x04, 0xa1, 0x5e, 0x52, 0xa1, 0x22, 0x5a, 0x68, 0xe3, 0xcd, 0x83, 0x71, + 0x36, 0x19, 0xb7, 0x6b, 0x36, 0x3b, 0xdb, 0x7d, 0x51, 0x43, 0xe9, 0xc5, 0xa3, 0x27, 0x41, 0xf1, + 0x20, 0x0a, 0x5e, 0xfc, 0x2e, 0x3d, 0x16, 0xbc, 0x78, 0x12, 0x49, 0xfc, 0x20, 0xb2, 0x33, 0xb3, + 0x66, 0x37, 0x6f, 0x9b, 0x42, 0x6f, 0xc9, 0xce, 0xff, 0xf9, 0x3f, 0xbf, 0x7d, 0x5e, 0x66, 0xc1, + 0x72, 0x03, 0xdb, 0xa6, 0x4d, 0xea, 0x8d, 0x7d, 0x6c, 0xda, 0xe8, 0xa5, 0x69, 0x11, 0xdf, 0x25, + 0x04, 0x1d, 0x04, 0xc4, 0xed, 0x68, 0x8e, 0x4b, 0x7d, 0x0a, 0x17, 0xe2, 0x12, 0x2d, 0x92, 0xc8, + 0x79, 0x83, 0x1a, 0x94, 0x29, 0x50, 0xf8, 0x8b, 0x8b, 0xe5, 0x25, 0x83, 0x52, 0xc3, 0x22, 0x08, + 0x3b, 0x26, 0xc2, 0xb6, 0x4d, 0x7d, 0xec, 0x9b, 0xd4, 0xf6, 0xc4, 0xe9, 0x5a, 0x83, 0x7a, 0x6d, + 0xea, 0x21, 0x1d, 0x7b, 0x22, 0x07, 0x7a, 0x5d, 0xd6, 0x89, 0x8f, 0xcb, 0xc8, 0xc1, 0x86, 0x69, + 0x33, 0xb1, 0xd0, 0xaa, 0xa3, 0xc9, 0x1c, 0xec, 0xe2, 0x76, 0xe4, 0x37, 0x86, 0x3e, 0xfc, 0xe1, + 0xa5, 0xd8, 0x04, 0x7a, 0x8b, 0x88, 0x37, 0x54, 0xf3, 0x00, 0xee, 0x85, 0x30, 0xbb, 0xcc, 0xbb, + 0x46, 0x0e, 0x02, 0xe2, 0xf9, 0x6a, 0x0d, 0x5c, 0x4d, 0x3c, 0xf5, 0x1c, 0x6a, 0x7b, 0x04, 0x6e, + 0x82, 0x1c, 0x67, 0x58, 0x94, 0x6e, 0x49, 0xab, 0x17, 0x36, 0x6e, 0x68, 0x23, 0xeb, 0xa3, 0xf1, + 0xb0, 0xad, 0x73, 0xc7, 0xbf, 0x6f, 0x66, 0x6a, 0x22, 0x44, 0xdd, 0x03, 0x97, 0x99, 0xe7, 0xb6, + 0x69, 0x11, 0x91, 0x07, 0x2e, 0x82, 0x39, 0xdc, 0x6c, 0xba, 0xc4, 0xe3, 0x8e, 0xf3, 0xb5, 0xe8, + 0x2f, 0x5c, 0x01, 0x97, 0xe8, 0x1b, 0x9b, 0xb8, 0xf5, 0xe8, 0x7c, 0x86, 0x9d, 0x5f, 0x64, 0x0f, + 0xab, 0xfc, 0x99, 0xba, 0x03, 0xae, 0xc4, 0x2c, 0x05, 0xe4, 0x3d, 0x90, 0x65, 0x45, 0x10, 0x8c, + 0x4b, 0x63, 0x18, 0xc3, 0x98, 0x08, 0x91, 0x07, 0xa8, 0xcf, 0x41, 0x9e, 0xd9, 0x55, 0x2d, 0x8b, + 0x9d, 0x46, 0x94, 0xdb, 0x00, 0xf4, 0x5b, 0x24, 0x6c, 0x6f, 0x6b, 0xbc, 0x9f, 0x5a, 0xd8, 0x4f, + 0x8d, 0xcf, 0x8c, 0xe8, 0xa7, 0xb6, 0x8b, 0x8d, 0xe8, 0x0d, 0x6b, 0xb1, 0x48, 0xf5, 0x8b, 0x04, + 0x16, 0x06, 0x12, 0x0c, 0x33, 0xcf, 0x9e, 0x8a, 0x19, 0x3e, 0x4c, 0xb0, 0xcd, 0x30, 0xb6, 0x42, + 0x2a, 0x1b, 0x4f, 0x9b, 0x80, 0xd3, 0xa2, 0x41, 0x08, 0xf4, 0xc7, 0xa4, 0x93, 0xda, 0x20, 0xf5, + 0x69, 0x34, 0x22, 0x42, 0x2f, 0xde, 0xe4, 0x3e, 0x98, 0x73, 0x02, 0xbd, 0xde, 0x22, 0x9d, 0xb4, + 0x19, 0x61, 0x53, 0xf8, 0x7f, 0x46, 0x98, 0x8b, 0xfa, 0x02, 0x5c, 0x8b, 0x0a, 0xc4, 0x7d, 0xcf, + 0xbc, 0x07, 0xdf, 0x25, 0x70, 0x7d, 0x28, 0xc5, 0x28, 0xf6, 0xd9, 0x53, 0xb2, 0x9f, 0x59, 0x27, + 0x36, 0x3e, 0xe5, 0x40, 0x96, 0x21, 0xc2, 0xf7, 0x12, 0xc8, 0xf1, 0x5d, 0x82, 0xc5, 0x31, 0x28, + 0xc3, 0xcb, 0x2b, 0xaf, 0x4d, 0x23, 0xe5, 0x79, 0xd5, 0xe2, 0xbb, 0x9f, 0x7f, 0x3f, 0xce, 0xac, + 0xc0, 0x65, 0xf4, 0x0a, 0x37, 0x5a, 0xd8, 0x6a, 0x62, 0x8a, 0x78, 0xf4, 0xe0, 0xb5, 0x03, 0x7f, + 0x48, 0x20, 0xcb, 0x06, 0x10, 0x16, 0x26, 0x25, 0x88, 0xad, 0xb7, 0xbc, 0x9a, 0x2e, 0x14, 0x1c, + 0x8f, 0x18, 0xc7, 0x03, 0x58, 0x15, 0x1c, 0xa5, 0x3e, 0x48, 0x69, 0xd4, 0x0d, 0x87, 0x0e, 0xc5, + 0x1c, 0x1e, 0xa1, 0xc3, 0xc4, 0x3d, 0x71, 0x04, 0x3f, 0x4b, 0xe0, 0x3c, 0xe3, 0xac, 0x5a, 0x16, + 0x5c, 0x9f, 0x44, 0x30, 0xb0, 0xe7, 0xf2, 0x9d, 0xe9, 0xc4, 0x02, 0x19, 0x31, 0xe4, 0x22, 0x2c, + 0x4c, 0x89, 0x0c, 0xbf, 0x86, 0xdd, 0xe4, 0xb3, 0x32, 0xb9, 0x9b, 0xf1, 0x0d, 0x4c, 0xe9, 0x66, + 0x62, 0xf9, 0xd4, 0x4d, 0x86, 0x74, 0x17, 0x56, 0xd2, 0x91, 0xf8, 0x47, 0x20, 0x56, 0x47, 0xf8, + 0x4d, 0x02, 0xf3, 0xdc, 0x2f, 0x2c, 0x5c, 0x29, 0xa5, 0x16, 0xc9, 0xf5, 0x94, 0xb5, 0x69, 0xe5, + 0x82, 0xb4, 0xcc, 0x48, 0xd7, 0x61, 0x71, 0x6a, 0xd2, 0xad, 0x9d, 0xe3, 0xae, 0x22, 0x9d, 0x74, + 0x15, 0xe9, 0x4f, 0x57, 0x91, 0x3e, 0xf4, 0x94, 0xcc, 0x49, 0x4f, 0xc9, 0xfc, 0xea, 0x29, 0x99, + 0x67, 0x15, 0xc3, 0xf4, 0xf7, 0x03, 0x5d, 0x6b, 0xd0, 0xb6, 0xb0, 0x7b, 0x82, 0x75, 0x2f, 0x69, + 0xf7, 0xb6, 0x6f, 0xe8, 0x77, 0x1c, 0xe2, 0xe9, 0x39, 0xf6, 0xfd, 0xab, 0xfc, 0x0b, 0x00, 0x00, + 0xff, 0xff, 0xbd, 0x1a, 0x63, 0x65, 0x06, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -568,9 +569,9 @@ type QueryClient interface { // Queries a list of Files items. FilesAll(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. - Pubkey(ctx context.Context, in *QueryPubkeyRequest, opts ...grpc.CallOption) (*QueryPubkeyResponse, error) + PubKey(ctx context.Context, in *QueryPubKeyRequest, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - PubkeyAll(ctx context.Context, in *QueryAllPubkeysRequest, opts ...grpc.CallOption) (*QueryAllPubkeysResponse, error) + PubKeyAll(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) } type queryClient struct { @@ -608,18 +609,18 @@ func (c *queryClient) FilesAll(ctx context.Context, in *QueryAllFilesRequest, op return out, nil } -func (c *queryClient) Pubkey(ctx context.Context, in *QueryPubkeyRequest, opts ...grpc.CallOption) (*QueryPubkeyResponse, error) { - out := new(QueryPubkeyResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/Pubkey", in, out, opts...) +func (c *queryClient) PubKey(ctx context.Context, in *QueryPubKeyRequest, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) { + out := new(QueryPubKeyResponse) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/PubKey", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) PubkeyAll(ctx context.Context, in *QueryAllPubkeysRequest, opts ...grpc.CallOption) (*QueryAllPubkeysResponse, error) { - out := new(QueryAllPubkeysResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/PubkeyAll", in, out, opts...) +func (c *queryClient) PubKeyAll(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) { + out := new(QueryAllPubKeysResponse) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/PubKeyAll", in, out, opts...) if err != nil { return nil, err } @@ -635,9 +636,9 @@ type QueryServer interface { // Queries a list of Files items. FilesAll(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. - Pubkey(context.Context, *QueryPubkeyRequest) (*QueryPubkeyResponse, error) + PubKey(context.Context, *QueryPubKeyRequest) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - PubkeyAll(context.Context, *QueryAllPubkeysRequest) (*QueryAllPubkeysResponse, error) + PubKeyAll(context.Context, *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -653,11 +654,11 @@ func (*UnimplementedQueryServer) Files(ctx context.Context, req *QueryFileReques func (*UnimplementedQueryServer) FilesAll(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FilesAll not implemented") } -func (*UnimplementedQueryServer) Pubkey(ctx context.Context, req *QueryPubkeyRequest) (*QueryPubkeyResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Pubkey not implemented") +func (*UnimplementedQueryServer) PubKey(ctx context.Context, req *QueryPubKeyRequest) (*QueryPubKeyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PubKey not implemented") } -func (*UnimplementedQueryServer) PubkeyAll(ctx context.Context, req *QueryAllPubkeysRequest) (*QueryAllPubkeysResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PubkeyAll not implemented") +func (*UnimplementedQueryServer) PubKeyAll(ctx context.Context, req *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PubKeyAll not implemented") } func RegisterQueryServer(s grpc1.Server, srv QueryServer) { @@ -718,38 +719,38 @@ func _Query_FilesAll_Handler(srv interface{}, ctx context.Context, dec func(inte return interceptor(ctx, in, info, handler) } -func _Query_Pubkey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPubkeyRequest) +func _Query_PubKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryPubKeyRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Pubkey(ctx, in) + return srv.(QueryServer).PubKey(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Query/Pubkey", + FullMethod: "/canine_chain.filetree.Query/PubKey", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Pubkey(ctx, req.(*QueryPubkeyRequest)) + return srv.(QueryServer).PubKey(ctx, req.(*QueryPubKeyRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_PubkeyAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPubkeysRequest) +func _Query_PubKeyAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllPubKeysRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).PubkeyAll(ctx, in) + return srv.(QueryServer).PubKeyAll(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Query/PubkeyAll", + FullMethod: "/canine_chain.filetree.Query/PubKeyAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PubkeyAll(ctx, req.(*QueryAllPubkeysRequest)) + return srv.(QueryServer).PubKeyAll(ctx, req.(*QueryAllPubKeysRequest)) } return interceptor(ctx, in, info, handler) } @@ -771,12 +772,12 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_FilesAll_Handler, }, { - MethodName: "Pubkey", - Handler: _Query_Pubkey_Handler, + MethodName: "PubKey", + Handler: _Query_PubKey_Handler, }, { - MethodName: "PubkeyAll", - Handler: _Query_PubkeyAll_Handler, + MethodName: "PubKeyAll", + Handler: _Query_PubKeyAll_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -993,7 +994,7 @@ func (m *QueryAllFilesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryPubkeyRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPubKeyRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1003,12 +1004,12 @@ func (m *QueryPubkeyRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPubkeyRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPubKeyRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPubkeyRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPubKeyRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1023,7 +1024,7 @@ func (m *QueryPubkeyRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryPubkeyResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryPubKeyResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1033,18 +1034,18 @@ func (m *QueryPubkeyResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPubkeyResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPubKeyResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPubkeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPubKeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Pubkey.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PubKey.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1056,7 +1057,7 @@ func (m *QueryPubkeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllPubkeysRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPubKeysRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1066,12 +1067,12 @@ func (m *QueryAllPubkeysRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPubkeysRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPubKeysRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPubkeysRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPubKeysRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1091,7 +1092,7 @@ func (m *QueryAllPubkeysRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryAllPubkeysResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPubKeysResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1101,12 +1102,12 @@ func (m *QueryAllPubkeysResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPubkeysResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPubKeysResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPubkeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPubKeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1123,10 +1124,10 @@ func (m *QueryAllPubkeysResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - if len(m.Pubkey) > 0 { - for iNdEx := len(m.Pubkey) - 1; iNdEx >= 0; iNdEx-- { + if len(m.PubKey) > 0 { + for iNdEx := len(m.PubKey) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Pubkey[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PubKey[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1231,7 +1232,7 @@ func (m *QueryAllFilesResponse) Size() (n int) { return n } -func (m *QueryPubkeyRequest) Size() (n int) { +func (m *QueryPubKeyRequest) Size() (n int) { if m == nil { return 0 } @@ -1244,18 +1245,18 @@ func (m *QueryPubkeyRequest) Size() (n int) { return n } -func (m *QueryPubkeyResponse) Size() (n int) { +func (m *QueryPubKeyResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Pubkey.Size() + l = m.PubKey.Size() n += 1 + l + sovQuery(uint64(l)) return n } -func (m *QueryAllPubkeysRequest) Size() (n int) { +func (m *QueryAllPubKeysRequest) Size() (n int) { if m == nil { return 0 } @@ -1268,14 +1269,14 @@ func (m *QueryAllPubkeysRequest) Size() (n int) { return n } -func (m *QueryAllPubkeysResponse) Size() (n int) { +func (m *QueryAllPubKeysResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Pubkey) > 0 { - for _, e := range m.Pubkey { + if len(m.PubKey) > 0 { + for _, e := range m.PubKey { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -1829,7 +1830,7 @@ func (m *QueryAllFilesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPubkeyRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPubKeyRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1852,10 +1853,10 @@ func (m *QueryPubkeyRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPubkeyRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPubKeyRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPubkeyRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPubKeyRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1911,7 +1912,7 @@ func (m *QueryPubkeyRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPubkeyResponse) Unmarshal(dAtA []byte) error { +func (m *QueryPubKeyResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1934,15 +1935,15 @@ func (m *QueryPubkeyResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPubkeyResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPubKeyResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPubkeyResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPubKeyResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pubkey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PubKey", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1969,7 +1970,7 @@ func (m *QueryPubkeyResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Pubkey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1994,7 +1995,7 @@ func (m *QueryPubkeyResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPubkeysRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllPubKeysRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2017,10 +2018,10 @@ func (m *QueryAllPubkeysRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPubkeysRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPubKeysRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPubkeysRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPubKeysRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2080,7 +2081,7 @@ func (m *QueryAllPubkeysRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPubkeysResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllPubKeysResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2103,15 +2104,15 @@ func (m *QueryAllPubkeysResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPubkeysResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPubKeysResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPubkeysResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPubKeysResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pubkey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PubKey", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2138,8 +2139,8 @@ func (m *QueryAllPubkeysResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Pubkey = append(m.Pubkey, Pubkey{}) - if err := m.Pubkey[len(m.Pubkey)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.PubKey = append(m.PubKey, Pubkey{}) + if err := m.PubKey[len(m.PubKey)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/filetree/types/query.pb.gw.go b/x/filetree/types/query.pb.gw.go index f70a397b1..259a120fe 100644 --- a/x/filetree/types/query.pb.gw.go +++ b/x/filetree/types/query.pb.gw.go @@ -73,15 +73,15 @@ func request_Query_Files_0(ctx context.Context, marshaler runtime.Marshaler, cli return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - val, ok = pathParams["ownerAddress"] + val, ok = pathParams["owner_address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ownerAddress") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner_address") } protoReq.OwnerAddress, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ownerAddress", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) } msg, err := client.Files(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -111,15 +111,15 @@ func local_request_Query_Files_0(ctx context.Context, marshaler runtime.Marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - val, ok = pathParams["ownerAddress"] + val, ok = pathParams["owner_address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ownerAddress") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "owner_address") } protoReq.OwnerAddress, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ownerAddress", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) } msg, err := server.Files(ctx, &protoReq) @@ -163,8 +163,8 @@ func local_request_Query_FilesAll_0(ctx context.Context, marshaler runtime.Marsh } -func request_Query_Pubkey_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPubkeyRequest +func request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPubKeyRequest var metadata runtime.ServerMetadata var ( @@ -185,13 +185,13 @@ func request_Query_Pubkey_0(ctx context.Context, marshaler runtime.Marshaler, cl return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := client.Pubkey(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.PubKey(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Pubkey_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPubkeyRequest +func local_request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPubKeyRequest var metadata runtime.ServerMetadata var ( @@ -212,43 +212,43 @@ func local_request_Query_Pubkey_0(ctx context.Context, marshaler runtime.Marshal return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := server.Pubkey(ctx, &protoReq) + msg, err := server.PubKey(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_PubkeyAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_PubKeyAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_PubkeyAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPubkeysRequest +func request_Query_PubKeyAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPubKeysRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubkeyAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubKeyAll_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.PubkeyAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.PubKeyAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_PubkeyAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPubkeysRequest +func local_request_Query_PubKeyAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPubKeysRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubkeyAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubKeyAll_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.PubkeyAll(ctx, &protoReq) + msg, err := server.PubKeyAll(ctx, &protoReq) return msg, metadata, err } @@ -328,7 +328,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Pubkey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_PubKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -339,7 +339,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Pubkey_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_PubKey_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -347,11 +347,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Pubkey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_PubKey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_PubkeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_PubKeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -362,7 +362,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_PubkeyAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_PubKeyAll_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -370,7 +370,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_PubkeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_PubKeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -475,7 +475,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Pubkey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_PubKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -484,18 +484,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Pubkey_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_PubKey_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Pubkey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_PubKey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_PubkeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_PubKeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -504,14 +504,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_PubkeyAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_PubKeyAll_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_PubkeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_PubKeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -521,13 +521,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackaldao", "canine", "filetree", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Files_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal-dao", "canine-chain", "filetree", "files", "address", "ownerAddress"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Files_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal-dao", "canine-chain", "filetree", "files", "address", "owner_address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_FilesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "filetree", "files"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Pubkey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PubKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PubkeyAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PubKeyAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -537,7 +537,7 @@ var ( forward_Query_FilesAll_0 = runtime.ForwardResponseMessage - forward_Query_Pubkey_0 = runtime.ForwardResponseMessage + forward_Query_PubKey_0 = runtime.ForwardResponseMessage - forward_Query_PubkeyAll_0 = runtime.ForwardResponseMessage + forward_Query_PubKeyAll_0 = runtime.ForwardResponseMessage ) diff --git a/x/filetree/types/tx.pb.go b/x/filetree/types/tx.pb.go index db22492d4..12be99f12 100644 --- a/x/filetree/types/tx.pb.go +++ b/x/filetree/types/tx.pb.go @@ -30,12 +30,12 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgPostFile struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` - HashParent string `protobuf:"bytes,3,opt,name=hashParent,proto3" json:"hashParent,omitempty"` - HashChild string `protobuf:"bytes,4,opt,name=hashChild,proto3" json:"hashChild,omitempty"` + HashParent string `protobuf:"bytes,3,opt,name=hash_parent,json=hashParent,proto3" json:"hash_parent,omitempty"` + HashChild string `protobuf:"bytes,4,opt,name=hash_child,json=hashChild,proto3" json:"hash_child,omitempty"` Contents string `protobuf:"bytes,5,opt,name=contents,proto3" json:"contents,omitempty"` Viewers string `protobuf:"bytes,6,opt,name=viewers,proto3" json:"viewers,omitempty"` Editors string `protobuf:"bytes,7,opt,name=editors,proto3" json:"editors,omitempty"` - TrackingNumber string `protobuf:"bytes,8,opt,name=trackingNumber,proto3" json:"trackingNumber,omitempty"` + TrackingNumber string `protobuf:"bytes,8,opt,name=tracking_number,json=trackingNumber,proto3" json:"tracking_number,omitempty"` } func (m *MsgPostFile) Reset() { *m = MsgPostFile{} } @@ -173,10 +173,10 @@ func (m *MsgPostFileResponse) GetPath() string { type MsgAddViewers struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - ViewerIds string `protobuf:"bytes,2,opt,name=viewerIds,proto3" json:"viewerIds,omitempty"` - ViewerKeys string `protobuf:"bytes,3,opt,name=viewerKeys,proto3" json:"viewerKeys,omitempty"` + ViewerIds string `protobuf:"bytes,2,opt,name=viewer_ids,json=viewerIds,proto3" json:"viewer_ids,omitempty"` + ViewerKeys string `protobuf:"bytes,3,opt,name=viewer_keys,json=viewerKeys,proto3" json:"viewer_keys,omitempty"` Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,5,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,5,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgAddViewers) Reset() { *m = MsgAddViewers{} } @@ -240,9 +240,9 @@ func (m *MsgAddViewers) GetAddress() string { return "" } -func (m *MsgAddViewers) GetFileowner() string { +func (m *MsgAddViewers) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -283,23 +283,23 @@ func (m *MsgAddViewersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgAddViewersResponse proto.InternalMessageInfo -type MsgPostkey struct { +type MsgPostKey struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } -func (m *MsgPostkey) Reset() { *m = MsgPostkey{} } -func (m *MsgPostkey) String() string { return proto.CompactTextString(m) } -func (*MsgPostkey) ProtoMessage() {} -func (*MsgPostkey) Descriptor() ([]byte, []int) { +func (m *MsgPostKey) Reset() { *m = MsgPostKey{} } +func (m *MsgPostKey) String() string { return proto.CompactTextString(m) } +func (*MsgPostKey) ProtoMessage() {} +func (*MsgPostKey) Descriptor() ([]byte, []int) { return fileDescriptor_e5756d04c34e5a81, []int{4} } -func (m *MsgPostkey) XXX_Unmarshal(b []byte) error { +func (m *MsgPostKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgPostkey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgPostKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgPostkey.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgPostKey.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -309,47 +309,47 @@ func (m *MsgPostkey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *MsgPostkey) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgPostkey.Merge(m, src) +func (m *MsgPostKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgPostKey.Merge(m, src) } -func (m *MsgPostkey) XXX_Size() int { +func (m *MsgPostKey) XXX_Size() int { return m.Size() } -func (m *MsgPostkey) XXX_DiscardUnknown() { - xxx_messageInfo_MsgPostkey.DiscardUnknown(m) +func (m *MsgPostKey) XXX_DiscardUnknown() { + xxx_messageInfo_MsgPostKey.DiscardUnknown(m) } -var xxx_messageInfo_MsgPostkey proto.InternalMessageInfo +var xxx_messageInfo_MsgPostKey proto.InternalMessageInfo -func (m *MsgPostkey) GetCreator() string { +func (m *MsgPostKey) GetCreator() string { if m != nil { return m.Creator } return "" } -func (m *MsgPostkey) GetKey() string { +func (m *MsgPostKey) GetKey() string { if m != nil { return m.Key } return "" } -type MsgPostkeyResponse struct { +type MsgPostKeyResponse struct { } -func (m *MsgPostkeyResponse) Reset() { *m = MsgPostkeyResponse{} } -func (m *MsgPostkeyResponse) String() string { return proto.CompactTextString(m) } -func (*MsgPostkeyResponse) ProtoMessage() {} -func (*MsgPostkeyResponse) Descriptor() ([]byte, []int) { +func (m *MsgPostKeyResponse) Reset() { *m = MsgPostKeyResponse{} } +func (m *MsgPostKeyResponse) String() string { return proto.CompactTextString(m) } +func (*MsgPostKeyResponse) ProtoMessage() {} +func (*MsgPostKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptor_e5756d04c34e5a81, []int{5} } -func (m *MsgPostkeyResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgPostKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgPostkeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgPostKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgPostkeyResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgPostKeyResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -359,21 +359,21 @@ func (m *MsgPostkeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgPostkeyResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgPostkeyResponse.Merge(m, src) +func (m *MsgPostKeyResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgPostKeyResponse.Merge(m, src) } -func (m *MsgPostkeyResponse) XXX_Size() int { +func (m *MsgPostKeyResponse) XXX_Size() int { return m.Size() } -func (m *MsgPostkeyResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgPostkeyResponse.DiscardUnknown(m) +func (m *MsgPostKeyResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgPostKeyResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgPostkeyResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgPostKeyResponse proto.InternalMessageInfo type MsgDeleteFile struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - HashPath string `protobuf:"bytes,2,opt,name=hashPath,proto3" json:"hashPath,omitempty"` + HashPath string `protobuf:"bytes,2,opt,name=hash_path,json=hashPath,proto3" json:"hash_path,omitempty"` Account string `protobuf:"bytes,3,opt,name=account,proto3" json:"account,omitempty"` } @@ -469,9 +469,9 @@ var xxx_messageInfo_MsgDeleteFileResponse proto.InternalMessageInfo type MsgRemoveViewers struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - ViewerIds string `protobuf:"bytes,2,opt,name=viewerIds,proto3" json:"viewerIds,omitempty"` + ViewerIds string `protobuf:"bytes,2,opt,name=viewer_ids,json=viewerIds,proto3" json:"viewer_ids,omitempty"` Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,4,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,4,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgRemoveViewers) Reset() { *m = MsgRemoveViewers{} } @@ -528,9 +528,9 @@ func (m *MsgRemoveViewers) GetAddress() string { return "" } -func (m *MsgRemoveViewers) GetFileowner() string { +func (m *MsgRemoveViewers) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -574,11 +574,11 @@ var xxx_messageInfo_MsgRemoveViewersResponse proto.InternalMessageInfo type MsgMakeRoot struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` - RootHashPath string `protobuf:"bytes,3,opt,name=rootHashPath,proto3" json:"rootHashPath,omitempty"` + RootHashPath string `protobuf:"bytes,3,opt,name=root_hash_path,json=rootHashPath,proto3" json:"root_hash_path,omitempty"` Contents string `protobuf:"bytes,4,opt,name=contents,proto3" json:"contents,omitempty"` Editors string `protobuf:"bytes,5,opt,name=editors,proto3" json:"editors,omitempty"` Viewers string `protobuf:"bytes,6,opt,name=viewers,proto3" json:"viewers,omitempty"` - TrackingNumber string `protobuf:"bytes,7,opt,name=trackingNumber,proto3" json:"trackingNumber,omitempty"` + TrackingNumber string `protobuf:"bytes,7,opt,name=tracking_number,json=trackingNumber,proto3" json:"tracking_number,omitempty"` } func (m *MsgMakeRoot) Reset() { *m = MsgMakeRoot{} } @@ -703,7 +703,7 @@ type MsgMakeRootV2 struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Editors string `protobuf:"bytes,2,opt,name=editors,proto3" json:"editors,omitempty"` Viewers string `protobuf:"bytes,3,opt,name=viewers,proto3" json:"viewers,omitempty"` - TrackingNumber string `protobuf:"bytes,4,opt,name=trackingNumber,proto3" json:"trackingNumber,omitempty"` + TrackingNumber string `protobuf:"bytes,4,opt,name=tracking_number,json=trackingNumber,proto3" json:"tracking_number,omitempty"` } func (m *MsgMakeRootV2) Reset() { *m = MsgMakeRootV2{} } @@ -769,10 +769,10 @@ func (m *MsgMakeRootV2) GetTrackingNumber() string { type MsgAddEditors struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - EditorIds string `protobuf:"bytes,2,opt,name=editorIds,proto3" json:"editorIds,omitempty"` - EditorKeys string `protobuf:"bytes,3,opt,name=editorKeys,proto3" json:"editorKeys,omitempty"` + EditorIds string `protobuf:"bytes,2,opt,name=editor_ids,json=editorIds,proto3" json:"editor_ids,omitempty"` + EditorKeys string `protobuf:"bytes,3,opt,name=editor_keys,json=editorKeys,proto3" json:"editor_keys,omitempty"` Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,5,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,5,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgAddEditors) Reset() { *m = MsgAddEditors{} } @@ -836,9 +836,9 @@ func (m *MsgAddEditors) GetAddress() string { return "" } -func (m *MsgAddEditors) GetFileowner() string { +func (m *MsgAddEditors) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -881,9 +881,9 @@ var xxx_messageInfo_MsgAddEditorsResponse proto.InternalMessageInfo type MsgRemoveEditors struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - EditorIds string `protobuf:"bytes,2,opt,name=editorIds,proto3" json:"editorIds,omitempty"` + EditorIds string `protobuf:"bytes,2,opt,name=editor_ids,json=editorIds,proto3" json:"editor_ids,omitempty"` Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,4,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,4,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgRemoveEditors) Reset() { *m = MsgRemoveEditors{} } @@ -940,9 +940,9 @@ func (m *MsgRemoveEditors) GetAddress() string { return "" } -func (m *MsgRemoveEditors) GetFileowner() string { +func (m *MsgRemoveEditors) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -986,7 +986,7 @@ var xxx_messageInfo_MsgRemoveEditorsResponse proto.InternalMessageInfo type MsgResetEditors struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,3,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,3,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgResetEditors) Reset() { *m = MsgResetEditors{} } @@ -1036,9 +1036,9 @@ func (m *MsgResetEditors) GetAddress() string { return "" } -func (m *MsgResetEditors) GetFileowner() string { +func (m *MsgResetEditors) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -1082,7 +1082,7 @@ var xxx_messageInfo_MsgResetEditorsResponse proto.InternalMessageInfo type MsgResetViewers struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - Fileowner string `protobuf:"bytes,3,opt,name=fileowner,proto3" json:"fileowner,omitempty"` + FileOwner string `protobuf:"bytes,3,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` } func (m *MsgResetViewers) Reset() { *m = MsgResetViewers{} } @@ -1132,9 +1132,9 @@ func (m *MsgResetViewers) GetAddress() string { return "" } -func (m *MsgResetViewers) GetFileowner() string { +func (m *MsgResetViewers) GetFileOwner() string { if m != nil { - return m.Fileowner + return m.FileOwner } return "" } @@ -1178,7 +1178,7 @@ var xxx_messageInfo_MsgResetViewersResponse proto.InternalMessageInfo type MsgChangeOwner struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - FileOwner string `protobuf:"bytes,3,opt,name=fileOwner,proto3" json:"fileOwner,omitempty"` + FileOwner string `protobuf:"bytes,3,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` NewOwner string `protobuf:"bytes,4,opt,name=newOwner,proto3" json:"newOwner,omitempty"` } @@ -1284,8 +1284,8 @@ func init() { proto.RegisterType((*MsgPostFileResponse)(nil), "canine_chain.filetree.MsgPostFileResponse") proto.RegisterType((*MsgAddViewers)(nil), "canine_chain.filetree.MsgAddViewers") proto.RegisterType((*MsgAddViewersResponse)(nil), "canine_chain.filetree.MsgAddViewersResponse") - proto.RegisterType((*MsgPostkey)(nil), "canine_chain.filetree.MsgPostkey") - proto.RegisterType((*MsgPostkeyResponse)(nil), "canine_chain.filetree.MsgPostkeyResponse") + proto.RegisterType((*MsgPostKey)(nil), "canine_chain.filetree.MsgPostKey") + proto.RegisterType((*MsgPostKeyResponse)(nil), "canine_chain.filetree.MsgPostKeyResponse") proto.RegisterType((*MsgDeleteFile)(nil), "canine_chain.filetree.MsgDeleteFile") proto.RegisterType((*MsgDeleteFileResponse)(nil), "canine_chain.filetree.MsgDeleteFileResponse") proto.RegisterType((*MsgRemoveViewers)(nil), "canine_chain.filetree.MsgRemoveViewers") @@ -1308,60 +1308,62 @@ func init() { func init() { proto.RegisterFile("canine_chain/filetree/tx.proto", fileDescriptor_e5756d04c34e5a81) } var fileDescriptor_e5756d04c34e5a81 = []byte{ - // 845 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6f, 0xd3, 0x48, - 0x14, 0xaf, 0x9b, 0xb4, 0x49, 0x5e, 0x3f, 0xb6, 0xf2, 0x6e, 0xb7, 0x5e, 0xab, 0xb2, 0x76, 0xad, - 0x6e, 0x77, 0x8b, 0x68, 0x22, 0xb5, 0x17, 0xae, 0x50, 0x40, 0x20, 0x08, 0xad, 0x72, 0x28, 0x52, - 0x0f, 0x14, 0xc7, 0x79, 0xb5, 0x4d, 0x52, 0x3b, 0xf2, 0x4c, 0x3f, 0x72, 0xe1, 0x80, 0xc4, 0x9d, - 0xff, 0x80, 0x23, 0xff, 0x0a, 0xc7, 0x1e, 0xb9, 0x20, 0xa1, 0xf6, 0x8f, 0xe0, 0x8a, 0xfc, 0x31, - 0xe3, 0xb1, 0x93, 0xd8, 0x81, 0xf4, 0xe6, 0xf7, 0x31, 0xf3, 0xfb, 0xcd, 0x9b, 0xf7, 0x9b, 0x27, - 0x83, 0x66, 0x1a, 0xae, 0xe3, 0xe2, 0xb1, 0x69, 0x1b, 0x8e, 0xdb, 0x38, 0x71, 0x7a, 0x48, 0x7d, - 0xc4, 0x06, 0xbd, 0xac, 0xf7, 0x7d, 0x8f, 0x7a, 0xf2, 0xaa, 0x18, 0xaf, 0xb3, 0xb8, 0xfe, 0x5d, - 0x82, 0x85, 0x26, 0xb1, 0x0e, 0x3c, 0x42, 0x1f, 0x3b, 0x3d, 0x94, 0x15, 0xa8, 0x98, 0x3e, 0x1a, - 0xd4, 0xf3, 0x15, 0xe9, 0x6f, 0xe9, 0xff, 0x5a, 0x8b, 0x99, 0x41, 0xc4, 0x30, 0x4d, 0xef, 0xcc, - 0xa5, 0xca, 0x6c, 0x14, 0x89, 0x4d, 0x59, 0x03, 0xb0, 0x0d, 0x62, 0x1f, 0x18, 0x3e, 0xba, 0x54, - 0x29, 0x85, 0x41, 0xc1, 0x23, 0xaf, 0x43, 0x2d, 0xb0, 0xf6, 0x6c, 0xa7, 0xd7, 0x51, 0xca, 0x61, - 0x38, 0x71, 0xc8, 0x2a, 0x54, 0x4d, 0xcf, 0xa5, 0xe8, 0x52, 0xa2, 0xcc, 0x85, 0x41, 0x6e, 0x07, - 0x98, 0xe7, 0x0e, 0x5e, 0xa0, 0x4f, 0x94, 0xf9, 0x08, 0x33, 0x36, 0x83, 0x08, 0x76, 0x1c, 0xea, - 0xf9, 0x44, 0xa9, 0x44, 0x91, 0xd8, 0x94, 0x37, 0x61, 0x99, 0xfa, 0x86, 0xd9, 0x75, 0x5c, 0xeb, - 0xc5, 0xd9, 0x69, 0x1b, 0x7d, 0xa5, 0x1a, 0x26, 0x64, 0xbc, 0xfa, 0x16, 0xfc, 0x2e, 0x1c, 0xbc, - 0x85, 0xa4, 0xef, 0xb9, 0x04, 0x65, 0x19, 0xca, 0x7d, 0x83, 0xda, 0xf1, 0xe9, 0xc3, 0x6f, 0xfd, - 0xa3, 0x04, 0x4b, 0x4d, 0x62, 0xdd, 0xef, 0x74, 0x0e, 0x13, 0xf8, 0x31, 0x65, 0x5a, 0x87, 0x5a, - 0xc4, 0xf1, 0x69, 0x87, 0xc4, 0x85, 0x4a, 0x1c, 0x41, 0xa9, 0x22, 0xe3, 0x19, 0x0e, 0x08, 0x2b, - 0x55, 0xe2, 0x09, 0x8b, 0xdc, 0xe9, 0xf8, 0x48, 0x48, 0x5c, 0x28, 0x66, 0x06, 0xfb, 0x06, 0x97, - 0xe6, 0x5d, 0xb8, 0xe8, 0xc7, 0x75, 0x4a, 0x1c, 0xfa, 0x1a, 0xac, 0xa6, 0x08, 0xb2, 0xe3, 0xe8, - 0xf7, 0x00, 0xe2, 0x53, 0x76, 0x71, 0x90, 0x43, 0x7b, 0x05, 0x4a, 0x5d, 0x1c, 0xc4, 0x84, 0x83, - 0x4f, 0xfd, 0x0f, 0x90, 0x93, 0x95, 0x7c, 0xbf, 0xe3, 0xb0, 0x12, 0x0f, 0xb1, 0x87, 0x14, 0x0b, - 0x1a, 0x46, 0x85, 0x6a, 0xd4, 0x04, 0xd4, 0x8e, 0xf7, 0xe5, 0xb6, 0xd8, 0x4c, 0xa5, 0x54, 0x33, - 0xc5, 0x27, 0x49, 0x00, 0x38, 0xf2, 0x3b, 0x09, 0x56, 0x9a, 0xc4, 0x6a, 0xe1, 0xa9, 0x77, 0x8e, - 0xd3, 0xde, 0x83, 0x50, 0xe7, 0x52, 0x4e, 0x9d, 0xcb, 0xd9, 0x3a, 0xab, 0xa0, 0x64, 0x39, 0x70, - 0x82, 0x5f, 0x23, 0x29, 0x35, 0x8d, 0x2e, 0xb6, 0x3c, 0x8f, 0xfe, 0x92, 0x94, 0x74, 0x58, 0xf4, - 0x3d, 0x8f, 0x3e, 0x61, 0x75, 0x8b, 0xc8, 0xa5, 0x7c, 0x29, 0xc1, 0x94, 0x87, 0x05, 0xc3, 0x64, - 0x31, 0x97, 0x96, 0xc5, 0x78, 0x29, 0x0d, 0x0b, 0xa6, 0x32, 0x52, 0x30, 0xab, 0xa1, 0x60, 0xd8, - 0xf1, 0xf8, 0xb1, 0xdf, 0x47, 0xe2, 0x60, 0xfe, 0xc3, 0x9d, 0xfc, 0x83, 0x33, 0x7a, 0xb3, 0x63, - 0xe9, 0x95, 0x8a, 0xe8, 0x95, 0x47, 0xd2, 0x4b, 0x44, 0xfa, 0x28, 0xd9, 0x73, 0x7c, 0x73, 0x44, - 0xc0, 0x42, 0x73, 0x70, 0x47, 0x20, 0xd2, 0xc8, 0x10, 0x45, 0x9a, 0x78, 0xa6, 0x17, 0x69, 0x4c, - 0x70, 0x74, 0x6b, 0x4f, 0xcb, 0xfe, 0x36, 0x5a, 0x3b, 0x4b, 0xd0, 0x84, 0xdf, 0xc2, 0x18, 0x41, - 0x5a, 0x4c, 0x4f, 0x20, 0x30, 0x9b, 0x43, 0xa0, 0x94, 0x25, 0xf0, 0x17, 0xac, 0x65, 0x40, 0x46, - 0xe1, 0x17, 0x2b, 0xff, 0x16, 0xf0, 0xb3, 0xd2, 0x7e, 0x0b, 0xcb, 0x4d, 0x62, 0xed, 0xd9, 0x86, - 0x6b, 0xe1, 0x7e, 0x90, 0x3c, 0x0d, 0xfc, 0x7e, 0x16, 0x3e, 0xda, 0x51, 0x85, 0xaa, 0x8b, 0x17, - 0xfb, 0xc2, 0xe5, 0x70, 0x5b, 0x57, 0xe0, 0xcf, 0x34, 0x3e, 0x63, 0xb6, 0xf3, 0xa9, 0x06, 0xa5, - 0x26, 0xb1, 0xe4, 0x23, 0xa8, 0xf2, 0x19, 0xae, 0xd7, 0x47, 0xce, 0xfa, 0xba, 0x30, 0xee, 0xd4, - 0x3b, 0xc5, 0x39, 0x7c, 0x24, 0xbe, 0x06, 0x10, 0x46, 0xdf, 0xc6, 0xf8, 0x95, 0x49, 0x96, 0x7a, - 0x77, 0x92, 0x2c, 0x8e, 0xf0, 0x12, 0x2a, 0x6c, 0x44, 0xfd, 0x93, 0x4f, 0xac, 0x8b, 0x03, 0x75, - 0xab, 0x30, 0x45, 0xa4, 0x2e, 0xcc, 0xaa, 0x1c, 0xea, 0x49, 0x56, 0x1e, 0xf5, 0xe1, 0xb1, 0x24, - 0x3b, 0xb0, 0x94, 0x1e, 0x49, 0xff, 0x8d, 0x5f, 0x9e, 0x4a, 0x54, 0x1b, 0x13, 0x26, 0x72, 0xa8, - 0x23, 0xa8, 0xf2, 0xe1, 0x92, 0x73, 0xc7, 0x2c, 0x27, 0xef, 0x8e, 0xb3, 0xaf, 0xb8, 0xfc, 0x0a, - 0x40, 0x78, 0xc1, 0x37, 0x8a, 0x57, 0x1e, 0xee, 0xfc, 0xd4, 0xfe, 0x51, 0x0f, 0xb1, 0xc7, 0x23, - 0xbf, 0x87, 0xe2, 0xac, 0x82, 0x1e, 0xca, 0xbc, 0x11, 0xc9, 0x45, 0x30, 0x90, 0xc2, 0x8b, 0x60, - 0x38, 0x8d, 0x09, 0x13, 0x39, 0xd4, 0x09, 0x2c, 0xa6, 0xde, 0xc2, 0xcd, 0xbc, 0x0d, 0x92, 0x3c, - 0xb5, 0x3e, 0x59, 0xde, 0x10, 0x0e, 0x6b, 0xad, 0x22, 0x1c, 0xd6, 0x59, 0xf5, 0xc9, 0xf2, 0x38, - 0x8e, 0x09, 0x0b, 0xe2, 0xdb, 0xf6, 0xef, 0xf8, 0xe5, 0x42, 0x9a, 0xba, 0x3d, 0x51, 0x1a, 0x03, - 0x79, 0xd0, 0xfc, 0x7c, 0xad, 0x49, 0x57, 0xd7, 0x9a, 0xf4, 0xed, 0x5a, 0x93, 0x3e, 0xdc, 0x68, - 0x33, 0x57, 0x37, 0xda, 0xcc, 0x97, 0x1b, 0x6d, 0xe6, 0x68, 0xd7, 0x72, 0xa8, 0x7d, 0xd6, 0xae, - 0x9b, 0xde, 0x69, 0xe3, 0x8d, 0x61, 0x76, 0x8d, 0xde, 0x73, 0xa3, 0x4d, 0x1a, 0xd1, 0xee, 0xdb, - 0xd1, 0x0f, 0xcd, 0xa5, 0xf0, 0x4b, 0x33, 0xe8, 0x23, 0x69, 0xcf, 0x87, 0xbf, 0x35, 0xbb, 0x3f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x17, 0x36, 0x84, 0xa3, 0xf8, 0x0c, 0x00, 0x00, + // 871 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x53, 0xdb, 0x38, + 0x14, 0xc6, 0x24, 0x90, 0xe4, 0xf1, 0x73, 0xbc, 0xcb, 0xe2, 0xf5, 0x0e, 0xd9, 0x5d, 0x0f, 0xbb, + 0x94, 0x4e, 0x49, 0x66, 0xe0, 0xd2, 0x6b, 0x4b, 0xdb, 0x69, 0x87, 0xa6, 0x30, 0x39, 0xd0, 0x19, + 0x0e, 0x0d, 0x8e, 0x2d, 0x6c, 0x37, 0xc1, 0xca, 0x58, 0xe2, 0x47, 0x4e, 0xbd, 0x74, 0x7a, 0xee, + 0xdf, 0xd0, 0x4b, 0xff, 0x95, 0x1e, 0x39, 0xf6, 0xc8, 0xc0, 0x7f, 0xd1, 0x53, 0xc7, 0x96, 0x64, + 0x2b, 0x26, 0xb1, 0xd3, 0x42, 0x6f, 0xd1, 0x7b, 0x9f, 0xf4, 0x7d, 0x7a, 0x7a, 0x9f, 0x14, 0x43, + 0xd5, 0x32, 0x7d, 0xcf, 0x47, 0x2d, 0xcb, 0x35, 0x3d, 0xbf, 0x7e, 0xe4, 0x75, 0x11, 0x0d, 0x10, + 0xaa, 0xd3, 0xf3, 0x5a, 0x2f, 0xc0, 0x14, 0xab, 0x4b, 0x72, 0xbe, 0x26, 0xf2, 0xc6, 0x37, 0x05, + 0x66, 0x1a, 0xc4, 0xd9, 0xc3, 0x84, 0x3e, 0xf3, 0xba, 0x48, 0xd5, 0xa0, 0x64, 0x05, 0xc8, 0xa4, + 0x38, 0xd0, 0x94, 0x7f, 0x94, 0x7b, 0x95, 0xa6, 0x18, 0x86, 0x19, 0xd3, 0xb2, 0xf0, 0x89, 0x4f, + 0xb5, 0x49, 0x96, 0xe1, 0x43, 0xf5, 0x6f, 0x98, 0x71, 0x4d, 0xe2, 0xb6, 0x7a, 0x66, 0x80, 0x7c, + 0xaa, 0x15, 0xa2, 0x2c, 0x84, 0xa1, 0xbd, 0x28, 0xa2, 0xae, 0x40, 0x34, 0x6a, 0x59, 0xae, 0xd7, + 0xb5, 0xb5, 0x62, 0x94, 0xaf, 0x84, 0x91, 0xed, 0x30, 0xa0, 0xea, 0x50, 0xb6, 0xb0, 0x4f, 0x91, + 0x4f, 0x89, 0x36, 0x15, 0x25, 0xe3, 0x71, 0xc8, 0x7a, 0xea, 0xa1, 0x33, 0x14, 0x10, 0x6d, 0x9a, + 0xb1, 0xf2, 0x61, 0x98, 0x41, 0xb6, 0x47, 0x71, 0x40, 0xb4, 0x12, 0xcb, 0xf0, 0xa1, 0xba, 0x06, + 0x0b, 0x34, 0x30, 0xad, 0x8e, 0xe7, 0x3b, 0x2d, 0xff, 0xe4, 0xb8, 0x8d, 0x02, 0xad, 0x1c, 0x21, + 0xe6, 0x45, 0xf8, 0x55, 0x14, 0x35, 0xd6, 0xe1, 0x37, 0x69, 0xef, 0x4d, 0x44, 0x7a, 0xd8, 0x27, + 0x48, 0x55, 0xa1, 0xd8, 0x33, 0xa9, 0xcb, 0x0b, 0x10, 0xfd, 0x36, 0x3e, 0x29, 0x30, 0xd7, 0x20, + 0xce, 0x23, 0xdb, 0xde, 0x4f, 0xf8, 0x47, 0x54, 0x6a, 0x05, 0x80, 0x89, 0x6c, 0x79, 0x36, 0xe1, + 0xc5, 0xaa, 0xb0, 0xc8, 0x0b, 0x9b, 0x84, 0xe5, 0xe2, 0xe9, 0x0e, 0xea, 0x13, 0x51, 0x2e, 0x16, + 0xda, 0x41, 0xfd, 0x68, 0x65, 0xd3, 0xb6, 0x03, 0x44, 0x08, 0xaf, 0x95, 0x18, 0x86, 0x2b, 0x87, + 0x27, 0xd7, 0xc2, 0x67, 0x3e, 0x0a, 0x78, 0xad, 0x2a, 0x61, 0x64, 0x37, 0x0c, 0x18, 0xcb, 0xb0, + 0x34, 0xa0, 0x51, 0xec, 0xc8, 0x78, 0x08, 0xc0, 0x37, 0xba, 0x83, 0xfa, 0x19, 0xca, 0x17, 0xa1, + 0xd0, 0x41, 0x7d, 0x2e, 0x39, 0xfc, 0x69, 0xfc, 0x0e, 0x6a, 0x32, 0x33, 0x5e, 0xef, 0x30, 0x2a, + 0xc6, 0x13, 0xd4, 0x45, 0x14, 0xe5, 0xb4, 0xcd, 0x5f, 0x50, 0xe1, 0xcd, 0x41, 0x5d, 0xbe, 0x70, + 0x99, 0xb5, 0x06, 0x75, 0xe5, 0x9e, 0x2a, 0x0c, 0xf4, 0x14, 0xdf, 0x4a, 0xc2, 0x10, 0x53, 0xbf, + 0x57, 0x60, 0xb1, 0x41, 0x9c, 0x26, 0x3a, 0xc6, 0xa7, 0xe8, 0xd6, 0x67, 0x21, 0x95, 0xba, 0x90, + 0x55, 0xea, 0x62, 0xba, 0xd4, 0x3a, 0x68, 0x69, 0x15, 0xb1, 0xc4, 0x4b, 0xe6, 0xa9, 0x86, 0xd9, + 0x41, 0x4d, 0x8c, 0xe9, 0x4f, 0x79, 0x6a, 0x15, 0xe6, 0x03, 0x8c, 0x69, 0x2b, 0xa9, 0x1d, 0xd3, + 0x37, 0x1b, 0x46, 0x9f, 0x8b, 0xfa, 0xc9, 0xce, 0x29, 0xde, 0x74, 0x8e, 0xf0, 0xc7, 0xd4, 0xa0, + 0x3f, 0x46, 0x7b, 0x6a, 0x88, 0x73, 0x4a, 0x43, 0x9d, 0xb3, 0x14, 0x39, 0x47, 0xec, 0x30, 0xde, + 0xf9, 0x07, 0xe6, 0x12, 0x11, 0xdf, 0xdf, 0xcc, 0xde, 0xbb, 0xd0, 0x37, 0x39, 0x52, 0x5f, 0x21, + 0x57, 0x5f, 0x71, 0xa8, 0xbe, 0xc4, 0xae, 0x4f, 0x93, 0x45, 0x47, 0xb7, 0x08, 0x63, 0x96, 0x5b, + 0x84, 0x45, 0xb8, 0x5d, 0x79, 0x5a, 0xb6, 0x2b, 0x0b, 0xdd, 0x91, 0x5d, 0xb9, 0xc6, 0xe1, 0x3d, + 0x7e, 0xeb, 0x0d, 0xdc, 0x49, 0x8f, 0xa7, 0x25, 0xda, 0xb0, 0x10, 0xe5, 0x08, 0xa2, 0xf9, 0x02, + 0x25, 0x05, 0x93, 0x59, 0x0a, 0x0a, 0x69, 0x05, 0x7f, 0xc2, 0x72, 0x8a, 0x65, 0x98, 0x80, 0xfc, + 0x5b, 0xe0, 0x2e, 0x04, 0xa4, 0x5d, 0xfe, 0x0e, 0xe6, 0x1b, 0xc4, 0xd9, 0x76, 0x4d, 0xdf, 0x61, + 0xe0, 0x5f, 0xc0, 0x1f, 0x1a, 0xdc, 0x47, 0x67, 0xbb, 0xd2, 0xf9, 0xc4, 0x63, 0x43, 0x83, 0x3f, + 0x06, 0x05, 0x08, 0x69, 0x9b, 0x9f, 0x2b, 0x50, 0x68, 0x10, 0x47, 0x3d, 0x80, 0x72, 0xfc, 0xb0, + 0x1b, 0xb5, 0xa1, 0x7f, 0x00, 0x6a, 0xd2, 0x03, 0xa8, 0xdf, 0xcf, 0xc7, 0xc4, 0x8f, 0xe4, 0x21, + 0x80, 0xf4, 0x18, 0xae, 0x8e, 0x9e, 0x99, 0xa0, 0xf4, 0x07, 0xe3, 0xa0, 0x62, 0x86, 0xd7, 0x50, + 0x12, 0x2f, 0xd6, 0xbf, 0xd9, 0xc2, 0x76, 0x50, 0x5f, 0x5f, 0xcf, 0x85, 0xc8, 0xd2, 0xa5, 0xa7, + 0x2b, 0x43, 0x7a, 0x82, 0xca, 0x92, 0x7e, 0xf3, 0x91, 0x52, 0x3d, 0x98, 0x1b, 0x7c, 0xa0, 0xd6, + 0x46, 0x4f, 0x1f, 0x00, 0xea, 0xf5, 0x31, 0x81, 0x31, 0xd5, 0x01, 0x94, 0xe3, 0x87, 0x26, 0xe3, + 0x8c, 0x05, 0x26, 0xeb, 0x8c, 0xd3, 0xd7, 0xb9, 0xfa, 0x06, 0x40, 0xba, 0xca, 0x57, 0xf3, 0x67, + 0xee, 0x6f, 0xfe, 0xd0, 0xfa, 0xac, 0x87, 0xc4, 0xfd, 0x91, 0xdd, 0x43, 0x1c, 0x95, 0xd3, 0x43, + 0xa9, 0x5b, 0x22, 0x39, 0x08, 0x41, 0x92, 0x7b, 0x10, 0x82, 0xa7, 0x3e, 0x26, 0x30, 0xa6, 0x3a, + 0x82, 0xd9, 0x81, 0xeb, 0xf0, 0xff, 0xac, 0x05, 0x12, 0x9c, 0x5e, 0x1b, 0x0f, 0x77, 0x83, 0x47, + 0xb4, 0x56, 0x1e, 0x8f, 0xe8, 0xac, 0xda, 0x78, 0xb8, 0x98, 0xc7, 0x82, 0x19, 0xf9, 0x72, 0xfb, + 0x6f, 0xf4, 0x74, 0x09, 0xa6, 0x6f, 0x8c, 0x05, 0x13, 0x24, 0x8f, 0x1b, 0x5f, 0xae, 0xaa, 0xca, + 0xc5, 0x55, 0x55, 0xb9, 0xbc, 0xaa, 0x2a, 0x1f, 0xaf, 0xab, 0x13, 0x17, 0xd7, 0xd5, 0x89, 0xaf, + 0xd7, 0xd5, 0x89, 0x83, 0x2d, 0xc7, 0xa3, 0xee, 0x49, 0xbb, 0x66, 0xe1, 0xe3, 0xfa, 0x5b, 0xd3, + 0xea, 0x98, 0xdd, 0x97, 0x66, 0x9b, 0xd4, 0xd9, 0xea, 0x1b, 0xec, 0x2b, 0xe7, 0x5c, 0xfa, 0xce, + 0xe9, 0xf7, 0x10, 0x69, 0x4f, 0x47, 0xdf, 0x3a, 0x5b, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7, + 0xe4, 0xf7, 0xb2, 0x0d, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1378,7 +1380,7 @@ const _ = grpc.SupportPackageIsVersion4 type MsgClient interface { PostFile(ctx context.Context, in *MsgPostFile, opts ...grpc.CallOption) (*MsgPostFileResponse, error) AddViewers(ctx context.Context, in *MsgAddViewers, opts ...grpc.CallOption) (*MsgAddViewersResponse, error) - Postkey(ctx context.Context, in *MsgPostkey, opts ...grpc.CallOption) (*MsgPostkeyResponse, error) + PostKey(ctx context.Context, in *MsgPostKey, opts ...grpc.CallOption) (*MsgPostKeyResponse, error) DeleteFile(ctx context.Context, in *MsgDeleteFile, opts ...grpc.CallOption) (*MsgDeleteFileResponse, error) RemoveViewers(ctx context.Context, in *MsgRemoveViewers, opts ...grpc.CallOption) (*MsgRemoveViewersResponse, error) MakeRoot(ctx context.Context, in *MsgMakeRoot, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) @@ -1416,9 +1418,9 @@ func (c *msgClient) AddViewers(ctx context.Context, in *MsgAddViewers, opts ...g return out, nil } -func (c *msgClient) Postkey(ctx context.Context, in *MsgPostkey, opts ...grpc.CallOption) (*MsgPostkeyResponse, error) { - out := new(MsgPostkeyResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/Postkey", in, out, opts...) +func (c *msgClient) PostKey(ctx context.Context, in *MsgPostKey, opts ...grpc.CallOption) (*MsgPostKeyResponse, error) { + out := new(MsgPostKeyResponse) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/PostKey", in, out, opts...) if err != nil { return nil, err } @@ -1510,7 +1512,7 @@ func (c *msgClient) ChangeOwner(ctx context.Context, in *MsgChangeOwner, opts .. type MsgServer interface { PostFile(context.Context, *MsgPostFile) (*MsgPostFileResponse, error) AddViewers(context.Context, *MsgAddViewers) (*MsgAddViewersResponse, error) - Postkey(context.Context, *MsgPostkey) (*MsgPostkeyResponse, error) + PostKey(context.Context, *MsgPostKey) (*MsgPostKeyResponse, error) DeleteFile(context.Context, *MsgDeleteFile) (*MsgDeleteFileResponse, error) RemoveViewers(context.Context, *MsgRemoveViewers) (*MsgRemoveViewersResponse, error) MakeRoot(context.Context, *MsgMakeRoot) (*MsgMakeRootResponse, error) @@ -1532,8 +1534,8 @@ func (*UnimplementedMsgServer) PostFile(ctx context.Context, req *MsgPostFile) ( func (*UnimplementedMsgServer) AddViewers(ctx context.Context, req *MsgAddViewers) (*MsgAddViewersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AddViewers not implemented") } -func (*UnimplementedMsgServer) Postkey(ctx context.Context, req *MsgPostkey) (*MsgPostkeyResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Postkey not implemented") +func (*UnimplementedMsgServer) PostKey(ctx context.Context, req *MsgPostKey) (*MsgPostKeyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PostKey not implemented") } func (*UnimplementedMsgServer) DeleteFile(ctx context.Context, req *MsgDeleteFile) (*MsgDeleteFileResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteFile not implemented") @@ -1603,20 +1605,20 @@ func _Msg_AddViewers_Handler(srv interface{}, ctx context.Context, dec func(inte return interceptor(ctx, in, info, handler) } -func _Msg_Postkey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgPostkey) +func _Msg_PostKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgPostKey) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).Postkey(ctx, in) + return srv.(MsgServer).PostKey(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Msg/Postkey", + FullMethod: "/canine_chain.filetree.Msg/PostKey", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).Postkey(ctx, req.(*MsgPostkey)) + return srv.(MsgServer).PostKey(ctx, req.(*MsgPostKey)) } return interceptor(ctx, in, info, handler) } @@ -1796,8 +1798,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_AddViewers_Handler, }, { - MethodName: "Postkey", - Handler: _Msg_Postkey_Handler, + MethodName: "PostKey", + Handler: _Msg_PostKey_Handler, }, { MethodName: "DeleteFile", @@ -1969,10 +1971,10 @@ func (m *MsgAddViewers) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x2a } @@ -2030,7 +2032,7 @@ func (m *MsgAddViewersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgPostkey) Marshal() (dAtA []byte, err error) { +func (m *MsgPostKey) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2040,12 +2042,12 @@ func (m *MsgPostkey) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgPostkey) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgPostKey) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgPostkey) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgPostKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2067,7 +2069,7 @@ func (m *MsgPostkey) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgPostkeyResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgPostKeyResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2077,12 +2079,12 @@ func (m *MsgPostkeyResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgPostkeyResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgPostKeyResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgPostkeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgPostKeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2177,10 +2179,10 @@ func (m *MsgRemoveViewers) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x22 } @@ -2397,10 +2399,10 @@ func (m *MsgAddEditors) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x2a } @@ -2478,10 +2480,10 @@ func (m *MsgRemoveEditors) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x22 } @@ -2552,10 +2554,10 @@ func (m *MsgResetEditors) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x1a } @@ -2619,10 +2621,10 @@ func (m *MsgResetViewers) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Fileowner) > 0 { - i -= len(m.Fileowner) - copy(dAtA[i:], m.Fileowner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Fileowner))) + if len(m.FileOwner) > 0 { + i -= len(m.FileOwner) + copy(dAtA[i:], m.FileOwner) + i = encodeVarintTx(dAtA, i, uint64(len(m.FileOwner))) i-- dAtA[i] = 0x1a } @@ -2827,7 +2829,7 @@ func (m *MsgAddViewers) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -2843,7 +2845,7 @@ func (m *MsgAddViewersResponse) Size() (n int) { return n } -func (m *MsgPostkey) Size() (n int) { +func (m *MsgPostKey) Size() (n int) { if m == nil { return 0 } @@ -2860,7 +2862,7 @@ func (m *MsgPostkey) Size() (n int) { return n } -func (m *MsgPostkeyResponse) Size() (n int) { +func (m *MsgPostKeyResponse) Size() (n int) { if m == nil { return 0 } @@ -2917,7 +2919,7 @@ func (m *MsgRemoveViewers) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3026,7 +3028,7 @@ func (m *MsgAddEditors) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3060,7 +3062,7 @@ func (m *MsgRemoveEditors) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3090,7 +3092,7 @@ func (m *MsgResetEditors) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3120,7 +3122,7 @@ func (m *MsgResetViewers) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Fileowner) + l = len(m.FileOwner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3723,7 +3725,7 @@ func (m *MsgAddViewers) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3751,7 +3753,7 @@ func (m *MsgAddViewers) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -3824,7 +3826,7 @@ func (m *MsgAddViewersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgPostkey) Unmarshal(dAtA []byte) error { +func (m *MsgPostKey) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3847,10 +3849,10 @@ func (m *MsgPostkey) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgPostkey: wiretype end group for non-group") + return fmt.Errorf("proto: MsgPostKey: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgPostkey: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgPostKey: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3938,7 +3940,7 @@ func (m *MsgPostkey) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgPostkeyResponse) Unmarshal(dAtA []byte) error { +func (m *MsgPostKeyResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3961,10 +3963,10 @@ func (m *MsgPostkeyResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgPostkeyResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgPostKeyResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgPostkeyResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgPostKeyResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -4311,7 +4313,7 @@ func (m *MsgRemoveViewers) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4339,7 +4341,7 @@ func (m *MsgRemoveViewers) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5073,7 +5075,7 @@ func (m *MsgAddEditors) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5101,7 +5103,7 @@ func (m *MsgAddEditors) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5301,7 +5303,7 @@ func (m *MsgRemoveEditors) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5329,7 +5331,7 @@ func (m *MsgRemoveEditors) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5497,7 +5499,7 @@ func (m *MsgResetEditors) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5525,7 +5527,7 @@ func (m *MsgResetEditors) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5693,7 +5695,7 @@ func (m *MsgResetViewers) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fileowner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FileOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5721,7 +5723,7 @@ func (m *MsgResetViewers) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Fileowner = string(dAtA[iNdEx:postIndex]) + m.FileOwner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/oracle/simulation/delist.go b/x/oracle/simulation/delist.go index 83719cc2a..1aa6f49cf 100644 --- a/x/oracle/simulation/delist.go +++ b/x/oracle/simulation/delist.go @@ -18,7 +18,7 @@ func SimulateMsgDelist( return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { simAccount, _ := simtypes.RandomAcc(r, accs) - msg := &types.MsgDelist{ + msg := &types.MsgDeList{ Creator: simAccount.Address.String(), } diff --git a/x/rns/client/cli/query_forsale.go b/x/rns/client/cli/query_forsale.go index 55a632014..88c02395a 100644 --- a/x/rns/client/cli/query_forsale.go +++ b/x/rns/client/cli/query_forsale.go @@ -23,11 +23,11 @@ func CmdListForsale() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllForsalesRequest{ + params := &types.QueryAllForSalesRequest{ Pagination: pageReq, } - res, err := queryClient.ForsaleAll(context.Background(), params) + res, err := queryClient.ForSaleAll(context.Background(), params) if err != nil { return err } @@ -54,11 +54,11 @@ func CmdShowForsale() *cobra.Command { argName := args[0] - params := &types.QueryForsaleRequest{ + params := &types.QueryForSaleRequest{ Name: argName, } - res, err := queryClient.Forsale(context.Background(), params) + res, err := queryClient.ForSale(context.Background(), params) if err != nil { return err } diff --git a/x/rns/client/cli/tx_delist.go b/x/rns/client/cli/tx_delist.go index ae56157b9..80a47a53d 100644 --- a/x/rns/client/cli/tx_delist.go +++ b/x/rns/client/cli/tx_delist.go @@ -25,7 +25,7 @@ func CmdDelist() *cobra.Command { return err } - msg := types.NewMsgDelist( + msg := types.NewMsgDeList( clientCtx.GetFromAddress().String(), argName, ) diff --git a/x/rns/client/cli/tx_register.go b/x/rns/client/cli/tx_register.go index 375a3deea..ea8a16564 100644 --- a/x/rns/client/cli/tx_register.go +++ b/x/rns/client/cli/tx_register.go @@ -22,6 +22,10 @@ func CmdRegister() *cobra.Command { argYears := args[1] argData := args[2] + years, err := strconv.ParseInt(argYears, 10, 64) + if err != nil { + return err + } clientCtx, err := client.GetClientTxContext(cmd) if err != nil { return err @@ -30,7 +34,7 @@ func CmdRegister() *cobra.Command { msg := types.NewMsgRegister( clientCtx.GetFromAddress().String(), argName, - argYears, + years, argData, ) if err := msg.ValidateBasic(); err != nil { diff --git a/x/rns/handler.go b/x/rns/handler.go index e1c2164ff..dacd50dae 100644 --- a/x/rns/handler.go +++ b/x/rns/handler.go @@ -35,8 +35,8 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgBuy: res, err := msgServer.Buy(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgDelist: - res, err := msgServer.Delist(sdk.WrapSDKContext(ctx), msg) + case *types.MsgDeList: + res, err := msgServer.DeList(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) case *types.MsgTransfer: res, err := msgServer.Transfer(sdk.WrapSDKContext(ctx), msg) diff --git a/x/rns/keeper/bidding_test.go b/x/rns/keeper/bidding_test.go index 84beb0c9a..cbea23ea1 100644 --- a/x/rns/keeper/bidding_test.go +++ b/x/rns/keeper/bidding_test.go @@ -35,7 +35,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptBid() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, nameAddress, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameAddress.String(), TestName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameAddress.String(), TestName, "{}", 2) suite.Require().NoError(err) bidderBalBefore := suite.bankKeeper.GetAllBalances(suite.ctx, address) diff --git a/x/rns/keeper/grpc_query_forsale.go b/x/rns/keeper/grpc_query_forsale.go index 2c6bf2aeb..7b9c52f60 100644 --- a/x/rns/keeper/grpc_query_forsale.go +++ b/x/rns/keeper/grpc_query_forsale.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) ForsaleAll(c context.Context, req *types.QueryAllForsalesRequest) (*types.QueryAllForsalesResponse, error) { +func (k Keeper) ForSaleAll(c context.Context, req *types.QueryAllForSalesRequest) (*types.QueryAllForSalesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -35,10 +35,10 @@ func (k Keeper) ForsaleAll(c context.Context, req *types.QueryAllForsalesRequest return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryAllForsalesResponse{Forsale: forsales, Pagination: pageRes}, nil + return &types.QueryAllForSalesResponse{ForSale: forsales, Pagination: pageRes}, nil } -func (k Keeper) Forsale(c context.Context, req *types.QueryForsaleRequest) (*types.QueryForsaleResponse, error) { +func (k Keeper) ForSale(c context.Context, req *types.QueryForSaleRequest) (*types.QueryForSaleResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -52,5 +52,5 @@ func (k Keeper) Forsale(c context.Context, req *types.QueryForsaleRequest) (*typ return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryForsaleResponse{Forsale: val}, nil + return &types.QueryForSaleResponse{ForSale: val}, nil } diff --git a/x/rns/keeper/msg_server_basics_test.go b/x/rns/keeper/msg_server_basics_test.go index 7dda50500..368442f71 100644 --- a/x/rns/keeper/msg_server_basics_test.go +++ b/x/rns/keeper/msg_server_basics_test.go @@ -91,7 +91,7 @@ func (suite *KeeperTestSuite) TestMsgRegister() { return types.NewMsgRegister( user.String(), "BiPhan.jkl", - "2", + 2, "{}", ) }, @@ -103,7 +103,7 @@ func (suite *KeeperTestSuite) TestMsgRegister() { return types.NewMsgRegister( "invalid address", "BiPhan.jkl", - "2", + 2, "{}", ) }, @@ -116,7 +116,7 @@ func (suite *KeeperTestSuite) TestMsgRegister() { return types.NewMsgRegister( user.String(), "BiPhan.LUNC", - "2", + 2, "{}", ) }, @@ -124,19 +124,6 @@ func (suite *KeeperTestSuite) TestMsgRegister() { expErrMsg: "could not extract the tld from the name provided", name: "invalid name", }, - { - preRun: func() *types.MsgRegister { - return types.NewMsgRegister( - user.String(), - "BiPhan.jkl", - "s", - "{}", - ) - }, - expErr: true, - expErrMsg: "cannot parse years: invalid height", - name: "invalid years", - }, } for _, tc := range cases { @@ -183,7 +170,7 @@ func (suite *KeeperTestSuite) TestMsgTrasnfer() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, owner, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), successfulName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), successfulName, "{}", 2) suite.Require().NoError(err) cases := []struct { @@ -231,7 +218,7 @@ func (suite *KeeperTestSuite) TestMsgTrasnfer() { preRun: func() *types.MsgTransfer { freeName := "freeBi.jkl" blockHeight := suite.ctx.BlockHeight() - err := suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), freeName, "{}", "2") + err := suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), freeName, "{}", 2) suite.Require().NoError(err) name, _ := suite.rnsKeeper.GetNames(suite.ctx, "freeBi", "jkl") name.Locked = blockHeight + 1 @@ -289,7 +276,7 @@ func (suite *KeeperTestSuite) TestMsgUpdate() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, owner, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), successfulName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), successfulName, "{}", 2) suite.Require().NoError(err) const testdata = "{\"test\":\"test\"}" diff --git a/x/rns/keeper/msg_server_bidding_test.go b/x/rns/keeper/msg_server_bidding_test.go index 287af37cd..8f2f344da 100644 --- a/x/rns/keeper/msg_server_bidding_test.go +++ b/x/rns/keeper/msg_server_bidding_test.go @@ -30,7 +30,7 @@ func (suite *KeeperTestSuite) TestMsgAddBid() { suite.Require().NoError(err) suite.rnsKeeper.SetInit(suite.ctx, types.Init{Address: nameOwner.String(), Complete: true}) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), nuggieName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), nuggieName, "{}", 2) suite.Require().NoError(err) _, _ = msgSrvr.List(sdk.WrapSDKContext(suite.ctx), &types.MsgList{Creator: nameOwner.String(), Name: nuggieName, Price: "200ujkl"}) @@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptOneBid() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, bidder, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), TestName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), TestName, "{}", 2) suite.Require().NoError(err) err = suite.rnsKeeper.AddBid(suite.ctx, bidder.String(), TestName, "1000ujkl") @@ -150,7 +150,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptOneBid() { preRun: func() *types.MsgAcceptBid { freeName := "freeBi.jkl" blockHeight := suite.ctx.BlockHeight() - err := suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), freeName, "{}", "2") + err := suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), freeName, "{}", 2) suite.Require().NoError(err) name, _ := suite.rnsKeeper.GetNames(suite.ctx, "freeBi", "jkl") name.Locked = blockHeight + 1 @@ -210,7 +210,7 @@ func (suite *KeeperTestSuite) TestMsgCancelOneBid() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, bidder, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), TestName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), TestName, "{}", 2) suite.Require().NoError(err) err = suite.rnsKeeper.AddBid(suite.ctx, bidder.String(), TestName, "1000ujkl") diff --git a/x/rns/keeper/msg_server_buy_test.go b/x/rns/keeper/msg_server_buy_test.go index aea7aaa5f..36d5fe681 100644 --- a/x/rns/keeper/msg_server_buy_test.go +++ b/x/rns/keeper/msg_server_buy_test.go @@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestBuyMsg() { fullName := rnsName + "." + rnsTLD // "Nuggie.jkl" keeper.SetInit(suite.ctx, types.Init{Address: nameOwner.String(), Complete: true}) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), fullName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), fullName, "{}", 2) suite.Require().NoError(err) originalNames, found := keeper.GetNames(suite.ctx, rnsName, rnsTLD) suite.Require().True(found) diff --git a/x/rns/keeper/msg_server_delist.go b/x/rns/keeper/msg_server_delist.go index 19a00112f..c6e999be2 100644 --- a/x/rns/keeper/msg_server_delist.go +++ b/x/rns/keeper/msg_server_delist.go @@ -10,7 +10,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/rns/types" ) -func (k msgServer) Delist(goCtx context.Context, msg *types.MsgDelist) (*types.MsgDelistResponse, error) { +func (k msgServer) DeList(goCtx context.Context, msg *types.MsgDeList) (*types.MsgDeListResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) mname := strings.ToLower(msg.Name) @@ -41,5 +41,5 @@ func (k msgServer) Delist(goCtx context.Context, msg *types.MsgDelist) (*types.M k.RemoveForsale(ctx, mname) - return &types.MsgDelistResponse{}, nil + return &types.MsgDeListResponse{}, nil } diff --git a/x/rns/keeper/msg_server_delist_test.go b/x/rns/keeper/msg_server_delist_test.go index 78ff7e519..e06ffba18 100644 --- a/x/rns/keeper/msg_server_delist_test.go +++ b/x/rns/keeper/msg_server_delist_test.go @@ -27,7 +27,7 @@ func (suite *KeeperTestSuite) TestDelistMsg() { // Init rns account and register rns rnsName := "Nuggie.jkl" suite.rnsKeeper.SetInit(suite.ctx, types.Init{Address: nameOwner.String(), Complete: true}) - err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), rnsName, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, nameOwner.String(), rnsName, "{}", 2) suite.Require().NoError(err) keeper := suite.rnsKeeper @@ -36,14 +36,14 @@ func (suite *KeeperTestSuite) TestDelistMsg() { // Use postRun to return it to original state cases := []struct { testName string - preRun func() *types.MsgDelist + preRun func() *types.MsgDeList postRun func() expErr bool expErrMsg string }{ { testName: "Name_listed", - preRun: func() *types.MsgDelist { + preRun: func() *types.MsgDeList { // Check if name is actually saved name, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) @@ -54,7 +54,7 @@ func (suite *KeeperTestSuite) TestDelistMsg() { Owner: nameOwner.String(), } keeper.SetForsale(suite.ctx, newsale) - return &types.MsgDelist{ + return &types.MsgDeList{ Creator: nameOwner.String(), Name: fmt.Sprintf("%s,%s", name.Name, name.Tld), } @@ -73,8 +73,8 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "name_not_found", - preRun: func() *types.MsgDelist { - return &types.MsgDelist{ + preRun: func() *types.MsgDeList { + return &types.MsgDeList{ Creator: nameOwner.String(), Name: "nonexistent.jkl", } @@ -85,8 +85,8 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "wrong_onwer", - preRun: func() *types.MsgDelist { - return &types.MsgDelist{ + preRun: func() *types.MsgDeList { + return &types.MsgDeList{ Creator: "wrong_account", Name: "Nuggie.jkl", } @@ -97,13 +97,13 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "cannot_transfer_free_name", - preRun: func() *types.MsgDelist { + preRun: func() *types.MsgDeList { blockHeight := suite.ctx.BlockHeight() names, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) names.Locked = blockHeight + 1 keeper.SetNames(suite.ctx, names) - return &types.MsgDelist{ + return &types.MsgDeList{ Creator: nameOwner.String(), Name: "Nuggie.jkl", } @@ -121,13 +121,13 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "expired_name", - preRun: func() *types.MsgDelist { + preRun: func() *types.MsgDeList { blockHeight := suite.ctx.BlockHeight() names, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) names.Expires = blockHeight - 1 keeper.SetNames(suite.ctx, names) - return &types.MsgDelist{ + return &types.MsgDeList{ Creator: nameOwner.String(), Name: "Nuggie.jkl", } @@ -148,7 +148,7 @@ func (suite *KeeperTestSuite) TestDelistMsg() { suite.Run(tc.testName, func() { msg := tc.preRun() - _, err := msgSrvr.Delist(ctx, msg) + _, err := msgSrvr.DeList(ctx, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) diff --git a/x/rns/keeper/msg_server_record_test.go b/x/rns/keeper/msg_server_record_test.go index db0f4fafa..c080d8575 100644 --- a/x/rns/keeper/msg_server_record_test.go +++ b/x/rns/keeper/msg_server_record_test.go @@ -24,7 +24,7 @@ func (suite *KeeperTestSuite) TestMsgAddRecord() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, owner, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), "BiPhan.jkl", "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), "BiPhan.jkl", "{}", 2) suite.Require().NoError(err) cases := []struct { @@ -96,7 +96,7 @@ func (suite *KeeperTestSuite) TestMsgDelRecord() { err = suite.bankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, owner, coins) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), "BiPhan.jkl", "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, owner.String(), "BiPhan.jkl", "{}", 2) suite.Require().NoError(err) _, _ = msgSrvr.AddRecord(context, types.NewMsgAddRecord(owner.String(), "BiPhan.jkl", "app", owner.String(), "{}")) diff --git a/x/rns/keeper/msg_server_register.go b/x/rns/keeper/msg_server_register.go index ffaa942a5..a4aeb7c55 100644 --- a/x/rns/keeper/msg_server_register.go +++ b/x/rns/keeper/msg_server_register.go @@ -10,7 +10,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/rns/types" ) -func (k Keeper) RegisterName(ctx sdk.Context, sender string, nm string, data string, years string) error { +func (k Keeper) RegisterName(ctx sdk.Context, sender string, nm string, data string, years int64) error { nm = strings.ToLower(nm) name, tld, err := GetNameAndTLD(nm) if err != nil { @@ -24,21 +24,16 @@ func (k Keeper) RegisterName(ctx sdk.Context, sender string, nm string, data str whois, isFound := k.GetNames(ctx, name, tld) // Set the price at which the name has to be bought if it didn't have an owner before - numYears, ok := sdk.NewIntFromString(years) - if !ok { - return sdkerrors.Wrap(sdkerrors.ErrInvalidHeight, "cannot parse years") - } - cost, err := GetCostOfName(name, tld) if err != nil { return sdkerrors.Wrap(err, "failed to get cost") } - price := sdk.Coins{sdk.NewInt64Coin("ujkl", cost*numYears.Int64())} + price := sdk.Coins{sdk.NewInt64Coin("ujkl", cost*years)} blockHeight := ctx.BlockHeight() - time := numYears.Int64() * 5733818 + time := years * 5733818 owner, err := sdk.AccAddressFromBech32(sender) if err != nil { diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go index f95ae0d4f..f36fed57e 100644 --- a/x/rns/keeper/register_test.go +++ b/x/rns/keeper/register_test.go @@ -35,7 +35,7 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { beforebal := suite.bankKeeper.GetAllBalances(suite.ctx, address) amt := beforebal.AmountOf("ujkl") - err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", 2) suite.Require().NoError(err) nameReq := types.QueryNameRequest{ @@ -52,7 +52,7 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) - err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), capname, "{}", "2") // adding time to registration + err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), capname, "{}", 2) // adding time to registration suite.Require().NoError(err) afterbal = suite.bankKeeper.GetAllBalances(suite.ctx, address) diff --git a/x/rns/keeper/transfer_test.go b/x/rns/keeper/transfer_test.go index 337a2b801..0d96b42b7 100644 --- a/x/rns/keeper/transfer_test.go +++ b/x/rns/keeper/transfer_test.go @@ -30,7 +30,7 @@ func (suite *KeeperTestSuite) TestMsgTransfer() { beforebal := suite.bankKeeper.GetAllBalances(suite.ctx, address) amt := beforebal.AmountOf("ujkl") - err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", "2") + err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", 2) suite.Require().NoError(err) nameReq := types.QueryNameRequest{ diff --git a/x/rns/simulation/delist.go b/x/rns/simulation/delist.go index 858e0055e..18e426157 100644 --- a/x/rns/simulation/delist.go +++ b/x/rns/simulation/delist.go @@ -36,7 +36,7 @@ func SimulateMsgDelist( return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDelist, "name is expired"), nil, nil } - msg := &types.MsgDelist{ + msg := &types.MsgDeList{ Creator: forsale.Owner, Name: forsale.Name, } diff --git a/x/rns/simulation/register.go b/x/rns/simulation/register.go index 0c6f2b45a..5e3f589d3 100644 --- a/x/rns/simulation/register.go +++ b/x/rns/simulation/register.go @@ -1,7 +1,6 @@ package simulation import ( - "fmt" "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" @@ -79,7 +78,7 @@ func SimulateMsgRegister( } // filling the appropriate message fields msg.Data = "" - msg.Years = fmt.Sprint(numYears) + msg.Years = int64(numYears) msg.Name = name + "." + tld // generating the transaction diff --git a/x/rns/types/codec.go b/x/rns/types/codec.go index bc193d09f..2c9d423fa 100644 --- a/x/rns/types/codec.go +++ b/x/rns/types/codec.go @@ -15,7 +15,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCancelBid{}, "rns/CancelBid", nil) cdc.RegisterConcrete(&MsgList{}, "rns/List", nil) cdc.RegisterConcrete(&MsgBuy{}, "rns/Buy", nil) - cdc.RegisterConcrete(&MsgDelist{}, "rns/Delist", nil) + cdc.RegisterConcrete(&MsgDeList{}, "rns/DeList", nil) cdc.RegisterConcrete(&MsgTransfer{}, "rns/Transfer", nil) cdc.RegisterConcrete(&MsgAddRecord{}, "rns/AddRecord", nil) cdc.RegisterConcrete(&MsgDelRecord{}, "rns/DelRecord", nil) @@ -43,7 +43,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgBuy{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgDelist{}, + &MsgDeList{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgTransfer{}, diff --git a/x/rns/types/message_delist.go b/x/rns/types/message_delist.go index 3ed926964..704fedb16 100644 --- a/x/rns/types/message_delist.go +++ b/x/rns/types/message_delist.go @@ -7,24 +7,24 @@ import ( const TypeMsgDelist = "delist" -var _ sdk.Msg = &MsgDelist{} +var _ sdk.Msg = &MsgDeList{} -func NewMsgDelist(creator string, name string) *MsgDelist { - return &MsgDelist{ +func NewMsgDeList(creator string, name string) *MsgDeList { + return &MsgDeList{ Creator: creator, Name: name, } } -func (msg *MsgDelist) Route() string { +func (msg *MsgDeList) Route() string { return RouterKey } -func (msg *MsgDelist) Type() string { +func (msg *MsgDeList) Type() string { return TypeMsgDelist } -func (msg *MsgDelist) GetSigners() []sdk.AccAddress { +func (msg *MsgDeList) GetSigners() []sdk.AccAddress { creator, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { panic(err) @@ -32,12 +32,12 @@ func (msg *MsgDelist) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{creator} } -func (msg *MsgDelist) GetSignBytes() []byte { +func (msg *MsgDeList) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(msg) return sdk.MustSortJSON(bz) } -func (msg *MsgDelist) ValidateBasic() error { +func (msg *MsgDeList) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) diff --git a/x/rns/types/message_delist_test.go b/x/rns/types/message_delist_test.go index 8c21b3b5c..ea3c3e5b6 100644 --- a/x/rns/types/message_delist_test.go +++ b/x/rns/types/message_delist_test.go @@ -13,26 +13,26 @@ import ( func TestMsgDelist_ValidateBasic(t *testing.T) { tests := []struct { name string - msg MsgDelist + msg MsgDeList err error }{ { name: "invalid address", - msg: MsgDelist{ + msg: MsgDeList{ Creator: "invalid_address", Name: "validname.jkl", }, err: sdkerrors.ErrInvalidAddress, }, { name: "invalid name", - msg: MsgDelist{ + msg: MsgDeList{ Creator: "cosmos1k3qu47ycrut4sr73vv6uqtuhyyfewymu34gju2", Name: "invalidname", }, err: sdkerrors.ErrInvalidRequest, }, { name: "valid address", - msg: MsgDelist{ + msg: MsgDeList{ Creator: "cosmos1k3qu47ycrut4sr73vv6uqtuhyyfewymu34gju2", Name: "validname.jkl", }, diff --git a/x/rns/types/message_register.go b/x/rns/types/message_register.go index 031f5f3c0..187ab65ea 100644 --- a/x/rns/types/message_register.go +++ b/x/rns/types/message_register.go @@ -9,7 +9,7 @@ const TypeMsgRegister = "register" var _ sdk.Msg = &MsgRegister{} -func NewMsgRegister(creator string, name string, years string, data string) *MsgRegister { +func NewMsgRegister(creator string, name string, years int64, data string) *MsgRegister { return &MsgRegister{ Creator: creator, Name: name, @@ -51,9 +51,6 @@ func (msg *MsgRegister) ValidateBasic() error { if !IsValidName(name) { return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid name") } - _, ok := sdk.NewIntFromString(msg.Years) - if !ok { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "invalid years") - } + return nil } diff --git a/x/rns/types/message_register_test.go b/x/rns/types/message_register_test.go index 5af57fab6..e540a9377 100644 --- a/x/rns/types/message_register_test.go +++ b/x/rns/types/message_register_test.go @@ -21,7 +21,7 @@ func TestMsgRegister_ValidateBasic(t *testing.T) { msg: MsgRegister{ Creator: "invalid_address", Name: "validname.jkl", - Years: "10", + Years: 10, Data: "{}", }, err: sdkerrors.ErrInvalidAddress, @@ -30,25 +30,16 @@ func TestMsgRegister_ValidateBasic(t *testing.T) { msg: MsgRegister{ Creator: "cosmos1ytwr7x4av05ek0tf8z9s4zmvr6w569zsm27dpg", Name: "invalidname", - Years: "10", + Years: 10, Data: "{}", }, err: sdkerrors.ErrInvalidRequest, - }, { - name: "invalid years", - msg: MsgRegister{ - Creator: "cosmos1ytwr7x4av05ek0tf8z9s4zmvr6w569zsm27dpg", - Name: "validname.jkl", - Years: "s", - Data: "{}", - }, - err: sdkerrors.ErrInvalidType, }, { name: "valid address", msg: MsgRegister{ Creator: "cosmos1ytwr7x4av05ek0tf8z9s4zmvr6w569zsm27dpg", Name: "validname.jkl", - Years: "10", + Years: 10, Data: "{}", }, }, diff --git a/x/rns/types/query.pb.go b/x/rns/types/query.pb.go index 0623fa189..f4c14c69f 100644 --- a/x/rns/types/query.pb.go +++ b/x/rns/types/query.pb.go @@ -665,22 +665,22 @@ func (m *QueryAllBidsResponse) GetPagination() *query.PageResponse { return nil } -type QueryForsaleRequest struct { +type QueryForSaleRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } -func (m *QueryForsaleRequest) Reset() { *m = QueryForsaleRequest{} } -func (m *QueryForsaleRequest) String() string { return proto.CompactTextString(m) } -func (*QueryForsaleRequest) ProtoMessage() {} -func (*QueryForsaleRequest) Descriptor() ([]byte, []int) { +func (m *QueryForSaleRequest) Reset() { *m = QueryForSaleRequest{} } +func (m *QueryForSaleRequest) String() string { return proto.CompactTextString(m) } +func (*QueryForSaleRequest) ProtoMessage() {} +func (*QueryForSaleRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{14} } -func (m *QueryForsaleRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryForSaleRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryForsaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryForsaleRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryForSaleRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -690,41 +690,41 @@ func (m *QueryForsaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryForsaleRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryForsaleRequest.Merge(m, src) +func (m *QueryForSaleRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryForSaleRequest.Merge(m, src) } -func (m *QueryForsaleRequest) XXX_Size() int { +func (m *QueryForSaleRequest) XXX_Size() int { return m.Size() } -func (m *QueryForsaleRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryForsaleRequest.DiscardUnknown(m) +func (m *QueryForSaleRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryForSaleRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryForsaleRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryForSaleRequest proto.InternalMessageInfo -func (m *QueryForsaleRequest) GetName() string { +func (m *QueryForSaleRequest) GetName() string { if m != nil { return m.Name } return "" } -type QueryForsaleResponse struct { - Forsale Forsale `protobuf:"bytes,1,opt,name=forsale,proto3" json:"forsale"` +type QueryForSaleResponse struct { + ForSale Forsale `protobuf:"bytes,1,opt,name=for_sale,json=forSale,proto3" json:"for_sale"` } -func (m *QueryForsaleResponse) Reset() { *m = QueryForsaleResponse{} } -func (m *QueryForsaleResponse) String() string { return proto.CompactTextString(m) } -func (*QueryForsaleResponse) ProtoMessage() {} -func (*QueryForsaleResponse) Descriptor() ([]byte, []int) { +func (m *QueryForSaleResponse) Reset() { *m = QueryForSaleResponse{} } +func (m *QueryForSaleResponse) String() string { return proto.CompactTextString(m) } +func (*QueryForSaleResponse) ProtoMessage() {} +func (*QueryForSaleResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{15} } -func (m *QueryForsaleResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryForSaleResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryForsaleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryForSaleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryForsaleResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryForSaleResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -734,41 +734,41 @@ func (m *QueryForsaleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryForsaleResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryForsaleResponse.Merge(m, src) +func (m *QueryForSaleResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryForSaleResponse.Merge(m, src) } -func (m *QueryForsaleResponse) XXX_Size() int { +func (m *QueryForSaleResponse) XXX_Size() int { return m.Size() } -func (m *QueryForsaleResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryForsaleResponse.DiscardUnknown(m) +func (m *QueryForSaleResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryForSaleResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryForsaleResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryForSaleResponse proto.InternalMessageInfo -func (m *QueryForsaleResponse) GetForsale() Forsale { +func (m *QueryForSaleResponse) GetForSale() Forsale { if m != nil { - return m.Forsale + return m.ForSale } return Forsale{} } -type QueryAllForsalesRequest struct { +type QueryAllForSalesRequest struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllForsalesRequest) Reset() { *m = QueryAllForsalesRequest{} } -func (m *QueryAllForsalesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllForsalesRequest) ProtoMessage() {} -func (*QueryAllForsalesRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllForSalesRequest) Reset() { *m = QueryAllForSalesRequest{} } +func (m *QueryAllForSalesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllForSalesRequest) ProtoMessage() {} +func (*QueryAllForSalesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{16} } -func (m *QueryAllForsalesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllForSalesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllForsalesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllForSalesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllForsalesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllForSalesRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -778,42 +778,42 @@ func (m *QueryAllForsalesRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryAllForsalesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllForsalesRequest.Merge(m, src) +func (m *QueryAllForSalesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllForSalesRequest.Merge(m, src) } -func (m *QueryAllForsalesRequest) XXX_Size() int { +func (m *QueryAllForSalesRequest) XXX_Size() int { return m.Size() } -func (m *QueryAllForsalesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllForsalesRequest.DiscardUnknown(m) +func (m *QueryAllForSalesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllForSalesRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllForsalesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllForSalesRequest proto.InternalMessageInfo -func (m *QueryAllForsalesRequest) GetPagination() *query.PageRequest { +func (m *QueryAllForSalesRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -type QueryAllForsalesResponse struct { - Forsale []Forsale `protobuf:"bytes,1,rep,name=forsale,proto3" json:"forsale"` +type QueryAllForSalesResponse struct { + ForSale []Forsale `protobuf:"bytes,1,rep,name=for_sale,json=forSale,proto3" json:"for_sale"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllForsalesResponse) Reset() { *m = QueryAllForsalesResponse{} } -func (m *QueryAllForsalesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllForsalesResponse) ProtoMessage() {} -func (*QueryAllForsalesResponse) Descriptor() ([]byte, []int) { +func (m *QueryAllForSalesResponse) Reset() { *m = QueryAllForSalesResponse{} } +func (m *QueryAllForSalesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllForSalesResponse) ProtoMessage() {} +func (*QueryAllForSalesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{17} } -func (m *QueryAllForsalesResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryAllForSalesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllForsalesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllForSalesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllForsalesResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllForSalesResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -823,26 +823,26 @@ func (m *QueryAllForsalesResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryAllForsalesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllForsalesResponse.Merge(m, src) +func (m *QueryAllForSalesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllForSalesResponse.Merge(m, src) } -func (m *QueryAllForsalesResponse) XXX_Size() int { +func (m *QueryAllForSalesResponse) XXX_Size() int { return m.Size() } -func (m *QueryAllForsalesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllForsalesResponse.DiscardUnknown(m) +func (m *QueryAllForSalesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllForSalesResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllForsalesResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryAllForSalesResponse proto.InternalMessageInfo -func (m *QueryAllForsalesResponse) GetForsale() []Forsale { +func (m *QueryAllForSalesResponse) GetForSale() []Forsale { if m != nil { - return m.Forsale + return m.ForSale } return nil } -func (m *QueryAllForsalesResponse) GetPagination() *query.PageResponse { +func (m *QueryAllForSalesResponse) GetPagination() *query.PageResponse { if m != nil { return m.Pagination } @@ -1152,10 +1152,10 @@ func init() { proto.RegisterType((*QueryBidResponse)(nil), "canine_chain.rns.QueryBidResponse") proto.RegisterType((*QueryAllBidsRequest)(nil), "canine_chain.rns.QueryAllBidsRequest") proto.RegisterType((*QueryAllBidsResponse)(nil), "canine_chain.rns.QueryAllBidsResponse") - proto.RegisterType((*QueryForsaleRequest)(nil), "canine_chain.rns.QueryForsaleRequest") - proto.RegisterType((*QueryForsaleResponse)(nil), "canine_chain.rns.QueryForsaleResponse") - proto.RegisterType((*QueryAllForsalesRequest)(nil), "canine_chain.rns.QueryAllForsalesRequest") - proto.RegisterType((*QueryAllForsalesResponse)(nil), "canine_chain.rns.QueryAllForsalesResponse") + proto.RegisterType((*QueryForSaleRequest)(nil), "canine_chain.rns.QueryForSaleRequest") + proto.RegisterType((*QueryForSaleResponse)(nil), "canine_chain.rns.QueryForSaleResponse") + proto.RegisterType((*QueryAllForSalesRequest)(nil), "canine_chain.rns.QueryAllForSalesRequest") + proto.RegisterType((*QueryAllForSalesResponse)(nil), "canine_chain.rns.QueryAllForSalesResponse") proto.RegisterType((*QueryInitRequest)(nil), "canine_chain.rns.QueryInitRequest") proto.RegisterType((*QueryInitResponse)(nil), "canine_chain.rns.QueryInitResponse") proto.RegisterType((*QueryAllInitsRequest)(nil), "canine_chain.rns.QueryAllInitsRequest") @@ -1167,70 +1167,71 @@ func init() { func init() { proto.RegisterFile("canine_chain/rns/query.proto", fileDescriptor_8561b6b36d651aba) } var fileDescriptor_8561b6b36d651aba = []byte{ - // 1011 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0xdf, 0x6f, 0x1b, 0x45, - 0x10, 0xc7, 0xb3, 0x89, 0x13, 0x97, 0xa9, 0x04, 0x65, 0x09, 0x34, 0x5c, 0x8b, 0xa1, 0x97, 0x5f, - 0x75, 0x7e, 0xdc, 0x91, 0x44, 0x02, 0xf5, 0x09, 0xc5, 0x42, 0xa5, 0x95, 0x0a, 0xb4, 0x7e, 0x41, - 0x42, 0x82, 0x68, 0x6d, 0x1f, 0xce, 0xc1, 0xf9, 0xd6, 0xf5, 0x5e, 0x68, 0xab, 0x28, 0x08, 0x15, - 0x10, 0x12, 0x12, 0x12, 0x05, 0xf1, 0x84, 0xc4, 0x9f, 0xc0, 0xdf, 0xd1, 0xc7, 0x4a, 0xbc, 0xf0, - 0x84, 0x50, 0xc2, 0x1f, 0x82, 0x76, 0x76, 0x2e, 0xbe, 0xf3, 0xe5, 0xce, 0x07, 0x32, 0x52, 0xdf, - 0xec, 0xec, 0x77, 0x67, 0x3e, 0xf3, 0xdd, 0xdd, 0x19, 0x07, 0x2e, 0xb7, 0x45, 0xe8, 0x87, 0xde, - 0x5e, 0x7b, 0x5f, 0xf8, 0xa1, 0x3b, 0x08, 0x95, 0x7b, 0xf7, 0xc0, 0x1b, 0x3c, 0x70, 0xfa, 0x03, - 0x19, 0x49, 0x7e, 0x21, 0xb9, 0xea, 0x0c, 0x42, 0x65, 0xcd, 0x77, 0x65, 0x57, 0xe2, 0xa2, 0xab, - 0x3f, 0x19, 0x9d, 0x75, 0xb9, 0x2b, 0x65, 0x37, 0xf0, 0x5c, 0xd1, 0xf7, 0x5d, 0x11, 0x86, 0x32, - 0x12, 0x91, 0x2f, 0x43, 0x45, 0xab, 0x6b, 0x6d, 0xa9, 0x7a, 0x52, 0xb9, 0x2d, 0xa1, 0x3c, 0x13, - 0xde, 0xfd, 0x7c, 0xab, 0xe5, 0x45, 0x62, 0xcb, 0xed, 0x8b, 0xae, 0x1f, 0xa2, 0x98, 0xb4, 0xaf, - 0x64, 0x78, 0xfa, 0x62, 0x20, 0x7a, 0x71, 0xa8, 0x2c, 0xee, 0xbd, 0x7d, 0xe9, 0xe7, 0xaf, 0x86, - 0xa2, 0xe7, 0xc5, 0xab, 0x97, 0x32, 0xab, 0x2d, 0xbf, 0x13, 0x2f, 0xd6, 0x32, 0x8b, 0x9f, 0xc8, - 0x81, 0x12, 0x81, 0x97, 0xbb, 0xd9, 0x0f, 0xfd, 0xc8, 0x2c, 0xda, 0xf3, 0xc0, 0xef, 0xe8, 0xb2, - 0x6e, 0x23, 0x6a, 0xd3, 0xbb, 0x7b, 0xe0, 0xa9, 0xc8, 0x7e, 0x17, 0x5e, 0x48, 0xfd, 0x55, 0xf5, - 0x65, 0xa8, 0x3c, 0xfe, 0x06, 0xcc, 0x99, 0x92, 0x16, 0xd8, 0x6b, 0xec, 0xea, 0xf9, 0xed, 0x05, - 0x67, 0xd4, 0x64, 0xc7, 0xec, 0x68, 0x54, 0x1e, 0xff, 0xf9, 0xea, 0x54, 0x93, 0xd4, 0x76, 0x1d, - 0x9e, 0xc7, 0x70, 0x1f, 0xe8, 0x82, 0x29, 0x07, 0x9f, 0x87, 0x59, 0x3f, 0xec, 0x78, 0xf7, 0x31, - 0xd6, 0x33, 0x4d, 0xf3, 0xc5, 0xbe, 0x49, 0x3c, 0x24, 0xa5, 0xc4, 0x3b, 0x30, 0x8b, 0x66, 0x51, - 0xde, 0x8b, 0xd9, 0xbc, 0xa8, 0xa7, 0xb4, 0x46, 0x6b, 0x7f, 0x0c, 0xf3, 0x18, 0x6a, 0x37, 0x08, - 0x52, 0x89, 0xaf, 0x03, 0x0c, 0xcf, 0x8e, 0x22, 0xae, 0x38, 0xe6, 0xa0, 0x1d, 0x7d, 0xd0, 0x8e, - 0xb9, 0x47, 0x74, 0xd0, 0xce, 0x6d, 0xd1, 0xf5, 0x68, 0x6f, 0x33, 0xb1, 0xd3, 0xfe, 0x99, 0xc1, - 0x8b, 0x23, 0x09, 0xb2, 0xb8, 0x33, 0x65, 0x71, 0xf9, 0x3b, 0x29, 0xac, 0x69, 0xc4, 0x5a, 0x1d, - 0x8b, 0x65, 0x32, 0xa6, 0xb8, 0xae, 0xc2, 0x05, 0xc4, 0x7a, 0x4f, 0xf4, 0xbc, 0x62, 0xb3, 0x6f, - 0xd0, 0xb9, 0x18, 0xe5, 0x10, 0x1e, 0xaf, 0x5e, 0xbe, 0xd7, 0x5a, 0x7e, 0x0a, 0x8f, 0xda, 0xa4, - 0xd7, 0xb8, 0xfa, 0x7f, 0x7a, 0x4d, 0x09, 0xb2, 0xb8, 0x33, 0x65, 0x71, 0x27, 0xe7, 0xf5, 0x2a, - 0x3c, 0x87, 0x58, 0x0d, 0xbf, 0x53, 0x6c, 0xf5, 0xdb, 0x74, 0x28, 0x28, 0x24, 0xf4, 0xd7, 0xa1, - 0xa2, 0x9f, 0x31, 0xd9, 0xf2, 0x52, 0x96, 0xbc, 0xe1, 0x77, 0x62, 0x70, 0x54, 0xda, 0x1f, 0xd1, - 0xbb, 0xdc, 0x0d, 0x02, 0xbd, 0x36, 0x69, 0x97, 0x1f, 0xb1, 0xe1, 0x31, 0x9a, 0xf8, 0x19, 0xd2, - 0x99, 0x72, 0xa4, 0x93, 0x73, 0xb8, 0x4e, 0x25, 0x5f, 0x37, 0x3d, 0x2d, 0x2e, 0x99, 0x43, 0x45, - 0x1f, 0x25, 0x99, 0x8c, 0x9f, 0xed, 0x3b, 0x44, 0x7f, 0x2a, 0x25, 0xfa, 0x6b, 0x50, 0xa5, 0x8e, - 0x48, 0xde, 0xbc, 0x9c, 0x2d, 0x80, 0xf6, 0x50, 0x0d, 0xb1, 0xde, 0x16, 0x70, 0x31, 0x36, 0x84, - 0x14, 0x13, 0x37, 0xfd, 0x57, 0x06, 0x0b, 0xd9, 0x1c, 0x67, 0xa1, 0xcf, 0xfc, 0x1b, 0xf4, 0xc9, - 0x9d, 0xc0, 0x06, 0x5d, 0xdd, 0x9b, 0xa1, 0x1f, 0xc5, 0xc5, 0x2f, 0x40, 0x55, 0x74, 0x3a, 0x03, - 0x4f, 0x29, 0x3a, 0x81, 0xf8, 0xab, 0xbd, 0x4a, 0x3d, 0xc5, 0xa8, 0xa9, 0x0c, 0x0e, 0x15, 0x3d, - 0x73, 0x50, 0x7b, 0xae, 0x89, 0x9f, 0x93, 0x2d, 0x43, 0x6b, 0x27, 0xee, 0xeb, 0x8f, 0x89, 0x96, - 0x41, 0x09, 0x86, 0xb7, 0x99, 0x68, 0x72, 0x6e, 0xb3, 0x96, 0xc7, 0xb7, 0x59, 0x2b, 0x27, 0xe7, - 0xe5, 0x17, 0x60, 0x21, 0xd3, 0x2d, 0x5f, 0x45, 0xef, 0xdf, 0x0b, 0xbd, 0x4e, 0xaa, 0x5b, 0xe6, - 0xba, 0x3a, 0x62, 0xca, 0xf4, 0x7f, 0x36, 0xe5, 0x17, 0x06, 0x97, 0xce, 0x04, 0x78, 0x1a, 0xba, - 0xe9, 0xf6, 0x77, 0xe7, 0x61, 0x16, 0xe9, 0xf8, 0x43, 0x06, 0x73, 0xe6, 0xa7, 0x04, 0x5f, 0xca, - 0x32, 0x64, 0x7f, 0xb1, 0x58, 0xcb, 0x63, 0x54, 0x26, 0x9b, 0xbd, 0xfe, 0xf0, 0xf7, 0xbf, 0x7f, - 0x9a, 0x5e, 0xe6, 0x8b, 0xee, 0xa7, 0xa2, 0xfd, 0x99, 0x08, 0x36, 0x3b, 0x42, 0xba, 0x66, 0xe7, - 0xe6, 0xe8, 0xef, 0x36, 0xfe, 0x35, 0x83, 0x59, 0x2c, 0x97, 0xdb, 0x39, 0xd1, 0x13, 0x23, 0xd6, - 0x5a, 0x2c, 0xd4, 0x50, 0xfe, 0x6d, 0xcc, 0xbf, 0xc1, 0xd7, 0x0a, 0xf3, 0xa3, 0xad, 0xee, 0x21, - 0x4e, 0x8e, 0x23, 0xfe, 0x2d, 0x83, 0x73, 0x88, 0xb1, 0x1b, 0x04, 0x7c, 0x25, 0x27, 0xcb, 0xc8, - 0xe0, 0xb5, 0x56, 0xc7, 0xea, 0x88, 0x68, 0x0d, 0x89, 0x96, 0xb8, 0x3d, 0x9e, 0x88, 0x7f, 0xc9, - 0xa0, 0xa2, 0x3b, 0x3d, 0xbf, 0x92, 0x13, 0x7d, 0x38, 0x06, 0x2d, 0xbb, 0x48, 0x42, 0xb9, 0xb7, - 0x30, 0xf7, 0x3a, 0xaf, 0x17, 0xe6, 0xd6, 0xf3, 0xe4, 0xd4, 0x8c, 0xaf, 0x18, 0x54, 0x35, 0x82, - 0xf6, 0x62, 0x39, 0xbf, 0xc6, 0xc4, 0x74, 0xb4, 0x56, 0xc6, 0xc9, 0x88, 0xa6, 0x8e, 0x34, 0x8b, - 0xfc, 0xca, 0x58, 0x1a, 0xfe, 0x3d, 0x83, 0x2a, 0xb5, 0xdd, 0x5c, 0x8a, 0xf4, 0xc0, 0xca, 0xa5, - 0x18, 0x19, 0x56, 0xf6, 0x0e, 0x52, 0x6c, 0xf2, 0xf5, 0x42, 0x0a, 0x6a, 0xf2, 0xee, 0xa1, 0x3e, - 0x98, 0x23, 0xfe, 0x88, 0x01, 0x50, 0x20, 0x6d, 0x4c, 0x3d, 0xbf, 0xe2, 0x91, 0x29, 0x66, 0xad, - 0x95, 0x91, 0x12, 0xda, 0x06, 0xa2, 0xad, 0xf0, 0xa5, 0x32, 0x68, 0xfa, 0xf5, 0x54, 0x74, 0x23, - 0xcd, 0x7d, 0x3c, 0x89, 0x79, 0x92, 0xfb, 0x78, 0x92, 0x53, 0xa4, 0xa4, 0x35, 0xba, 0x61, 0xbb, - 0x87, 0xd4, 0x38, 0x8f, 0xf8, 0x37, 0x0c, 0xaa, 0x3a, 0xca, 0x98, 0xc7, 0x93, 0x1c, 0x41, 0x45, - 0x8f, 0x27, 0x35, 0x49, 0x4a, 0x5e, 0x19, 0x1c, 0x21, 0xbf, 0x31, 0x78, 0x36, 0xdd, 0x74, 0xf9, - 0x46, 0x4e, 0x9a, 0x33, 0x87, 0x83, 0xb5, 0x59, 0x52, 0x4d, 0x68, 0x6f, 0x21, 0xda, 0x35, 0xfe, - 0x66, 0x21, 0x5a, 0xe0, 0xab, 0x68, 0x4f, 0xea, 0xdd, 0x7b, 0xd4, 0x74, 0x62, 0xe3, 0x1a, 0x37, - 0x1e, 0x1f, 0xd7, 0xd8, 0x93, 0xe3, 0x1a, 0xfb, 0xeb, 0xb8, 0xc6, 0x7e, 0x38, 0xa9, 0x4d, 0x3d, - 0x39, 0xa9, 0x4d, 0xfd, 0x71, 0x52, 0x9b, 0xfa, 0xd0, 0xe9, 0xfa, 0xd1, 0xfe, 0x41, 0xcb, 0x69, - 0xcb, 0x1e, 0x05, 0xbf, 0x25, 0x5a, 0x2a, 0x1d, 0xfc, 0x3e, 0x86, 0x8f, 0x1e, 0xf4, 0x3d, 0xd5, - 0x9a, 0xc3, 0x7f, 0x35, 0x77, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf9, 0x48, 0x2c, 0xb1, + // 1027 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xc7, 0x33, 0x89, 0x13, 0x87, 0x57, 0x09, 0xca, 0x10, 0x68, 0xd8, 0x16, 0x43, 0x37, 0x4d, + 0x5c, 0x27, 0xf1, 0x2e, 0x49, 0x10, 0x08, 0x2e, 0x28, 0x11, 0x0a, 0xad, 0x54, 0xa0, 0x98, 0x03, + 0x12, 0x12, 0x44, 0x63, 0x7b, 0xe3, 0x2c, 0xac, 0x77, 0xdc, 0xdd, 0x0d, 0x6d, 0x15, 0x05, 0xa1, + 0x02, 0xe2, 0x82, 0x10, 0x14, 0x71, 0xe2, 0xc0, 0x37, 0xe0, 0x73, 0xf4, 0x18, 0x89, 0x0b, 0x27, + 0x84, 0x12, 0x3e, 0x08, 0x9a, 0x37, 0x6f, 0xed, 0x5d, 0x6f, 0x76, 0x6d, 0x90, 0x91, 0x7a, 0xb3, + 0x33, 0xff, 0x79, 0xef, 0x37, 0xff, 0x37, 0xf3, 0x9e, 0x03, 0x57, 0x5a, 0xc2, 0x77, 0x7d, 0x67, + 0xaf, 0x75, 0x20, 0x5c, 0xdf, 0x0e, 0xfc, 0xd0, 0xbe, 0x73, 0xe8, 0x04, 0xf7, 0xad, 0x5e, 0x20, + 0x23, 0xc9, 0x2f, 0x26, 0x57, 0xad, 0xc0, 0x0f, 0x8d, 0x85, 0x8e, 0xec, 0x48, 0x5c, 0xb4, 0xd5, + 0x27, 0xad, 0x33, 0xae, 0x74, 0xa4, 0xec, 0x78, 0x8e, 0x2d, 0x7a, 0xae, 0x2d, 0x7c, 0x5f, 0x46, + 0x22, 0x72, 0xa5, 0x1f, 0xd2, 0xea, 0x6a, 0x4b, 0x86, 0x5d, 0x19, 0xda, 0x4d, 0x11, 0x3a, 0x3a, + 0xbc, 0xfd, 0xf9, 0x46, 0xd3, 0x89, 0xc4, 0x86, 0xdd, 0x13, 0x1d, 0xd7, 0x47, 0x31, 0x69, 0x5f, + 0xc8, 0xf0, 0xf4, 0x44, 0x20, 0xba, 0x71, 0xa8, 0x2c, 0xee, 0xdd, 0x03, 0xe9, 0xe6, 0xaf, 0xfa, + 0xa2, 0xeb, 0xc4, 0xab, 0x97, 0x33, 0xab, 0x4d, 0xb7, 0x1d, 0x2f, 0x56, 0x32, 0x8b, 0xfb, 0x32, + 0x08, 0x85, 0xe7, 0xe4, 0x6e, 0x76, 0x7d, 0x37, 0xd2, 0x8b, 0xe6, 0x02, 0xf0, 0xf7, 0xd5, 0xb1, + 0x6e, 0x23, 0x6a, 0xc3, 0xb9, 0x73, 0xe8, 0x84, 0x91, 0xf9, 0x0e, 0x3c, 0x93, 0xfa, 0x6b, 0xd8, + 0x93, 0x7e, 0xe8, 0xf0, 0x57, 0x61, 0x4e, 0x1f, 0x69, 0x91, 0xbd, 0xc4, 0xae, 0x5f, 0xd8, 0x5c, + 0xb4, 0x86, 0x4d, 0xb6, 0xf4, 0x8e, 0x9d, 0xd2, 0xa3, 0x3f, 0x5f, 0x9c, 0x6a, 0x90, 0xda, 0xac, + 0xc1, 0xd3, 0x18, 0xee, 0x43, 0x75, 0x60, 0xca, 0xc1, 0x17, 0x60, 0xd6, 0xf5, 0xdb, 0xce, 0x3d, + 0x8c, 0xf5, 0x44, 0x43, 0x7f, 0x31, 0x6f, 0x12, 0x0f, 0x49, 0x29, 0xf1, 0x16, 0xcc, 0xa2, 0x59, + 0x94, 0xf7, 0x52, 0x36, 0x2f, 0xea, 0x29, 0xad, 0xd6, 0x9a, 0x9f, 0xc0, 0x02, 0x86, 0xda, 0xf6, + 0xbc, 0x54, 0xe2, 0x5d, 0x80, 0x41, 0xed, 0x28, 0xe2, 0x8a, 0xa5, 0x0b, 0x6d, 0xa9, 0x42, 0x5b, + 0xfa, 0x1e, 0x51, 0xa1, 0xad, 0xdb, 0xa2, 0xe3, 0xd0, 0xde, 0x46, 0x62, 0xa7, 0xf9, 0x33, 0x83, + 0x67, 0x87, 0x12, 0x64, 0x71, 0x67, 0xc6, 0xc5, 0xe5, 0x6f, 0xa7, 0xb0, 0xa6, 0x11, 0xab, 0x3a, + 0x12, 0x4b, 0x67, 0x4c, 0x71, 0x5d, 0x87, 0x8b, 0x88, 0xf5, 0xae, 0xe8, 0x3a, 0xc5, 0x66, 0xdf, + 0xa0, 0xba, 0x68, 0xe5, 0x00, 0x1e, 0xaf, 0x5e, 0xbe, 0xd7, 0x4a, 0xde, 0x87, 0x47, 0x6d, 0xd2, + 0x6b, 0x5c, 0xfd, 0x3f, 0xbd, 0xa6, 0x04, 0x59, 0xdc, 0x99, 0x71, 0x71, 0x27, 0xe7, 0x75, 0x15, + 0x9e, 0x42, 0xac, 0x1d, 0xb7, 0x5d, 0x6c, 0xf5, 0x5b, 0x54, 0x14, 0x14, 0x12, 0xfa, 0xcb, 0x50, + 0x52, 0xcf, 0x98, 0x6c, 0x79, 0x2e, 0x4b, 0xbe, 0xe3, 0xb6, 0x63, 0x70, 0x54, 0x9a, 0x1f, 0xd3, + 0xbb, 0xdc, 0xf6, 0x3c, 0xb5, 0x36, 0x69, 0x97, 0x7f, 0x64, 0x83, 0x32, 0xea, 0xf8, 0x19, 0xd2, + 0x99, 0xf1, 0x48, 0x27, 0xe7, 0x70, 0x8d, 0x8e, 0xbc, 0x2b, 0x83, 0x0f, 0x84, 0xd7, 0xbf, 0xd0, + 0x1c, 0x4a, 0xaa, 0x94, 0x64, 0x32, 0x7e, 0x36, 0x1b, 0x44, 0xdf, 0x97, 0x12, 0xfd, 0x1b, 0x30, + 0xbf, 0x2f, 0x83, 0x3d, 0xd5, 0x12, 0xc9, 0x9c, 0xe7, 0xb3, 0x27, 0xd8, 0xd5, 0x3d, 0x93, 0x0e, + 0x51, 0xde, 0xd7, 0x31, 0x4c, 0x01, 0x97, 0x62, 0x47, 0x28, 0xec, 0xc4, 0x5d, 0xff, 0x95, 0xc1, + 0x62, 0x36, 0xc7, 0xb9, 0xec, 0x33, 0xff, 0x86, 0x7d, 0x72, 0x35, 0x58, 0xa7, 0xcb, 0x7b, 0xd3, + 0x77, 0xa3, 0xf8, 0xf4, 0x8b, 0x50, 0x16, 0xed, 0x76, 0xe0, 0x84, 0x21, 0xd5, 0x20, 0xfe, 0x6a, + 0x56, 0xa9, 0xab, 0x68, 0x35, 0x9d, 0x83, 0x43, 0x49, 0x4d, 0x1d, 0xd4, 0xce, 0x37, 0xf0, 0x73, + 0xb2, 0x69, 0x28, 0xed, 0xc4, 0x8d, 0x7d, 0x98, 0x68, 0x1a, 0x94, 0x60, 0x70, 0x9f, 0x89, 0x26, + 0xe7, 0x3e, 0x2b, 0x79, 0x7c, 0x9f, 0x95, 0x72, 0x72, 0x5e, 0x7e, 0x01, 0x06, 0x32, 0xdd, 0x72, + 0xc3, 0xe8, 0xbd, 0xbb, 0xbe, 0xd3, 0x4e, 0xf5, 0xcb, 0x5c, 0x57, 0x87, 0x4c, 0x99, 0xfe, 0xcf, + 0xa6, 0xfc, 0xc2, 0xe0, 0xf2, 0xb9, 0x00, 0x8f, 0x43, 0x3f, 0xdd, 0xfc, 0xee, 0x02, 0xcc, 0x22, + 0x1d, 0x7f, 0xc0, 0x60, 0x4e, 0xff, 0x98, 0xe0, 0xd7, 0xb2, 0x0c, 0xd9, 0xdf, 0x2c, 0xc6, 0xf2, + 0x08, 0x95, 0xce, 0x66, 0xae, 0x3d, 0xf8, 0xfd, 0xef, 0x9f, 0xa6, 0x97, 0xf9, 0x92, 0xfd, 0xa9, + 0x68, 0x7d, 0x26, 0xbc, 0x7a, 0x5b, 0x48, 0x5b, 0xef, 0xac, 0x0f, 0xff, 0x72, 0xe3, 0x5f, 0x33, + 0x98, 0xc5, 0xe3, 0x72, 0x33, 0x27, 0x7a, 0x62, 0xc8, 0x1a, 0x4b, 0x85, 0x1a, 0xca, 0xbf, 0x89, + 0xf9, 0xd7, 0xf9, 0x6a, 0x61, 0x7e, 0xb4, 0xd5, 0x3e, 0xc2, 0xd9, 0x71, 0xcc, 0xbf, 0x65, 0x30, + 0x8f, 0x18, 0xdb, 0x9e, 0xc7, 0x57, 0x72, 0xb2, 0x0c, 0x8d, 0x5e, 0xa3, 0x3a, 0x52, 0x47, 0x44, + 0xab, 0x48, 0x74, 0x8d, 0x9b, 0xa3, 0x89, 0xf8, 0x97, 0x0c, 0x4a, 0xaa, 0xd7, 0xf3, 0xab, 0x39, + 0xd1, 0x07, 0x83, 0xd0, 0x30, 0x8b, 0x24, 0x94, 0x7b, 0x03, 0x73, 0xaf, 0xf1, 0x5a, 0x61, 0x6e, + 0x35, 0x51, 0xfa, 0x66, 0x7c, 0xc5, 0xa0, 0xac, 0x10, 0x94, 0x17, 0xcb, 0xf9, 0x67, 0x4c, 0xcc, + 0x47, 0x63, 0x65, 0x94, 0x8c, 0x68, 0x6a, 0x48, 0xb3, 0xc4, 0xaf, 0x8e, 0xa4, 0xe1, 0xdf, 0x33, + 0x28, 0x53, 0xb3, 0xce, 0xa5, 0x48, 0x8f, 0xac, 0x5c, 0x8a, 0xa1, 0x71, 0x65, 0xbe, 0x82, 0x14, + 0x16, 0x5f, 0x2f, 0xa4, 0x88, 0xa7, 0x82, 0x7d, 0xa4, 0x2a, 0x73, 0xcc, 0x1f, 0x32, 0x00, 0x8a, + 0xa4, 0x9c, 0xa9, 0xe5, 0x1f, 0x79, 0x68, 0x8e, 0x19, 0xab, 0xe3, 0x48, 0x89, 0xad, 0x8e, 0x6c, + 0x55, 0xbe, 0x3c, 0x16, 0x9b, 0x7a, 0x3f, 0x25, 0xd5, 0x4a, 0x73, 0x9f, 0x4f, 0x62, 0xa2, 0xe4, + 0x3e, 0x9f, 0xe4, 0x1c, 0x31, 0xb7, 0x10, 0xa0, 0xce, 0xd7, 0x0a, 0x01, 0x54, 0xcb, 0xb6, 0x8f, + 0xa8, 0x75, 0x1e, 0xf3, 0x6f, 0x18, 0x94, 0x55, 0x94, 0x11, 0xcf, 0x27, 0x39, 0x84, 0x8a, 0x9e, + 0x4f, 0x6a, 0x96, 0x8c, 0x79, 0x69, 0x70, 0x88, 0xfc, 0xc6, 0xe0, 0xc9, 0x74, 0xdb, 0xe5, 0xeb, + 0x39, 0x69, 0xce, 0x1d, 0x0f, 0x46, 0x7d, 0x4c, 0x35, 0xa1, 0xbd, 0x89, 0x68, 0xaf, 0xf3, 0xd7, + 0x0a, 0xd1, 0x3c, 0x37, 0x8c, 0xf6, 0xa4, 0xda, 0xbd, 0x47, 0x6d, 0x27, 0x36, 0x6e, 0xe7, 0xc6, + 0xa3, 0xd3, 0x0a, 0x3b, 0x39, 0xad, 0xb0, 0xbf, 0x4e, 0x2b, 0xec, 0x87, 0xb3, 0xca, 0xd4, 0xc9, + 0x59, 0x65, 0xea, 0x8f, 0xb3, 0xca, 0xd4, 0x47, 0x56, 0xc7, 0x8d, 0x0e, 0x0e, 0x9b, 0x56, 0x4b, + 0x76, 0x29, 0xf8, 0x2d, 0xd1, 0x0c, 0xd3, 0xc1, 0xef, 0x61, 0xf8, 0xe8, 0x7e, 0xcf, 0x09, 0x9b, + 0x73, 0xf8, 0xef, 0xe6, 0xd6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xc0, 0xdd, 0x14, 0xb5, 0x0f, 0x00, 0x00, } @@ -1257,9 +1258,9 @@ type QueryClient interface { // Queries a list of Bids. BidsAll(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) // Queries a Listing by index. - Forsale(ctx context.Context, in *QueryForsaleRequest, opts ...grpc.CallOption) (*QueryForsaleResponse, error) + ForSale(ctx context.Context, in *QueryForSaleRequest, opts ...grpc.CallOption) (*QueryForSaleResponse, error) // Queries all Listings. - ForsaleAll(ctx context.Context, in *QueryAllForsalesRequest, opts ...grpc.CallOption) (*QueryAllForsalesResponse, error) + ForSaleAll(ctx context.Context, in *QueryAllForSalesRequest, opts ...grpc.CallOption) (*QueryAllForSalesResponse, error) // Queries a Init by index. Init(ctx context.Context, in *QueryInitRequest, opts ...grpc.CallOption) (*QueryInitResponse, error) // Queries a list of Init items. @@ -1321,18 +1322,18 @@ func (c *queryClient) BidsAll(ctx context.Context, in *QueryAllBidsRequest, opts return out, nil } -func (c *queryClient) Forsale(ctx context.Context, in *QueryForsaleRequest, opts ...grpc.CallOption) (*QueryForsaleResponse, error) { - out := new(QueryForsaleResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Forsale", in, out, opts...) +func (c *queryClient) ForSale(ctx context.Context, in *QueryForSaleRequest, opts ...grpc.CallOption) (*QueryForSaleResponse, error) { + out := new(QueryForSaleResponse) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ForSale", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) ForsaleAll(ctx context.Context, in *QueryAllForsalesRequest, opts ...grpc.CallOption) (*QueryAllForsalesResponse, error) { - out := new(QueryAllForsalesResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ForsaleAll", in, out, opts...) +func (c *queryClient) ForSaleAll(ctx context.Context, in *QueryAllForSalesRequest, opts ...grpc.CallOption) (*QueryAllForSalesResponse, error) { + out := new(QueryAllForSalesResponse) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ForSaleAll", in, out, opts...) if err != nil { return nil, err } @@ -1379,9 +1380,9 @@ type QueryServer interface { // Queries a list of Bids. BidsAll(context.Context, *QueryAllBidsRequest) (*QueryAllBidsResponse, error) // Queries a Listing by index. - Forsale(context.Context, *QueryForsaleRequest) (*QueryForsaleResponse, error) + ForSale(context.Context, *QueryForSaleRequest) (*QueryForSaleResponse, error) // Queries all Listings. - ForsaleAll(context.Context, *QueryAllForsalesRequest) (*QueryAllForsalesResponse, error) + ForSaleAll(context.Context, *QueryAllForSalesRequest) (*QueryAllForSalesResponse, error) // Queries a Init by index. Init(context.Context, *QueryInitRequest) (*QueryInitResponse, error) // Queries a list of Init items. @@ -1409,11 +1410,11 @@ func (*UnimplementedQueryServer) Bids(ctx context.Context, req *QueryBidRequest) func (*UnimplementedQueryServer) BidsAll(ctx context.Context, req *QueryAllBidsRequest) (*QueryAllBidsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method BidsAll not implemented") } -func (*UnimplementedQueryServer) Forsale(ctx context.Context, req *QueryForsaleRequest) (*QueryForsaleResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Forsale not implemented") +func (*UnimplementedQueryServer) ForSale(ctx context.Context, req *QueryForSaleRequest) (*QueryForSaleResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ForSale not implemented") } -func (*UnimplementedQueryServer) ForsaleAll(ctx context.Context, req *QueryAllForsalesRequest) (*QueryAllForsalesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ForsaleAll not implemented") +func (*UnimplementedQueryServer) ForSaleAll(ctx context.Context, req *QueryAllForSalesRequest) (*QueryAllForSalesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ForSaleAll not implemented") } func (*UnimplementedQueryServer) Init(ctx context.Context, req *QueryInitRequest) (*QueryInitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Init not implemented") @@ -1519,38 +1520,38 @@ func _Query_BidsAll_Handler(srv interface{}, ctx context.Context, dec func(inter return interceptor(ctx, in, info, handler) } -func _Query_Forsale_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryForsaleRequest) +func _Query_ForSale_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryForSaleRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Forsale(ctx, in) + return srv.(QueryServer).ForSale(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/Forsale", + FullMethod: "/canine_chain.rns.Query/ForSale", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Forsale(ctx, req.(*QueryForsaleRequest)) + return srv.(QueryServer).ForSale(ctx, req.(*QueryForSaleRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_ForsaleAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllForsalesRequest) +func _Query_ForSaleAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllForSalesRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).ForsaleAll(ctx, in) + return srv.(QueryServer).ForSaleAll(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/ForsaleAll", + FullMethod: "/canine_chain.rns.Query/ForSaleAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ForsaleAll(ctx, req.(*QueryAllForsalesRequest)) + return srv.(QueryServer).ForSaleAll(ctx, req.(*QueryAllForSalesRequest)) } return interceptor(ctx, in, info, handler) } @@ -1634,12 +1635,12 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_BidsAll_Handler, }, { - MethodName: "Forsale", - Handler: _Query_Forsale_Handler, + MethodName: "ForSale", + Handler: _Query_ForSale_Handler, }, { - MethodName: "ForsaleAll", - Handler: _Query_ForsaleAll_Handler, + MethodName: "ForSaleAll", + Handler: _Query_ForSaleAll_Handler, }, { MethodName: "Init", @@ -2155,7 +2156,7 @@ func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryForsaleRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2165,12 +2166,12 @@ func (m *QueryForsaleRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryForsaleRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryForSaleRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryForsaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2185,7 +2186,7 @@ func (m *QueryForsaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryForsaleResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryForSaleResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2195,18 +2196,18 @@ func (m *QueryForsaleResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryForsaleResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryForSaleResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryForsaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Forsale.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ForSale.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2218,7 +2219,7 @@ func (m *QueryForsaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllForsalesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllForSalesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2228,12 +2229,12 @@ func (m *QueryAllForsalesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllForsalesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllForSalesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllForsalesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllForSalesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2253,7 +2254,7 @@ func (m *QueryAllForsalesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryAllForsalesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllForSalesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2263,12 +2264,12 @@ func (m *QueryAllForsalesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllForsalesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllForSalesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllForsalesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllForSalesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2285,10 +2286,10 @@ func (m *QueryAllForsalesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error i-- dAtA[i] = 0x12 } - if len(m.Forsale) > 0 { - for iNdEx := len(m.Forsale) - 1; iNdEx >= 0; iNdEx-- { + if len(m.ForSale) > 0 { + for iNdEx := len(m.ForSale) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Forsale[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ForSale[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2739,7 +2740,7 @@ func (m *QueryAllBidsResponse) Size() (n int) { return n } -func (m *QueryForsaleRequest) Size() (n int) { +func (m *QueryForSaleRequest) Size() (n int) { if m == nil { return 0 } @@ -2752,18 +2753,18 @@ func (m *QueryForsaleRequest) Size() (n int) { return n } -func (m *QueryForsaleResponse) Size() (n int) { +func (m *QueryForSaleResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Forsale.Size() + l = m.ForSale.Size() n += 1 + l + sovQuery(uint64(l)) return n } -func (m *QueryAllForsalesRequest) Size() (n int) { +func (m *QueryAllForSalesRequest) Size() (n int) { if m == nil { return 0 } @@ -2776,14 +2777,14 @@ func (m *QueryAllForsalesRequest) Size() (n int) { return n } -func (m *QueryAllForsalesResponse) Size() (n int) { +func (m *QueryAllForSalesResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Forsale) > 0 { - for _, e := range m.Forsale { + if len(m.ForSale) > 0 { + for _, e := range m.ForSale { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -4140,7 +4141,7 @@ func (m *QueryAllBidsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryForsaleRequest) Unmarshal(dAtA []byte) error { +func (m *QueryForSaleRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4163,10 +4164,10 @@ func (m *QueryForsaleRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryForsaleRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryForSaleRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryForsaleRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryForSaleRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4222,7 +4223,7 @@ func (m *QueryForsaleRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryForsaleResponse) Unmarshal(dAtA []byte) error { +func (m *QueryForSaleResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4245,15 +4246,15 @@ func (m *QueryForsaleResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryForsaleResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryForSaleResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryForsaleResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryForSaleResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Forsale", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ForSale", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4280,7 +4281,7 @@ func (m *QueryForsaleResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Forsale.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ForSale.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4305,7 +4306,7 @@ func (m *QueryForsaleResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllForsalesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllForSalesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4328,10 +4329,10 @@ func (m *QueryAllForsalesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllForsalesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllForSalesRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllForsalesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllForSalesRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4391,7 +4392,7 @@ func (m *QueryAllForsalesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllForsalesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllForSalesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4414,15 +4415,15 @@ func (m *QueryAllForsalesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllForsalesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllForSalesResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllForsalesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllForSalesResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Forsale", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ForSale", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4449,8 +4450,8 @@ func (m *QueryAllForsalesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Forsale = append(m.Forsale, Forsale{}) - if err := m.Forsale[len(m.Forsale)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.ForSale = append(m.ForSale, Forsale{}) + if err := m.ForSale[len(m.ForSale)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/rns/types/query.pb.gw.go b/x/rns/types/query.pb.gw.go index ee05d90a1..e137d0402 100644 --- a/x/rns/types/query.pb.gw.go +++ b/x/rns/types/query.pb.gw.go @@ -231,8 +231,8 @@ func local_request_Query_BidsAll_0(ctx context.Context, marshaler runtime.Marsha } -func request_Query_Forsale_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryForsaleRequest +func request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryForSaleRequest var metadata runtime.ServerMetadata var ( @@ -253,13 +253,13 @@ func request_Query_Forsale_0(ctx context.Context, marshaler runtime.Marshaler, c return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := client.Forsale(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.ForSale(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Forsale_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryForsaleRequest +func local_request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryForSaleRequest var metadata runtime.ServerMetadata var ( @@ -280,43 +280,43 @@ func local_request_Query_Forsale_0(ctx context.Context, marshaler runtime.Marsha return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := server.Forsale(ctx, &protoReq) + msg, err := server.ForSale(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_ForsaleAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_ForSaleAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_ForsaleAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForsalesRequest +func request_Query_ForSaleAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllForSalesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForsaleAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForSaleAll_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ForsaleAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.ForSaleAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_ForsaleAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForsalesRequest +func local_request_Query_ForSaleAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllForSalesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForsaleAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForSaleAll_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ForsaleAll(ctx, &protoReq) + msg, err := server.ForSaleAll(ctx, &protoReq) return msg, metadata, err } @@ -604,7 +604,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Forsale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_ForSale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -615,7 +615,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Forsale_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_ForSale_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -623,11 +623,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Forsale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_ForSale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ForsaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_ForSaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -638,7 +638,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_ForsaleAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_ForSaleAll_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -646,7 +646,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_ForsaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_ForSaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -860,7 +860,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Forsale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_ForSale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -869,18 +869,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Forsale_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_ForSale_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Forsale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_ForSale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ForsaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_ForSaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -889,14 +889,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_ForsaleAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_ForSaleAll_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_ForsaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_ForSaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -974,9 +974,9 @@ var ( pattern_Query_BidsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "bids"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Forsale_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "forsale", "name"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ForSale_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "for_sale", "name"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ForsaleAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "forsale"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ForSaleAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "for_sale"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Init_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "init", "address"}, "", runtime.AssumeColonVerbOpt(false))) @@ -996,9 +996,9 @@ var ( forward_Query_BidsAll_0 = runtime.ForwardResponseMessage - forward_Query_Forsale_0 = runtime.ForwardResponseMessage + forward_Query_ForSale_0 = runtime.ForwardResponseMessage - forward_Query_ForsaleAll_0 = runtime.ForwardResponseMessage + forward_Query_ForSaleAll_0 = runtime.ForwardResponseMessage forward_Query_Init_0 = runtime.ForwardResponseMessage diff --git a/x/rns/types/tx.pb.go b/x/rns/types/tx.pb.go index f192a44c3..a57824a77 100644 --- a/x/rns/types/tx.pb.go +++ b/x/rns/types/tx.pb.go @@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgRegister struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Years string `protobuf:"bytes,3,opt,name=years,proto3" json:"years,omitempty"` + Years int64 `protobuf:"varint,3,opt,name=years,proto3" json:"years,omitempty"` Data string `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"` } @@ -81,11 +81,11 @@ func (m *MsgRegister) GetName() string { return "" } -func (m *MsgRegister) GetYears() string { +func (m *MsgRegister) GetYears() int64 { if m != nil { return m.Years } - return "" + return 0 } func (m *MsgRegister) GetData() string { @@ -691,23 +691,23 @@ func (m *MsgBuyResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgBuyResponse proto.InternalMessageInfo -type MsgDelist struct { +type MsgDeList struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` } -func (m *MsgDelist) Reset() { *m = MsgDelist{} } -func (m *MsgDelist) String() string { return proto.CompactTextString(m) } -func (*MsgDelist) ProtoMessage() {} -func (*MsgDelist) Descriptor() ([]byte, []int) { +func (m *MsgDeList) Reset() { *m = MsgDeList{} } +func (m *MsgDeList) String() string { return proto.CompactTextString(m) } +func (*MsgDeList) ProtoMessage() {} +func (*MsgDeList) Descriptor() ([]byte, []int) { return fileDescriptor_26cd098678d4da9c, []int{14} } -func (m *MsgDelist) XXX_Unmarshal(b []byte) error { +func (m *MsgDeList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgDelist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgDeList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgDelist.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgDeList.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -717,47 +717,47 @@ func (m *MsgDelist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *MsgDelist) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDelist.Merge(m, src) +func (m *MsgDeList) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeList.Merge(m, src) } -func (m *MsgDelist) XXX_Size() int { +func (m *MsgDeList) XXX_Size() int { return m.Size() } -func (m *MsgDelist) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDelist.DiscardUnknown(m) +func (m *MsgDeList) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeList.DiscardUnknown(m) } -var xxx_messageInfo_MsgDelist proto.InternalMessageInfo +var xxx_messageInfo_MsgDeList proto.InternalMessageInfo -func (m *MsgDelist) GetCreator() string { +func (m *MsgDeList) GetCreator() string { if m != nil { return m.Creator } return "" } -func (m *MsgDelist) GetName() string { +func (m *MsgDeList) GetName() string { if m != nil { return m.Name } return "" } -type MsgDelistResponse struct { +type MsgDeListResponse struct { } -func (m *MsgDelistResponse) Reset() { *m = MsgDelistResponse{} } -func (m *MsgDelistResponse) String() string { return proto.CompactTextString(m) } -func (*MsgDelistResponse) ProtoMessage() {} -func (*MsgDelistResponse) Descriptor() ([]byte, []int) { +func (m *MsgDeListResponse) Reset() { *m = MsgDeListResponse{} } +func (m *MsgDeListResponse) String() string { return proto.CompactTextString(m) } +func (*MsgDeListResponse) ProtoMessage() {} +func (*MsgDeListResponse) Descriptor() ([]byte, []int) { return fileDescriptor_26cd098678d4da9c, []int{15} } -func (m *MsgDelistResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgDeListResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgDelistResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgDeListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgDelistResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgDeListResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -767,17 +767,17 @@ func (m *MsgDelistResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *MsgDelistResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDelistResponse.Merge(m, src) +func (m *MsgDeListResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeListResponse.Merge(m, src) } -func (m *MsgDelistResponse) XXX_Size() int { +func (m *MsgDeListResponse) XXX_Size() int { return m.Size() } -func (m *MsgDelistResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDelistResponse.DiscardUnknown(m) +func (m *MsgDeListResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeListResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgDelistResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgDeListResponse proto.InternalMessageInfo type MsgTransfer struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` @@ -1170,8 +1170,8 @@ func init() { proto.RegisterType((*MsgListResponse)(nil), "canine_chain.rns.MsgListResponse") proto.RegisterType((*MsgBuy)(nil), "canine_chain.rns.MsgBuy") proto.RegisterType((*MsgBuyResponse)(nil), "canine_chain.rns.MsgBuyResponse") - proto.RegisterType((*MsgDelist)(nil), "canine_chain.rns.MsgDelist") - proto.RegisterType((*MsgDelistResponse)(nil), "canine_chain.rns.MsgDelistResponse") + proto.RegisterType((*MsgDeList)(nil), "canine_chain.rns.MsgDeList") + proto.RegisterType((*MsgDeListResponse)(nil), "canine_chain.rns.MsgDeListResponse") proto.RegisterType((*MsgTransfer)(nil), "canine_chain.rns.MsgTransfer") proto.RegisterType((*MsgTransferResponse)(nil), "canine_chain.rns.MsgTransferResponse") proto.RegisterType((*MsgAddRecord)(nil), "canine_chain.rns.MsgAddRecord") @@ -1185,48 +1185,48 @@ func init() { func init() { proto.RegisterFile("canine_chain/rns/tx.proto", fileDescriptor_26cd098678d4da9c) } var fileDescriptor_26cd098678d4da9c = []byte{ - // 651 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x4d, 0xbe, 0xa4, 0xf9, 0xb9, 0x1f, 0x82, 0xd4, 0x2d, 0x95, 0x6b, 0x84, 0x55, 0x5c, 0x81, - 0xd8, 0xe0, 0x48, 0x20, 0x21, 0x21, 0xb1, 0x69, 0xc8, 0xa2, 0xa0, 0x5a, 0x8a, 0x02, 0x08, 0x89, - 0x0d, 0x9a, 0xd8, 0x53, 0xd7, 0x90, 0xd8, 0xd6, 0x8c, 0x53, 0x35, 0x1b, 0x9e, 0x81, 0xb7, 0xe0, - 0x55, 0x58, 0x76, 0xc9, 0x12, 0x25, 0x2f, 0x82, 0xe6, 0x37, 0x6e, 0x6a, 0x47, 0x32, 0xbb, 0x19, - 0x9f, 0x3b, 0xe7, 0xd8, 0xf7, 0x9e, 0x63, 0x1b, 0x0e, 0x7d, 0x14, 0x47, 0x31, 0xfe, 0xe2, 0x5f, - 0xa0, 0x28, 0xee, 0x93, 0x98, 0xf6, 0xb3, 0x2b, 0x37, 0x25, 0x49, 0x96, 0x18, 0xbd, 0x3c, 0xe4, - 0x92, 0x98, 0x3a, 0x18, 0xfe, 0xf7, 0x68, 0x38, 0xc6, 0x61, 0x44, 0x33, 0x4c, 0x0c, 0x13, 0xda, - 0x3e, 0xc1, 0x28, 0x4b, 0x88, 0x59, 0x3f, 0xaa, 0x3f, 0xed, 0x8e, 0xd5, 0xd6, 0x30, 0xa0, 0x19, - 0xa3, 0x19, 0x36, 0xff, 0xe3, 0x97, 0xf9, 0xda, 0xd8, 0x87, 0x9d, 0x05, 0x46, 0x84, 0x9a, 0x0d, - 0x7e, 0x51, 0x6c, 0x58, 0x65, 0x80, 0x32, 0x64, 0x36, 0x45, 0x25, 0x5b, 0x3b, 0xf7, 0x61, 0x2f, - 0x27, 0x33, 0xc6, 0x34, 0x4d, 0x62, 0x8a, 0x1d, 0x0f, 0xba, 0x1e, 0x0d, 0x3f, 0xa6, 0x01, 0xca, - 0x70, 0x45, 0x6d, 0xa5, 0xd2, 0xc8, 0xa9, 0xec, 0xc1, 0xae, 0xa6, 0xd3, 0x1a, 0xa7, 0xd0, 0xf2, - 0x68, 0x38, 0x88, 0x82, 0x8a, 0x02, 0x3d, 0x68, 0x4c, 0xa2, 0x40, 0xf2, 0xb3, 0xa5, 0xd3, 0x83, - 0xbb, 0x82, 0x49, 0x73, 0x8f, 0xe0, 0x8e, 0x47, 0xc3, 0x13, 0xdf, 0xc7, 0x69, 0x56, 0x5d, 0xc1, - 0x80, 0xe6, 0x39, 0x49, 0x66, 0xea, 0x11, 0xd8, 0xda, 0x39, 0x80, 0xfd, 0x3c, 0xa3, 0x56, 0x7a, - 0xcd, 0x95, 0xde, 0xa0, 0xd8, 0xc7, 0xd3, 0xca, 0x4a, 0x92, 0x55, 0x9f, 0xce, 0xf5, 0xbf, 0xed, - 0xd1, 0xf0, 0x2c, 0xa2, 0x59, 0xf5, 0xc9, 0xa7, 0x24, 0xf2, 0xb1, 0x9a, 0x3c, 0xdf, 0x38, 0xbb, - 0x70, 0x4f, 0xd2, 0x69, 0x85, 0x97, 0xa2, 0xfb, 0xf3, 0x45, 0xc5, 0x3b, 0x96, 0xbd, 0x9e, 0x2f, - 0x34, 0xd3, 0x2b, 0xee, 0x95, 0x21, 0x9e, 0x56, 0xbe, 0x5b, 0xe9, 0x0b, 0x71, 0x54, 0xf3, 0x7d, - 0xe2, 0xce, 0xff, 0x40, 0x50, 0x4c, 0xcf, 0x2b, 0x3b, 0xdf, 0x82, 0x0e, 0xc1, 0x3e, 0x8e, 0x2e, - 0x31, 0x91, 0x2d, 0xd0, 0x7b, 0xe9, 0x75, 0x45, 0xac, 0xf5, 0xbe, 0x0b, 0xaf, 0x04, 0xc1, 0x18, - 0xfb, 0x09, 0x09, 0xaa, 0x37, 0xfc, 0x12, 0x4d, 0xe7, 0xba, 0xe1, 0x7c, 0x53, 0x14, 0x35, 0xe3, - 0x00, 0x5a, 0x84, 0x2b, 0x98, 0x3b, 0xfc, 0xaa, 0xdc, 0x29, 0x67, 0x29, 0xfd, 0x0d, 0x67, 0x0d, - 0xf1, 0xf4, 0x5f, 0xee, 0x4b, 0xb2, 0xea, 0xd3, 0x9a, 0xf5, 0x98, 0x3b, 0xeb, 0x6d, 0x1c, 0x6d, - 0x99, 0x95, 0xf4, 0x0b, 0x2b, 0x52, 0xe7, 0x9e, 0xff, 0x6c, 0x43, 0xc3, 0xa3, 0xa1, 0x31, 0x82, - 0x8e, 0x7e, 0x29, 0x3d, 0x74, 0x37, 0x5f, 0x5b, 0x6e, 0xee, 0x65, 0x62, 0x3d, 0xde, 0x0a, 0x2b, - 0x66, 0xe3, 0x04, 0x1a, 0x3c, 0x38, 0x85, 0xd5, 0x83, 0x28, 0xb0, 0x8e, 0xca, 0x10, 0x4d, 0xf1, - 0x1e, 0xba, 0xeb, 0xac, 0xdb, 0x85, 0xe5, 0x1a, 0xb7, 0x9e, 0x6c, 0xc7, 0xf3, 0xa4, 0xeb, 0x58, - 0x17, 0x93, 0x6a, 0xbc, 0x84, 0xf4, 0x56, 0xb0, 0x8d, 0x21, 0x34, 0x79, 0xaa, 0x0f, 0x0b, 0xeb, - 0x19, 0x64, 0x3d, 0x2a, 0x85, 0x6e, 0xb4, 0x8c, 0x25, 0xb7, 0xb8, 0x31, 0xf3, 0x45, 0x59, 0xcb, - 0xd6, 0xa9, 0x35, 0xde, 0x41, 0x4b, 0x46, 0xf6, 0x41, 0x61, 0xad, 0x00, 0xad, 0xe3, 0x2d, 0xa0, - 0xe6, 0x1a, 0x41, 0x47, 0xc7, 0xb5, 0xd8, 0x13, 0x0a, 0x2e, 0xf1, 0xc4, 0x66, 0x26, 0xf9, 0x40, - 0x75, 0x20, 0x4b, 0x06, 0xaa, 0xf0, 0xb2, 0x81, 0x6e, 0x06, 0x8a, 0x91, 0xae, 0xd3, 0x64, 0x97, - 0x3d, 0xd8, 0x56, 0xd2, 0x5b, 0x79, 0x62, 0x03, 0xe5, 0x61, 0x2a, 0x1e, 0x28, 0x83, 0x4a, 0x06, - 0x9a, 0x4f, 0x17, 0x9b, 0x86, 0xfc, 0xd8, 0x16, 0x4f, 0x43, 0x80, 0x25, 0xd3, 0xb8, 0xf9, 0x5d, - 0x1d, 0x9c, 0xfe, 0x5a, 0xda, 0xf5, 0xeb, 0xa5, 0x5d, 0xff, 0xb3, 0xb4, 0xeb, 0x3f, 0x56, 0x76, - 0xed, 0x7a, 0x65, 0xd7, 0x7e, 0xaf, 0xec, 0xda, 0x67, 0x37, 0x8c, 0xb2, 0x8b, 0xf9, 0xc4, 0xf5, - 0x93, 0x59, 0xff, 0x2b, 0xf2, 0xbf, 0xa1, 0xe9, 0x19, 0x9a, 0xd0, 0xbe, 0xe0, 0x7c, 0x26, 0x7e, - 0x4b, 0xae, 0xc4, 0x8f, 0xc9, 0x22, 0xc5, 0x74, 0xd2, 0xe2, 0x3f, 0x27, 0x2f, 0xfe, 0x06, 0x00, - 0x00, 0xff, 0xff, 0x36, 0xde, 0xb5, 0xa9, 0xb9, 0x08, 0x00, 0x00, + // 654 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xae, 0x71, 0x9a, 0x26, 0x03, 0x82, 0xd4, 0x2d, 0x95, 0x6b, 0x84, 0x15, 0x5c, 0x81, 0x7a, + 0xc1, 0x91, 0x40, 0x42, 0x42, 0xe2, 0xd2, 0x90, 0x43, 0x41, 0xb5, 0x14, 0x05, 0x10, 0x12, 0x17, + 0xb4, 0xb1, 0xb7, 0xae, 0x21, 0xb1, 0xad, 0x5d, 0xa7, 0x6a, 0x2e, 0x3c, 0x03, 0x6f, 0xc1, 0xab, + 0x70, 0xec, 0x91, 0x23, 0x4a, 0x5e, 0x04, 0xed, 0x8f, 0x37, 0x6e, 0x6a, 0x47, 0x32, 0xb7, 0x1d, + 0x7f, 0xb3, 0xdf, 0xb7, 0x9e, 0x99, 0xcf, 0x5e, 0x38, 0xf4, 0x51, 0x1c, 0xc5, 0xf8, 0xab, 0x7f, + 0x81, 0xa2, 0xb8, 0x47, 0x62, 0xda, 0xcb, 0xae, 0xdc, 0x94, 0x24, 0x59, 0x62, 0x74, 0x8a, 0x90, + 0x4b, 0x62, 0xea, 0x60, 0xb8, 0xeb, 0xd1, 0x70, 0x84, 0xc3, 0x88, 0x66, 0x98, 0x18, 0x26, 0xec, + 0xf8, 0x04, 0xa3, 0x2c, 0x21, 0xa6, 0xd6, 0xd5, 0x8e, 0xdb, 0xa3, 0x3c, 0x34, 0x0c, 0x68, 0xc4, + 0x68, 0x8a, 0xcd, 0x3b, 0xfc, 0x31, 0x5f, 0x1b, 0xfb, 0xb0, 0x3d, 0xc7, 0x88, 0x50, 0x53, 0xef, + 0x6a, 0xc7, 0xfa, 0x48, 0x04, 0x2c, 0x33, 0x40, 0x19, 0x32, 0x1b, 0x22, 0x93, 0xad, 0x9d, 0x87, + 0xb0, 0x57, 0x90, 0x19, 0x61, 0x9a, 0x26, 0x31, 0xc5, 0x8e, 0x07, 0x6d, 0x8f, 0x86, 0x9f, 0xd2, + 0x00, 0x65, 0xb8, 0xa6, 0x76, 0xae, 0xa2, 0x17, 0x54, 0xf6, 0x60, 0x57, 0xd1, 0x29, 0x8d, 0x53, + 0x68, 0x7a, 0x34, 0xec, 0x47, 0x41, 0x4d, 0x81, 0x0e, 0xe8, 0xe3, 0x28, 0x90, 0xfc, 0x6c, 0xe9, + 0x74, 0xe0, 0xbe, 0x60, 0x52, 0xdc, 0x43, 0xb8, 0xe7, 0xd1, 0xf0, 0xc4, 0xf7, 0x71, 0x9a, 0xd5, + 0x57, 0x30, 0xa0, 0x71, 0x4e, 0x92, 0x69, 0xfe, 0x0a, 0x6c, 0xed, 0x1c, 0xc0, 0x7e, 0x91, 0x51, + 0x29, 0xbd, 0xe1, 0x4a, 0x6f, 0x51, 0xec, 0xe3, 0x49, 0x6d, 0x25, 0xc9, 0xaa, 0x76, 0x17, 0xea, + 0xbf, 0xe3, 0xd1, 0xf0, 0x2c, 0xa2, 0x59, 0xfd, 0xce, 0xa7, 0x24, 0xf2, 0xb1, 0x3c, 0xbb, 0x08, + 0x9c, 0x5d, 0x78, 0x20, 0xe9, 0x94, 0xc2, 0x2b, 0x51, 0xfd, 0xd9, 0xbc, 0xe6, 0x89, 0x65, 0xad, + 0x67, 0x73, 0xc5, 0xf4, 0x9a, 0xcf, 0xca, 0x00, 0xd7, 0x3f, 0xad, 0x9c, 0x0b, 0xb1, 0x55, 0xf1, + 0x7d, 0xe6, 0x93, 0xff, 0x91, 0xa0, 0x98, 0x9e, 0xd7, 0x9e, 0x7c, 0x0b, 0x5a, 0x04, 0xfb, 0x38, + 0xba, 0xc4, 0x44, 0x96, 0x40, 0xc5, 0x72, 0xd6, 0x73, 0x62, 0xa5, 0xf7, 0x43, 0xcc, 0x4a, 0x10, + 0x8c, 0xb0, 0x9f, 0x90, 0xa0, 0x7e, 0xc1, 0x2f, 0xd1, 0x64, 0xa6, 0x0a, 0xce, 0x83, 0x32, 0xab, + 0x19, 0x07, 0xd0, 0x24, 0x5c, 0xc1, 0xdc, 0xe6, 0x4f, 0x65, 0x94, 0x4f, 0x56, 0xae, 0xbf, 0x36, + 0x59, 0x03, 0x3c, 0xf9, 0x9f, 0x73, 0x49, 0x56, 0xb5, 0x5b, 0xb1, 0x1e, 0xf1, 0xc9, 0x7a, 0x17, + 0x47, 0x1b, 0x7a, 0x25, 0xe7, 0x85, 0x25, 0xe5, 0xfb, 0x5e, 0xfc, 0xda, 0x01, 0xdd, 0xa3, 0xa1, + 0x31, 0x84, 0x96, 0xfa, 0x28, 0x3d, 0x76, 0xd7, 0x3f, 0x5b, 0x6e, 0xe1, 0x63, 0x62, 0x3d, 0xdd, + 0x08, 0xe7, 0xcc, 0xc6, 0x09, 0xe8, 0xdc, 0x38, 0xa5, 0xd9, 0xfd, 0x28, 0xb0, 0xba, 0x55, 0x88, + 0xa2, 0xf8, 0x00, 0xed, 0x95, 0xd7, 0xed, 0xd2, 0x74, 0x85, 0x5b, 0xcf, 0x36, 0xe3, 0x45, 0xd2, + 0x95, 0xad, 0xcb, 0x49, 0x15, 0x5e, 0x41, 0x7a, 0xcb, 0xd8, 0xc6, 0x00, 0x1a, 0xdc, 0x27, 0x87, + 0xa5, 0xf9, 0x0c, 0xb2, 0x9e, 0x54, 0x42, 0x37, 0x4a, 0xc6, 0x9c, 0x5b, 0x5e, 0x98, 0xd9, 0xbc, + 0xaa, 0x64, 0x2b, 0xd7, 0x1a, 0xef, 0xa1, 0x29, 0x2d, 0xfb, 0xa8, 0x34, 0x57, 0x80, 0xd6, 0xd1, + 0x06, 0x50, 0x71, 0x0d, 0xa1, 0xa5, 0xec, 0x5a, 0x3e, 0x13, 0x39, 0x5c, 0x31, 0x13, 0xeb, 0x9e, + 0xe4, 0x0d, 0x55, 0x86, 0xac, 0x68, 0x68, 0x8e, 0x57, 0x35, 0x74, 0xdd, 0x50, 0x8c, 0x74, 0xe5, + 0x26, 0xbb, 0xe2, 0xc5, 0x26, 0x1b, 0x49, 0x6f, 0xf9, 0x89, 0x35, 0x94, 0x9b, 0xa9, 0xbc, 0xa1, + 0x0c, 0xaa, 0x68, 0x68, 0xd1, 0x5d, 0xac, 0x1b, 0xf2, 0x67, 0x5b, 0xde, 0x0d, 0x01, 0x56, 0x74, + 0xe3, 0xe6, 0x7f, 0xb5, 0x7f, 0xfa, 0x7b, 0x61, 0x6b, 0xd7, 0x0b, 0x5b, 0xfb, 0xbb, 0xb0, 0xb5, + 0x9f, 0x4b, 0x7b, 0xeb, 0x7a, 0x69, 0x6f, 0xfd, 0x59, 0xda, 0x5b, 0x5f, 0xdc, 0x30, 0xca, 0x2e, + 0x66, 0x63, 0xd7, 0x4f, 0xa6, 0xbd, 0x6f, 0xc8, 0xff, 0x8e, 0x26, 0x67, 0x68, 0x4c, 0x7b, 0x82, + 0xf3, 0xb9, 0xb8, 0x96, 0x5c, 0x89, 0x8b, 0xc9, 0x3c, 0xc5, 0x74, 0xdc, 0xe4, 0x97, 0x93, 0x97, + 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x39, 0xa3, 0x5a, 0xb9, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1247,7 +1247,7 @@ type MsgClient interface { CancelBid(ctx context.Context, in *MsgCancelBid, opts ...grpc.CallOption) (*MsgCancelBidResponse, error) List(ctx context.Context, in *MsgList, opts ...grpc.CallOption) (*MsgListResponse, error) Buy(ctx context.Context, in *MsgBuy, opts ...grpc.CallOption) (*MsgBuyResponse, error) - Delist(ctx context.Context, in *MsgDelist, opts ...grpc.CallOption) (*MsgDelistResponse, error) + DeList(ctx context.Context, in *MsgDeList, opts ...grpc.CallOption) (*MsgDeListResponse, error) Transfer(ctx context.Context, in *MsgTransfer, opts ...grpc.CallOption) (*MsgTransferResponse, error) AddRecord(ctx context.Context, in *MsgAddRecord, opts ...grpc.CallOption) (*MsgAddRecordResponse, error) DelRecord(ctx context.Context, in *MsgDelRecord, opts ...grpc.CallOption) (*MsgDelRecordResponse, error) @@ -1317,9 +1317,9 @@ func (c *msgClient) Buy(ctx context.Context, in *MsgBuy, opts ...grpc.CallOption return out, nil } -func (c *msgClient) Delist(ctx context.Context, in *MsgDelist, opts ...grpc.CallOption) (*MsgDelistResponse, error) { - out := new(MsgDelistResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Msg/Delist", in, out, opts...) +func (c *msgClient) DeList(ctx context.Context, in *MsgDeList, opts ...grpc.CallOption) (*MsgDeListResponse, error) { + out := new(MsgDeListResponse) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Msg/DeList", in, out, opts...) if err != nil { return nil, err } @@ -1379,7 +1379,7 @@ type MsgServer interface { CancelBid(context.Context, *MsgCancelBid) (*MsgCancelBidResponse, error) List(context.Context, *MsgList) (*MsgListResponse, error) Buy(context.Context, *MsgBuy) (*MsgBuyResponse, error) - Delist(context.Context, *MsgDelist) (*MsgDelistResponse, error) + DeList(context.Context, *MsgDeList) (*MsgDeListResponse, error) Transfer(context.Context, *MsgTransfer) (*MsgTransferResponse, error) AddRecord(context.Context, *MsgAddRecord) (*MsgAddRecordResponse, error) DelRecord(context.Context, *MsgDelRecord) (*MsgDelRecordResponse, error) @@ -1409,8 +1409,8 @@ func (*UnimplementedMsgServer) List(ctx context.Context, req *MsgList) (*MsgList func (*UnimplementedMsgServer) Buy(ctx context.Context, req *MsgBuy) (*MsgBuyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Buy not implemented") } -func (*UnimplementedMsgServer) Delist(ctx context.Context, req *MsgDelist) (*MsgDelistResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Delist not implemented") +func (*UnimplementedMsgServer) DeList(ctx context.Context, req *MsgDeList) (*MsgDeListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeList not implemented") } func (*UnimplementedMsgServer) Transfer(ctx context.Context, req *MsgTransfer) (*MsgTransferResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Transfer not implemented") @@ -1540,20 +1540,20 @@ func _Msg_Buy_Handler(srv interface{}, ctx context.Context, dec func(interface{} return interceptor(ctx, in, info, handler) } -func _Msg_Delist_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgDelist) +func _Msg_DeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgDeList) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).Delist(ctx, in) + return srv.(MsgServer).DeList(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Msg/Delist", + FullMethod: "/canine_chain.rns.Msg/DeList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).Delist(ctx, req.(*MsgDelist)) + return srv.(MsgServer).DeList(ctx, req.(*MsgDeList)) } return interceptor(ctx, in, info, handler) } @@ -1677,8 +1677,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_Buy_Handler, }, { - MethodName: "Delist", - Handler: _Msg_Delist_Handler, + MethodName: "DeList", + Handler: _Msg_DeList_Handler, }, { MethodName: "Transfer", @@ -1732,12 +1732,10 @@ func (m *MsgRegister) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if len(m.Years) > 0 { - i -= len(m.Years) - copy(dAtA[i:], m.Years) - i = encodeVarintTx(dAtA, i, uint64(len(m.Years))) + if m.Years != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Years)) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x18 } if len(m.Name) > 0 { i -= len(m.Name) @@ -2167,7 +2165,7 @@ func (m *MsgBuyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgDelist) Marshal() (dAtA []byte, err error) { +func (m *MsgDeList) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2177,12 +2175,12 @@ func (m *MsgDelist) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgDelist) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgDeList) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgDelist) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgDeList) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2204,7 +2202,7 @@ func (m *MsgDelist) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgDelistResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgDeListResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2214,12 +2212,12 @@ func (m *MsgDelistResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgDelistResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgDeListResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgDelistResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgDeListResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2513,9 +2511,8 @@ func (m *MsgRegister) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Years) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.Years != 0 { + n += 1 + sovTx(uint64(m.Years)) } l = len(m.Data) if l > 0 { @@ -2705,7 +2702,7 @@ func (m *MsgBuyResponse) Size() (n int) { return n } -func (m *MsgDelist) Size() (n int) { +func (m *MsgDeList) Size() (n int) { if m == nil { return 0 } @@ -2722,7 +2719,7 @@ func (m *MsgDelist) Size() (n int) { return n } -func (m *MsgDelistResponse) Size() (n int) { +func (m *MsgDeListResponse) Size() (n int) { if m == nil { return 0 } @@ -2947,10 +2944,10 @@ func (m *MsgRegister) Unmarshal(dAtA []byte) error { m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Years", wireType) } - var stringLen uint64 + m.Years = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2960,24 +2957,11 @@ func (m *MsgRegister) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Years |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Years = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) @@ -4193,7 +4177,7 @@ func (m *MsgBuyResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgDelist) Unmarshal(dAtA []byte) error { +func (m *MsgDeList) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4216,10 +4200,10 @@ func (m *MsgDelist) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgDelist: wiretype end group for non-group") + return fmt.Errorf("proto: MsgDeList: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDelist: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgDeList: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4307,7 +4291,7 @@ func (m *MsgDelist) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgDelistResponse) Unmarshal(dAtA []byte) error { +func (m *MsgDeListResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4330,10 +4314,10 @@ func (m *MsgDelistResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgDelistResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgDeListResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDelistResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgDeListResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: From 5a4dca1db026f9f6ac0c7294f0af966d340bd8bc Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 16:12:54 -0500 Subject: [PATCH 03/14] fixing language used in protos --- proto/canine_chain/filetree/query.proto | 18 +- proto/canine_chain/oracle/query.proto | 6 +- proto/canine_chain/rns/query.proto | 53 +- proto/canine_chain/storage/query.proto | 70 +- x/filetree/client/cli/query_files.go | 6 +- x/filetree/client/cli/query_get_keys.go | 6 +- x/filetree/client/cli/query_pubkey.go | 2 +- x/filetree/client/cli/tx_add_editors.go | 8 +- x/filetree/client/cli/tx_add_viewers.go | 8 +- x/filetree/client/cli/tx_remove_editors.go | 4 +- x/filetree/client/cli/tx_remove_viewers.go | 4 +- x/filetree/keeper/grpc_query_files.go | 6 +- x/filetree/keeper/grpc_query_pubkey.go | 2 +- .../keeper/msg_server_add_editors_test.go | 4 +- .../keeper/msg_server_add_viewers_test.go | 6 +- .../keeper/msg_server_change_owner_test.go | 12 +- .../keeper/msg_server_delete_file_test.go | 6 +- .../keeper/msg_server_remove_editors_test.go | 16 +- .../keeper/msg_server_remove_viewers_test.go | 16 +- .../keeper/msg_server_reset_editors_test.go | 20 +- .../keeper/msg_server_reset_viewers_test.go | 20 +- x/filetree/types/query.pb.go | 170 +-- x/filetree/types/query.pb.gw.go | 88 +- x/oracle/types/query.pb.go | 64 +- x/oracle/types/query.pb.gw.go | 6 +- x/rns/client/cli/query_bids.go | 4 +- x/rns/client/cli/query_forsale.go | 4 +- x/rns/client/cli/query_init.go | 2 +- x/rns/client/cli/query_names.go | 4 +- x/rns/keeper/bidding_test.go | 10 +- x/rns/keeper/grpc_query_bids.go | 4 +- x/rns/keeper/grpc_query_forsale.go | 4 +- x/rns/keeper/grpc_query_init.go | 2 +- x/rns/keeper/grpc_query_names.go | 10 +- x/rns/keeper/grpc_query_whois.go | 56 - x/rns/keeper/keeper_test.go | 16 +- x/rns/keeper/register_test.go | 4 +- x/rns/keeper/transfer_test.go | 10 +- x/rns/simulation/cancel_bid.go | 2 +- x/rns/types/query.pb.go | 1333 ++++------------- x/rns/types/query.pb.gw.go | 180 +-- x/storage/client/cli/query_active_deals.go | 2 +- x/storage/client/cli/query_attest.go | 8 +- x/storage/client/cli/query_freespace.go | 2 +- x/storage/client/cli/query_miners.go | 4 +- x/storage/client/cli/query_payment_info.go | 2 +- x/storage/client/cli/tx_post_file.go | 2 +- x/storage/keeper/grpc_query_active_deals.go | 4 +- x/storage/keeper/grpc_query_attestation.go | 2 +- x/storage/keeper/grpc_query_freespace.go | 2 +- x/storage/keeper/grpc_query_payment_info.go | 2 +- x/storage/keeper/grpc_query_providers.go | 6 +- x/storage/keeper/grpc_query_report.go | 6 +- x/storage/keeper/msg_server_report.go | 4 +- x/storage/keeper/providers_test.go | 24 +- x/storage/keeper/report_test.go | 4 +- x/storage/types/query.pb.go | 564 +++---- x/storage/types/query.pb.gw.go | 254 ++-- 58 files changed, 1161 insertions(+), 1997 deletions(-) delete mode 100644 x/rns/keeper/grpc_query_whois.go diff --git a/proto/canine_chain/filetree/query.proto b/proto/canine_chain/filetree/query.proto index 6385ec491..297b8bf5e 100644 --- a/proto/canine_chain/filetree/query.proto +++ b/proto/canine_chain/filetree/query.proto @@ -14,29 +14,29 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/jackaldao/canine/filetree/params"; + option (google.api.http).get = "/jackal/canine/filetree/params"; } // Queries a Files by index. - rpc Files(QueryFileRequest) returns (QueryFileResponse) { + rpc File(QueryFileRequest) returns (QueryFileResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/filetree/files/{address}/{owner_address}"; + "/jackal/canine-chain/filetree/files/{address}/{owner_address}"; } // Queries a list of Files items. - rpc FilesAll(QueryAllFilesRequest) returns (QueryAllFilesResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/filetree/files"; + rpc AllFiles(QueryAllFilesRequest) returns (QueryAllFilesResponse) { + option (google.api.http).get = "/jackal/canine-chain/filetree/files"; } // Queries a Pubkey by index. rpc PubKey(QueryPubKeyRequest) returns (QueryPubKeyResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/filetree/pubkeys/{address}"; + "/jackal/canine-chain/filetree/pubkeys/{address}"; } // Queries a list of Pubkey items. - rpc PubKeyAll(QueryAllPubKeysRequest) returns (QueryAllPubKeysResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/filetree/pubkeys"; + rpc AllPubKeys(QueryAllPubKeysRequest) returns (QueryAllPubKeysResponse) { + option (google.api.http).get = "/jackal/canine-chain/filetree/pubkeys"; } } @@ -54,7 +54,7 @@ message QueryFileRequest { string owner_address = 2; } -message QueryFileResponse { Files files = 1 [ (gogoproto.nullable) = false ]; } +message QueryFileResponse { Files file = 1 [ (gogoproto.nullable) = false ]; } message QueryAllFilesRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; diff --git a/proto/canine_chain/oracle/query.proto b/proto/canine_chain/oracle/query.proto index d9cf06953..055cda712 100644 --- a/proto/canine_chain/oracle/query.proto +++ b/proto/canine_chain/oracle/query.proto @@ -13,15 +13,15 @@ option go_package = "github.com/jackalLabs/canine-chain/x/oracle/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/oracle/params"; + option (google.api.http).get = "/jackal/canine-chain/oracle/params"; } rpc Feed(QueryFeedRequest) returns (QueryFeedResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/oracle/feeds/{name}"; + option (google.api.http).get = "/jackal/canine-chain/oracle/feeds/{name}"; } rpc AllFeeds(QueryAllFeedsRequest) returns (QueryAllFeedsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/oracle/feeds"; + option (google.api.http).get = "/jackal/canine-chain/oracle/feeds"; } } diff --git a/proto/canine_chain/rns/query.proto b/proto/canine_chain/rns/query.proto index f2a0238a9..fc2562ddb 100644 --- a/proto/canine_chain/rns/query.proto +++ b/proto/canine_chain/rns/query.proto @@ -17,56 +17,56 @@ option go_package = "github.com/jackalLabs/canine-chain/x/rns/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/params"; + option (google.api.http).get = "/jackal/canine-chain/rns/params"; } // Queries a Name by index. - rpc Names(QueryNameRequest) returns (QueryNameResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/names/{index}"; + rpc Name(QueryNameRequest) returns (QueryNameResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/names/{index}"; } // Queries a list of Names. - rpc NamesAll(QueryAllNamesRequest) returns (QueryAllNamesResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/names"; + rpc AllNames(QueryAllNamesRequest) returns (QueryAllNamesResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/names"; } // Queries a Bid by index. - rpc Bids(QueryBidRequest) returns (QueryBidResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/bids/{index}"; + rpc Bid(QueryBidRequest) returns (QueryBidResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/bids/{index}"; } // Queries a list of Bids. - rpc BidsAll(QueryAllBidsRequest) returns (QueryAllBidsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/bids"; + rpc AllBids(QueryAllBidsRequest) returns (QueryAllBidsResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/bids"; } // Queries a Listing by index. rpc ForSale(QueryForSaleRequest) returns (QueryForSaleResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/rns/for_sale/{name}"; + "/jackal/canine-chain/rns/for_sale/{name}"; } // Queries all Listings. - rpc ForSaleAll(QueryAllForSalesRequest) returns (QueryAllForSalesResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/for_sale"; + rpc AllForSale(QueryAllForSaleRequest) returns (QueryAllForSaleResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/for_sale"; } // Queries a Init by index. rpc Init(QueryInitRequest) returns (QueryInitResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/rns/init/{address}"; + "/jackal/canine-chain/rns/init/{address}"; } // Queries a list of Init items. - rpc InitAll(QueryAllInitsRequest) returns (QueryAllInitsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/rns/init"; + rpc AllInits(QueryAllInitsRequest) returns (QueryAllInitsResponse) { + option (google.api.http).get = "/jackal/canine-chain/rns/init"; } // Queries a list of ListOwnedNames items. rpc ListOwnedNames(QueryListOwnedNamesRequest) returns (QueryListOwnedNamesResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/rns/list_owned_names/{address}"; + "/jackal/canine-chain/rns/list_owned_names/{address}"; } } @@ -79,29 +79,16 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryWhoisRequest { string index = 1; } - -message QueryWhoisResponse { Whois whois = 1 [ (gogoproto.nullable) = false ]; } - -message QueryAllWhoisRequest { - cosmos.base.query.v1beta1.PageRequest pagination = 1; -} - -message QueryAllWhoisResponse { - repeated Whois whois = 1 [ (gogoproto.nullable) = false ]; - cosmos.base.query.v1beta1.PageResponse pagination = 2; -} - message QueryNameRequest { string index = 1; } -message QueryNameResponse { Names names = 1 [ (gogoproto.nullable) = false ]; } +message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } message QueryAllNamesRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; } message QueryAllNamesResponse { - repeated Names names = 1 [ (gogoproto.nullable) = false ]; + repeated Names name = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -124,11 +111,11 @@ message QueryForSaleResponse { Forsale for_sale = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllForSalesRequest { +message QueryAllForSaleRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; } -message QueryAllForSalesResponse { +message QueryAllForSaleResponse { repeated Forsale for_sale = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index 403cce8e1..5da79a298 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -17,139 +17,139 @@ option go_package = "github.com/jackalLabs/canine-chain/x/storage/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/storage/params"; + option (google.api.http).get = "/jackal/canine-chain/storage/params"; } // Queries a File by index. rpc File(QueryFileRequest) returns (QueryFileResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/files/{merkle}/{owner}/{start}"; + "/jackal/canine-chain/storage/files/{merkle}/{owner}/{start}"; } // Queries a list of File items. - rpc FilesAll(QueryAllFilesRequest) + rpc AllFiles(QueryAllFilesRequest) returns (QueryAllFilesResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/files"; + "/jackal/canine-chain/storage/files"; } // Queries a list of File items. rpc OpenFiles(QueryOpenFilesRequest) returns (QueryAllFilesResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/open_files/{provider_address}"; + "/jackal/canine-chain/storage/open_files/{provider_address}"; } // Queries a list of File items. rpc Proof(QueryProofRequest) returns (QueryProofResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/proof/{provider_address}/{merkle}/{owner}/{start}"; + "/jackal/canine-chain/storage/proof/{provider_address}/{merkle}/{owner}/{start}"; } // Queries a Providers by index. - rpc Providers(QueryProviderRequest) returns (QueryProviderResponse) { + rpc Provider(QueryProviderRequest) returns (QueryProviderResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/providers/{address}"; + "/jackal/canine-chain/storage/providers/{address}"; } // Queries a list of Providers items. - rpc ProvidersAll(QueryAllProvidersRequest) + rpc AllProviders(QueryAllProvidersRequest) returns (QueryAllProvidersResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/storage/providers"; + option (google.api.http).get = "/jackal/canine-chain/storage/providers"; } // Queries a Attestation by index. rpc Attestation(QueryAttestationRequest) returns (QueryAttestationResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/attestations/{prover}/{merkle}/{owner}/{start}"; + "/jackal/canine-chain/storage/attestations/{prover}/{merkle}/{owner}/{start}"; } // Queries a list of Attestation items. - rpc AttestationsAll(QueryAllAttestationsRequest) + rpc AllAttestations(QueryAllAttestationsRequest) returns (QueryAllAttestationsResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/storage/attestations"; + option (google.api.http).get = "/jackal/canine-chain/storage/attestations"; } // Queries a Report by index. - rpc Reports(QueryReportRequest) returns (QueryReportResponse) { + rpc Report(QueryReportRequest) returns (QueryReportResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/reports/{prover}/{merkle}/{owner}/{start}"; + "/jackal/canine-chain/storage/reports/{prover}/{merkle}/{owner}/{start}"; } // Queries a list of Attestation items. - rpc ReportsAll(QueryAllReportRequest) - returns (QueryAllReportResponse) { - option (google.api.http).get = "/jackal-dao/canine-chain/storage/reports"; + rpc AllReports(QueryAllReportsRequest) + returns (QueryAllReportsResponse) { + option (google.api.http).get = "/jackal/canine-chain/storage/reports"; } // Queries a list of Freespace items. - rpc Freespace(QueryFreeSpaceRequest) returns (QueryFreeSpaceResponse) { + rpc FreeSpace(QueryFreeSpaceRequest) returns (QueryFreeSpaceResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/free_space/{address}"; + "/jackal/canine-chain/storage/free_space/{address}"; } // Queries a list of Freespace items. rpc StoreCount(QueryStoreCountRequest) returns (QueryStoreCountResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/storing/{address}"; + "/jackal/canine-chain/storage/storing/{address}"; } // Queries a list of FindFile items. rpc FindFile(QueryFindFileRequest) returns (QueryFindFileResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/find_file/{merkle}"; + "/jackal/canine-chain/storage/find_file/{merkle}"; } // Queries a list of GetClientFreeSpace items. rpc GetClientFreeSpace(QueryClientFreeSpaceRequest) returns (QueryClientFreeSpaceResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/get_client_free_space/{address}"; + "/jackal/canine-chain/storage/get_client_free_space/{address}"; } // Queries a list of GetPayData items. rpc GetPayData(QueryPayDataRequest) returns (QueryPayDataResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/get_pay_data/{address}"; + "/jackal/canine-chain/storage/get_pay_data/{address}"; } // Queries a StoragePaymentInfo by address. rpc StoragePaymentInfo(QueryStoragePaymentInfoRequest) returns (QueryStoragePaymentInfoResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/payment_info/{address}"; + "/jackal/canine-chain/storage/payment_info/{address}"; } // Queries a list of StoragePaymentInfo items. - rpc StoragePaymentInfoAll(QueryAllStoragePaymentInfoRequest) + rpc AllStoragePaymentInfo(QueryAllStoragePaymentInfoRequest) returns (QueryAllStoragePaymentInfoResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/payment_info"; + "/jackal/canine-chain/storage/payment_info"; } // Queries whether user can upload a file based on size rpc FileUploadCheck(QueryFileUploadCheckRequest) returns (QueryFileUploadCheckResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/file_upload_check"; + "/jackal/canine-chain/storage/file_upload_check"; } // Queries whether user can upload a file based on size rpc PriceCheck(QueryPriceCheckRequest) returns (QueryPriceCheckResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/price_check/{duration}/{bytes}"; + "/jackal/canine-chain/storage/price_check/{duration}/{bytes}"; } // Queries whether user can upload a file based on size rpc ActiveProviders(QueryActiveProvidersRequest) returns (QueryActiveProvidersResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/active_providers"; + "/jackal/canine-chain/storage/active_providers"; } // Queries the storage space used and purchased rpc StorageStats(QueryStorageStatsRequest) returns (QueryStorageStatsResponse) { option (google.api.http).get = - "/jackal-dao/canine-chain/storage/storage_stats"; + "/jackal/canine-chain/storage/storage_stats"; } } @@ -176,13 +176,11 @@ message QueryProofResponse { message QueryProofsByAddressRequest { string provider_address = 1; cosmos.base.query.v1beta1.PageRequest pagination = 2; - } message QueryProofsByAddressResponse { repeated FileProof proof = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; - } message QueryFileRequest { @@ -212,7 +210,7 @@ message QueryAllFilesResponse { message QueryProviderRequest { string address = 1; } message QueryProviderResponse { - Providers providers = 1 [ (gogoproto.nullable) = false ]; + Providers provider = 1 [ (gogoproto.nullable) = false ]; } message QueryAllProvidersRequest { @@ -257,11 +255,11 @@ message QueryReportResponse { ReportForm report = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllReportRequest { +message QueryAllReportsRequest { cosmos.base.query.v1beta1.PageRequest pagination = 1; } -message QueryAllReportResponse { +message QueryAllReportsResponse { repeated ReportForm reports = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/x/filetree/client/cli/query_files.go b/x/filetree/client/cli/query_files.go index 9c5fb0c06..e9ead016c 100644 --- a/x/filetree/client/cli/query_files.go +++ b/x/filetree/client/cli/query_files.go @@ -30,7 +30,7 @@ func CmdListFiles() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.FilesAll(context.Background(), params) + res, err := queryClient.AllFiles(context.Background(), params) if err != nil { return err } @@ -64,7 +64,7 @@ func CmdShowFiles() *cobra.Command { OwnerAddress: argOwnerAddress, } - res, err := queryClient.Files(context.Background(), params) + res, err := queryClient.File(context.Background(), params) if err != nil { return err } @@ -112,7 +112,7 @@ func CmdShowFileFromPath() *cobra.Command { OwnerAddress: ownerAddress, } - res, err := queryClient.Files(context.Background(), params) + res, err := queryClient.File(context.Background(), params) if err != nil { return err } diff --git a/x/filetree/client/cli/query_get_keys.go b/x/filetree/client/cli/query_get_keys.go index 83cf145ee..a31132fb8 100644 --- a/x/filetree/client/cli/query_get_keys.go +++ b/x/filetree/client/cli/query_get_keys.go @@ -53,13 +53,13 @@ func CmdGetKeys() *cobra.Command { OwnerAddress: ownerString, } - res, err := queryClient.Files(context.Background(), params) + res, err := queryClient.File(context.Background(), params) if err != nil { fmt.Println("cannot find file") return err } - viewers := res.Files.ViewingAccess + viewers := res.File.ViewingAccess var m map[string]string jerr := json.Unmarshal([]byte(viewers), &m) @@ -68,7 +68,7 @@ func CmdGetKeys() *cobra.Command { return jerr } - addressString := keeper.MakeViewerAddress(res.Files.TrackingNumber, clientCtx.GetFromAddress().String()) + addressString := keeper.MakeViewerAddress(res.File.TrackingNumber, clientCtx.GetFromAddress().String()) todec := m[addressString] diff --git a/x/filetree/client/cli/query_pubkey.go b/x/filetree/client/cli/query_pubkey.go index 056b74cb1..792d66b2c 100644 --- a/x/filetree/client/cli/query_pubkey.go +++ b/x/filetree/client/cli/query_pubkey.go @@ -27,7 +27,7 @@ func CmdListPubkey() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.PubKeyAll(context.Background(), params) + res, err := queryClient.AllPubKeys(context.Background(), params) if err != nil { return err } diff --git a/x/filetree/client/cli/tx_add_editors.go b/x/filetree/client/cli/tx_add_editors.go index 7df2c08d4..b9b6379d8 100644 --- a/x/filetree/client/cli/tx_add_editors.go +++ b/x/filetree/client/cli/tx_add_editors.go @@ -72,12 +72,12 @@ func CmdAddEditors() *cobra.Command { OwnerAddress: ownerChainAddress, } - file, err := fileQueryClient.Files(context.Background(), params) + file, err := fileQueryClient.File(context.Background(), params) if err != nil { return types.ErrFileNotFound } - editors := file.Files.EditAccess + editors := file.File.EditAccess var m map[string]string err = json.Unmarshal([]byte(editors), &m) @@ -85,7 +85,7 @@ func CmdAddEditors() *cobra.Command { return types.ErrCantUnmarshall } - ownerEditorAddress := keeper.MakeEditorAddress(file.Files.TrackingNumber, argOwner) + ownerEditorAddress := keeper.MakeEditorAddress(file.File.TrackingNumber, argOwner) logger.Println("m[ownerEditorAddress] =", m[ownerEditorAddress]) hexMessage, err := hex.DecodeString(m[ownerEditorAddress]) @@ -113,7 +113,7 @@ func CmdAddEditors() *cobra.Command { return err } - newEditorID := keeper.MakeEditorAddress(file.Files.TrackingNumber, v) + newEditorID := keeper.MakeEditorAddress(file.File.TrackingNumber, v) editorIds = append(editorIds, newEditorID) editorKeys = append(editorKeys, fmt.Sprintf("%x", encrypted)) diff --git a/x/filetree/client/cli/tx_add_viewers.go b/x/filetree/client/cli/tx_add_viewers.go index 3dc07ba10..e0715968d 100644 --- a/x/filetree/client/cli/tx_add_viewers.go +++ b/x/filetree/client/cli/tx_add_viewers.go @@ -71,12 +71,12 @@ func CmdAddViewers() *cobra.Command { OwnerAddress: ownerChainAddress, } - file, err := fileQueryClient.Files(context.Background(), params) + file, err := fileQueryClient.File(context.Background(), params) if err != nil { return types.ErrFileNotFound } - viewers := file.Files.ViewingAccess + viewers := file.File.ViewingAccess var m map[string]string err = json.Unmarshal([]byte(viewers), &m) @@ -84,7 +84,7 @@ func CmdAddViewers() *cobra.Command { return types.ErrCantUnmarshall } - ownerViewingAddress := keeper.MakeViewerAddress(file.Files.TrackingNumber, argOwner) + ownerViewingAddress := keeper.MakeViewerAddress(file.File.TrackingNumber, argOwner) hexMessage, err := hex.DecodeString(m[ownerViewingAddress]) if err != nil { @@ -109,7 +109,7 @@ func CmdAddViewers() *cobra.Command { return err } - newViewerID := keeper.MakeViewerAddress(file.Files.TrackingNumber, v) + newViewerID := keeper.MakeViewerAddress(file.File.TrackingNumber, v) viewerIds = append(viewerIds, newViewerID) viewerKeys = append(viewerKeys, fmt.Sprintf("%x", encrypted)) diff --git a/x/filetree/client/cli/tx_remove_editors.go b/x/filetree/client/cli/tx_remove_editors.go index 238f44373..2a15747d8 100644 --- a/x/filetree/client/cli/tx_remove_editors.go +++ b/x/filetree/client/cli/tx_remove_editors.go @@ -48,12 +48,12 @@ func CmdRemoveEditors() *cobra.Command { OwnerAddress: ownerChainAddress, } - file, err := fileQueryClient.Files(context.Background(), params) + file, err := fileQueryClient.File(context.Background(), params) if err != nil { return types.ErrFileNotFound } - newEditorID := keeper.MakeEditorAddress(file.Files.TrackingNumber, v) // This used to just be argAddress + newEditorID := keeper.MakeEditorAddress(file.File.TrackingNumber, v) // This used to just be argAddress editorIds = append(editorIds, newEditorID) } diff --git a/x/filetree/client/cli/tx_remove_viewers.go b/x/filetree/client/cli/tx_remove_viewers.go index 70e1e9492..c258e2eb7 100644 --- a/x/filetree/client/cli/tx_remove_viewers.go +++ b/x/filetree/client/cli/tx_remove_viewers.go @@ -48,12 +48,12 @@ func CmdRemoveViewers() *cobra.Command { OwnerAddress: ownerChainAddress, } - file, err := fileQueryClient.Files(context.Background(), params) + file, err := fileQueryClient.File(context.Background(), params) if err != nil { return types.ErrFileNotFound } - newViewerID := keeper.MakeViewerAddress(file.Files.TrackingNumber, v) // This used to just be argAddress + newViewerID := keeper.MakeViewerAddress(file.File.TrackingNumber, v) // This used to just be argAddress viewerIds = append(viewerIds, newViewerID) } diff --git a/x/filetree/keeper/grpc_query_files.go b/x/filetree/keeper/grpc_query_files.go index 6b3ca2b0b..c455be943 100644 --- a/x/filetree/keeper/grpc_query_files.go +++ b/x/filetree/keeper/grpc_query_files.go @@ -12,7 +12,7 @@ import ( ) // To remove -func (k Keeper) FilesAll(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { +func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -39,7 +39,7 @@ func (k Keeper) FilesAll(c context.Context, req *types.QueryAllFilesRequest) (*t return &types.QueryAllFilesResponse{Files: filess, Pagination: pageRes}, nil } -func (k Keeper) Files(c context.Context, req *types.QueryFileRequest) (*types.QueryFileResponse, error) { +func (k Keeper) File(c context.Context, req *types.QueryFileRequest) (*types.QueryFileResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -53,5 +53,5 @@ func (k Keeper) Files(c context.Context, req *types.QueryFileRequest) (*types.Qu return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryFileResponse{Files: val}, nil + return &types.QueryFileResponse{File: val}, nil } diff --git a/x/filetree/keeper/grpc_query_pubkey.go b/x/filetree/keeper/grpc_query_pubkey.go index 24cdfa655..f34e18c91 100644 --- a/x/filetree/keeper/grpc_query_pubkey.go +++ b/x/filetree/keeper/grpc_query_pubkey.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) PubKeyAll(c context.Context, req *types.QueryAllPubKeysRequest) (*types.QueryAllPubKeysResponse, error) { +func (k Keeper) AllPubKeys(c context.Context, req *types.QueryAllPubKeysRequest) (*types.QueryAllPubKeysResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/filetree/keeper/msg_server_add_editors_test.go b/x/filetree/keeper/msg_server_add_editors_test.go index 33dc66780..79af6d6c4 100644 --- a/x/filetree/keeper/msg_server_add_editors_test.go +++ b/x/filetree/keeper/msg_server_add_editors_test.go @@ -104,10 +104,10 @@ func (suite *KeeperTestSuite) TestMsgAddEditors() { OwnerAddress: ownerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - validEditor, err := keeper.HasEditAccess(res.Files, bob) + validEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(validEditor, true) diff --git a/x/filetree/keeper/msg_server_add_viewers_test.go b/x/filetree/keeper/msg_server_add_viewers_test.go index 2175a6b12..839d3fc7f 100644 --- a/x/filetree/keeper/msg_server_add_viewers_test.go +++ b/x/filetree/keeper/msg_server_add_viewers_test.go @@ -166,16 +166,16 @@ func (suite *KeeperTestSuite) TestMsgAddViewers() { OwnerAddress: ownerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - validViewer, err := keeper.HasViewingAccess(res.Files, bob) + validViewer, err := keeper.HasViewingAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(validViewer, true) // Let's see if Bob can decrypt and recover pepe's AES iv and key using his private key - viewers := res.Files.ViewingAccess + viewers := res.File.ViewingAccess var m map[string]string err = json.Unmarshal([]byte(viewers), &m) diff --git a/x/filetree/keeper/msg_server_change_owner_test.go b/x/filetree/keeper/msg_server_change_owner_test.go index c40e152a1..0dab01f1b 100644 --- a/x/filetree/keeper/msg_server_change_owner_test.go +++ b/x/filetree/keeper/msg_server_change_owner_test.go @@ -45,10 +45,10 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - aliceIsOwner := keeper.IsOwner(res.Files, alice) + aliceIsOwner := keeper.IsOwner(res.File, alice) suite.Require().Equal(aliceIsOwner, true) // we make a pepe.jpg for charlie as well to show that alice cannot give charlie her 'pepe.jpg' if he already has one--i.e., duplicates are not permitted @@ -146,7 +146,7 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } - _, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq1) + _, err := suite.queryClient.File(suite.ctx.Context(), &fileReq1) suite.Require().Error(err) // we will find a pepe.jpg that belongs to bob @@ -158,13 +158,13 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { Address: pepeMerklePath, OwnerAddress: bobOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq2) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq2) suite.Require().NoError(err) - bobIsOwner := keeper.IsOwner(res.Files, bob) + bobIsOwner := keeper.IsOwner(res.File, bob) suite.Require().Equal(bobIsOwner, true) - aliceIsOwner := keeper.IsOwner(res.Files, alice) + aliceIsOwner := keeper.IsOwner(res.File, alice) suite.Require().Equal(aliceIsOwner, false) } diff --git a/x/filetree/keeper/msg_server_delete_file_test.go b/x/filetree/keeper/msg_server_delete_file_test.go index 4f912d41f..3a6b904ea 100644 --- a/x/filetree/keeper/msg_server_delete_file_test.go +++ b/x/filetree/keeper/msg_server_delete_file_test.go @@ -54,11 +54,11 @@ func (suite *KeeperTestSuite) TestMsgDeleteFile() { OwnerAddress: types.MakeOwnerAddress(types.MerklePath("s/home/"), aliceAccountHash), } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - suite.Require().Equal(res.Files, *aliceHomeFolder) + suite.Require().Equal(res.File, *aliceHomeFolder) - validEditor, err := keeper.HasEditAccess(res.Files, bob) + validEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(validEditor, true) diff --git a/x/filetree/keeper/msg_server_remove_editors_test.go b/x/filetree/keeper/msg_server_remove_editors_test.go index 4f356a95d..b50046e91 100644 --- a/x/filetree/keeper/msg_server_remove_editors_test.go +++ b/x/filetree/keeper/msg_server_remove_editors_test.go @@ -51,18 +51,18 @@ func (suite *KeeperTestSuite) TestMsgRemoveEditors() { OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsEditor, err := keeper.HasEditAccess(res.Files, bob) + bobIsEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(bobIsEditor, true) - aliceIsEditor, err := keeper.HasEditAccess(res.Files, alice) + aliceIsEditor, err := keeper.HasEditAccess(res.File, alice) suite.Require().NoError(err) suite.Require().Equal(aliceIsEditor, true) - bobEditorAddress := keeper.MakeEditorAddress(res.Files.TrackingNumber, bob) + bobEditorAddress := keeper.MakeEditorAddress(res.File.TrackingNumber, bob) cases := []struct { preRun func() *types.MsgRemoveEditors @@ -128,18 +128,18 @@ func (suite *KeeperTestSuite) TestMsgRemoveEditors() { Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsEditor, err := keeper.HasEditAccess(res.Files, bob) + bobIsEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().EqualValues(bobIsEditor, false) - aliceIsEditor, err := keeper.HasEditAccess(res.Files, alice) + aliceIsEditor, err := keeper.HasEditAccess(res.File, alice) suite.Require().NoError(err) suite.Require().EqualValues(aliceIsEditor, true) - peacc := res.Files.EditAccess + peacc := res.File.EditAccess jeacc := make(map[string]string) err = json.Unmarshal([]byte(peacc), &jeacc) diff --git a/x/filetree/keeper/msg_server_remove_viewers_test.go b/x/filetree/keeper/msg_server_remove_viewers_test.go index 0a0a50d2f..5ee906a67 100644 --- a/x/filetree/keeper/msg_server_remove_viewers_test.go +++ b/x/filetree/keeper/msg_server_remove_viewers_test.go @@ -65,18 +65,18 @@ func (suite *KeeperTestSuite) TestMsgRemoveViewers() { OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsViewer, err := keeper.HasViewingAccess(res.Files, alice) + bobIsViewer, err := keeper.HasViewingAccess(res.File, alice) suite.Require().NoError(err) suite.Require().Equal(bobIsViewer, true) - aliceIsViewer, err := keeper.HasViewingAccess(res.Files, alice) + aliceIsViewer, err := keeper.HasViewingAccess(res.File, alice) suite.Require().NoError(err) suite.Require().Equal(aliceIsViewer, true) - bobViewerAddress := keeper.MakeViewerAddress(res.Files.TrackingNumber, bob) + bobViewerAddress := keeper.MakeViewerAddress(res.File.TrackingNumber, bob) cases := []struct { preRun func() *types.MsgRemoveViewers @@ -142,18 +142,18 @@ func (suite *KeeperTestSuite) TestMsgRemoveViewers() { Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsViewer, err := keeper.HasViewingAccess(res.Files, bob) + bobIsViewer, err := keeper.HasViewingAccess(res.File, bob) suite.Require().NoError(err) suite.Require().EqualValues(bobIsViewer, false) - aliceIsViewer, err := keeper.HasViewingAccess(res.Files, alice) + aliceIsViewer, err := keeper.HasViewingAccess(res.File, alice) suite.Require().NoError(err) suite.Require().EqualValues(aliceIsViewer, true) - pvacc := res.Files.ViewingAccess + pvacc := res.File.ViewingAccess jvacc := make(map[string]string) err = json.Unmarshal([]byte(pvacc), &jvacc) diff --git a/x/filetree/keeper/msg_server_reset_editors_test.go b/x/filetree/keeper/msg_server_reset_editors_test.go index 8af738e02..e403e17fa 100644 --- a/x/filetree/keeper/msg_server_reset_editors_test.go +++ b/x/filetree/keeper/msg_server_reset_editors_test.go @@ -51,22 +51,22 @@ func (suite *KeeperTestSuite) TestMsgResetEditors() { OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsEditor, err := keeper.HasEditAccess(res.Files, bob) + bobIsEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(bobIsEditor, true) - aliceIsEditor, err := keeper.HasEditAccess(res.Files, alice) + aliceIsEditor, err := keeper.HasEditAccess(res.File, alice) suite.Require().NoError(err) suite.Require().Equal(aliceIsEditor, true) - charlieIsEditor, err := keeper.HasEditAccess(res.Files, charlie) + charlieIsEditor, err := keeper.HasEditAccess(res.File, charlie) suite.Require().NoError(err) suite.Require().Equal(charlieIsEditor, true) - peacc := res.Files.EditAccess + peacc := res.File.EditAccess jeacc := make(map[string]string) err = json.Unmarshal([]byte(peacc), &jeacc) @@ -134,22 +134,22 @@ func (suite *KeeperTestSuite) TestMsgResetEditors() { Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsEditor, err := keeper.HasEditAccess(res.Files, bob) + bobIsEditor, err := keeper.HasEditAccess(res.File, bob) suite.Require().NoError(err) suite.Require().EqualValues(bobIsEditor, false) - charlieIsEditor, err := keeper.HasEditAccess(res.Files, charlie) + charlieIsEditor, err := keeper.HasEditAccess(res.File, charlie) suite.Require().NoError(err) suite.Require().EqualValues(charlieIsEditor, false) - aliceIsEditor, err := keeper.HasEditAccess(res.Files, alice) + aliceIsEditor, err := keeper.HasEditAccess(res.File, alice) suite.Require().NoError(err) suite.Require().EqualValues(aliceIsEditor, true) - peacc := res.Files.EditAccess + peacc := res.File.EditAccess jeacc := make(map[string]string) err = json.Unmarshal([]byte(peacc), &jeacc) diff --git a/x/filetree/keeper/msg_server_reset_viewers_test.go b/x/filetree/keeper/msg_server_reset_viewers_test.go index cd2e241c5..a08c8d0ba 100644 --- a/x/filetree/keeper/msg_server_reset_viewers_test.go +++ b/x/filetree/keeper/msg_server_reset_viewers_test.go @@ -65,22 +65,22 @@ func (suite *KeeperTestSuite) TestMsgResetViewers() { OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsViewer, err := keeper.HasViewingAccess(res.Files, bob) + bobIsViewer, err := keeper.HasViewingAccess(res.File, bob) suite.Require().NoError(err) suite.Require().Equal(bobIsViewer, true) - aliceIsViewer, err := keeper.HasViewingAccess(res.Files, alice) + aliceIsViewer, err := keeper.HasViewingAccess(res.File, alice) suite.Require().NoError(err) suite.Require().Equal(aliceIsViewer, true) - charlieIsViewer, err := keeper.HasViewingAccess(res.Files, charlie) + charlieIsViewer, err := keeper.HasViewingAccess(res.File, charlie) suite.Require().NoError(err) suite.Require().Equal(charlieIsViewer, true) - pvacc := res.Files.ViewingAccess + pvacc := res.File.ViewingAccess jvacc := make(map[string]string) err = json.Unmarshal([]byte(pvacc), &jvacc) @@ -148,22 +148,22 @@ func (suite *KeeperTestSuite) TestMsgResetViewers() { Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } - res, err := suite.queryClient.Files(suite.ctx.Context(), &fileReq) + res, err := suite.queryClient.File(suite.ctx.Context(), &fileReq) suite.Require().NoError(err) - bobIsViewer, err := keeper.HasViewingAccess(res.Files, bob) + bobIsViewer, err := keeper.HasViewingAccess(res.File, bob) suite.Require().NoError(err) suite.Require().EqualValues(bobIsViewer, false) - charlieIsViewer, err := keeper.HasViewingAccess(res.Files, charlie) + charlieIsViewer, err := keeper.HasViewingAccess(res.File, charlie) suite.Require().NoError(err) suite.Require().EqualValues(charlieIsViewer, false) - aliceIsViewer, err := keeper.HasViewingAccess(res.Files, alice) + aliceIsViewer, err := keeper.HasViewingAccess(res.File, alice) suite.Require().NoError(err) suite.Require().EqualValues(aliceIsViewer, true) - pvacc := res.Files.ViewingAccess + pvacc := res.File.ViewingAccess jvacc := make(map[string]string) err = json.Unmarshal([]byte(pvacc), &jvacc) diff --git a/x/filetree/types/query.pb.go b/x/filetree/types/query.pb.go index 937b72143..418ee895a 100644 --- a/x/filetree/types/query.pb.go +++ b/x/filetree/types/query.pb.go @@ -166,7 +166,7 @@ func (m *QueryFileRequest) GetOwnerAddress() string { } type QueryFileResponse struct { - Files Files `protobuf:"bytes,1,opt,name=files,proto3" json:"files"` + File Files `protobuf:"bytes,1,opt,name=file,proto3" json:"file"` } func (m *QueryFileResponse) Reset() { *m = QueryFileResponse{} } @@ -202,9 +202,9 @@ func (m *QueryFileResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryFileResponse proto.InternalMessageInfo -func (m *QueryFileResponse) GetFiles() Files { +func (m *QueryFileResponse) GetFile() Files { if m != nil { - return m.Files + return m.File } return Files{} } @@ -506,48 +506,48 @@ func init() { proto.RegisterFile("canine_chain/filetree/query.proto", fileDescri var fileDescriptor_f2d116acb9d238bd = []byte{ // 666 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x6b, 0x13, 0x41, - 0x18, 0xc7, 0xb3, 0xad, 0x49, 0xed, 0xa8, 0xa0, 0x63, 0xaa, 0x65, 0xa9, 0xab, 0xdd, 0x82, 0x69, - 0x5a, 0xb3, 0x43, 0x1a, 0x04, 0xa1, 0x5e, 0x52, 0xa1, 0x22, 0x5a, 0x68, 0xe3, 0xcd, 0x83, 0x71, - 0x36, 0x19, 0xb7, 0x6b, 0x36, 0x3b, 0xdb, 0x7d, 0x51, 0x43, 0xe9, 0xc5, 0xa3, 0x27, 0x41, 0xf1, - 0x20, 0x0a, 0x5e, 0xfc, 0x2e, 0x3d, 0x16, 0xbc, 0x78, 0x12, 0x49, 0xfc, 0x20, 0xb2, 0x33, 0xb3, - 0x66, 0x37, 0x6f, 0x9b, 0x42, 0x6f, 0xc9, 0xce, 0xff, 0xf9, 0x3f, 0xbf, 0x7d, 0x5e, 0x66, 0xc1, - 0x72, 0x03, 0xdb, 0xa6, 0x4d, 0xea, 0x8d, 0x7d, 0x6c, 0xda, 0xe8, 0xa5, 0x69, 0x11, 0xdf, 0x25, - 0x04, 0x1d, 0x04, 0xc4, 0xed, 0x68, 0x8e, 0x4b, 0x7d, 0x0a, 0x17, 0xe2, 0x12, 0x2d, 0x92, 0xc8, - 0x79, 0x83, 0x1a, 0x94, 0x29, 0x50, 0xf8, 0x8b, 0x8b, 0xe5, 0x25, 0x83, 0x52, 0xc3, 0x22, 0x08, - 0x3b, 0x26, 0xc2, 0xb6, 0x4d, 0x7d, 0xec, 0x9b, 0xd4, 0xf6, 0xc4, 0xe9, 0x5a, 0x83, 0x7a, 0x6d, - 0xea, 0x21, 0x1d, 0x7b, 0x22, 0x07, 0x7a, 0x5d, 0xd6, 0x89, 0x8f, 0xcb, 0xc8, 0xc1, 0x86, 0x69, - 0x33, 0xb1, 0xd0, 0xaa, 0xa3, 0xc9, 0x1c, 0xec, 0xe2, 0x76, 0xe4, 0x37, 0x86, 0x3e, 0xfc, 0xe1, - 0xa5, 0xd8, 0x04, 0x7a, 0x8b, 0x88, 0x37, 0x54, 0xf3, 0x00, 0xee, 0x85, 0x30, 0xbb, 0xcc, 0xbb, - 0x46, 0x0e, 0x02, 0xe2, 0xf9, 0x6a, 0x0d, 0x5c, 0x4d, 0x3c, 0xf5, 0x1c, 0x6a, 0x7b, 0x04, 0x6e, - 0x82, 0x1c, 0x67, 0x58, 0x94, 0x6e, 0x49, 0xab, 0x17, 0x36, 0x6e, 0x68, 0x23, 0xeb, 0xa3, 0xf1, - 0xb0, 0xad, 0x73, 0xc7, 0xbf, 0x6f, 0x66, 0x6a, 0x22, 0x44, 0xdd, 0x03, 0x97, 0x99, 0xe7, 0xb6, - 0x69, 0x11, 0x91, 0x07, 0x2e, 0x82, 0x39, 0xdc, 0x6c, 0xba, 0xc4, 0xe3, 0x8e, 0xf3, 0xb5, 0xe8, - 0x2f, 0x5c, 0x01, 0x97, 0xe8, 0x1b, 0x9b, 0xb8, 0xf5, 0xe8, 0x7c, 0x86, 0x9d, 0x5f, 0x64, 0x0f, - 0xab, 0xfc, 0x99, 0xba, 0x03, 0xae, 0xc4, 0x2c, 0x05, 0xe4, 0x3d, 0x90, 0x65, 0x45, 0x10, 0x8c, - 0x4b, 0x63, 0x18, 0xc3, 0x98, 0x08, 0x91, 0x07, 0xa8, 0xcf, 0x41, 0x9e, 0xd9, 0x55, 0x2d, 0x8b, - 0x9d, 0x46, 0x94, 0xdb, 0x00, 0xf4, 0x5b, 0x24, 0x6c, 0x6f, 0x6b, 0xbc, 0x9f, 0x5a, 0xd8, 0x4f, - 0x8d, 0xcf, 0x8c, 0xe8, 0xa7, 0xb6, 0x8b, 0x8d, 0xe8, 0x0d, 0x6b, 0xb1, 0x48, 0xf5, 0x8b, 0x04, - 0x16, 0x06, 0x12, 0x0c, 0x33, 0xcf, 0x9e, 0x8a, 0x19, 0x3e, 0x4c, 0xb0, 0xcd, 0x30, 0xb6, 0x42, - 0x2a, 0x1b, 0x4f, 0x9b, 0x80, 0xd3, 0xa2, 0x41, 0x08, 0xf4, 0xc7, 0xa4, 0x93, 0xda, 0x20, 0xf5, - 0x69, 0x34, 0x22, 0x42, 0x2f, 0xde, 0xe4, 0x3e, 0x98, 0x73, 0x02, 0xbd, 0xde, 0x22, 0x9d, 0xb4, - 0x19, 0x61, 0x53, 0xf8, 0x7f, 0x46, 0x98, 0x8b, 0xfa, 0x02, 0x5c, 0x8b, 0x0a, 0xc4, 0x7d, 0xcf, - 0xbc, 0x07, 0xdf, 0x25, 0x70, 0x7d, 0x28, 0xc5, 0x28, 0xf6, 0xd9, 0x53, 0xb2, 0x9f, 0x59, 0x27, - 0x36, 0x3e, 0xe5, 0x40, 0x96, 0x21, 0xc2, 0xf7, 0x12, 0xc8, 0xf1, 0x5d, 0x82, 0xc5, 0x31, 0x28, - 0xc3, 0xcb, 0x2b, 0xaf, 0x4d, 0x23, 0xe5, 0x79, 0xd5, 0xe2, 0xbb, 0x9f, 0x7f, 0x3f, 0xce, 0xac, - 0xc0, 0x65, 0xf4, 0x0a, 0x37, 0x5a, 0xd8, 0x6a, 0x62, 0x8a, 0x78, 0xf4, 0xe0, 0xb5, 0x03, 0x7f, - 0x48, 0x20, 0xcb, 0x06, 0x10, 0x16, 0x26, 0x25, 0x88, 0xad, 0xb7, 0xbc, 0x9a, 0x2e, 0x14, 0x1c, - 0x8f, 0x18, 0xc7, 0x03, 0x58, 0x15, 0x1c, 0xa5, 0x3e, 0x48, 0x69, 0xd4, 0x0d, 0x87, 0x0e, 0xc5, - 0x1c, 0x1e, 0xa1, 0xc3, 0xc4, 0x3d, 0x71, 0x04, 0x3f, 0x4b, 0xe0, 0x3c, 0xe3, 0xac, 0x5a, 0x16, - 0x5c, 0x9f, 0x44, 0x30, 0xb0, 0xe7, 0xf2, 0x9d, 0xe9, 0xc4, 0x02, 0x19, 0x31, 0xe4, 0x22, 0x2c, - 0x4c, 0x89, 0x0c, 0xbf, 0x86, 0xdd, 0xe4, 0xb3, 0x32, 0xb9, 0x9b, 0xf1, 0x0d, 0x4c, 0xe9, 0x66, - 0x62, 0xf9, 0xd4, 0x4d, 0x86, 0x74, 0x17, 0x56, 0xd2, 0x91, 0xf8, 0x47, 0x20, 0x56, 0x47, 0xf8, - 0x4d, 0x02, 0xf3, 0xdc, 0x2f, 0x2c, 0x5c, 0x29, 0xa5, 0x16, 0xc9, 0xf5, 0x94, 0xb5, 0x69, 0xe5, - 0x82, 0xb4, 0xcc, 0x48, 0xd7, 0x61, 0x71, 0x6a, 0xd2, 0xad, 0x9d, 0xe3, 0xae, 0x22, 0x9d, 0x74, - 0x15, 0xe9, 0x4f, 0x57, 0x91, 0x3e, 0xf4, 0x94, 0xcc, 0x49, 0x4f, 0xc9, 0xfc, 0xea, 0x29, 0x99, - 0x67, 0x15, 0xc3, 0xf4, 0xf7, 0x03, 0x5d, 0x6b, 0xd0, 0xb6, 0xb0, 0x7b, 0x82, 0x75, 0x2f, 0x69, - 0xf7, 0xb6, 0x6f, 0xe8, 0x77, 0x1c, 0xe2, 0xe9, 0x39, 0xf6, 0xfd, 0xab, 0xfc, 0x0b, 0x00, 0x00, - 0xff, 0xff, 0xbd, 0x1a, 0x63, 0x65, 0x06, 0x08, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcf, 0x6f, 0xd3, 0x30, + 0x14, 0xc7, 0xeb, 0xfd, 0xe8, 0xc0, 0x80, 0x04, 0x66, 0x83, 0x29, 0x1a, 0x61, 0x64, 0xda, 0x3a, + 0x36, 0x1a, 0xab, 0x9b, 0x04, 0x48, 0x80, 0xd0, 0x26, 0x31, 0x0e, 0x03, 0x69, 0x2b, 0x37, 0x0e, + 0x14, 0xa7, 0x33, 0x59, 0x68, 0x1a, 0x67, 0xf9, 0x01, 0x54, 0xd3, 0x0e, 0x70, 0xe1, 0x8a, 0xe0, + 0x82, 0x76, 0xda, 0x9f, 0xb3, 0xe3, 0x24, 0x2e, 0x9c, 0x10, 0x6a, 0xf9, 0x43, 0x50, 0x6c, 0x87, + 0x26, 0x5d, 0xdb, 0x04, 0x69, 0xb7, 0xd4, 0xfe, 0xbe, 0xef, 0xfb, 0xd8, 0xef, 0x3d, 0x17, 0xde, + 0xaa, 0x13, 0xc7, 0x72, 0x68, 0xad, 0xbe, 0x4b, 0x2c, 0x07, 0xbf, 0xb1, 0x6c, 0x1a, 0x78, 0x94, + 0xe2, 0xbd, 0x90, 0x7a, 0x2d, 0xdd, 0xf5, 0x58, 0xc0, 0xd0, 0x54, 0x52, 0xa2, 0xc7, 0x12, 0x65, + 0xd2, 0x64, 0x26, 0xe3, 0x0a, 0x1c, 0x7d, 0x09, 0xb1, 0x32, 0x63, 0x32, 0x66, 0xda, 0x14, 0x13, + 0xd7, 0xc2, 0xc4, 0x71, 0x58, 0x40, 0x02, 0x8b, 0x39, 0xbe, 0xdc, 0x5d, 0xaa, 0x33, 0xbf, 0xc9, + 0x7c, 0x6c, 0x10, 0x5f, 0xe6, 0xc0, 0xef, 0x2a, 0x06, 0x0d, 0x48, 0x05, 0xbb, 0xc4, 0xb4, 0x1c, + 0x2e, 0x96, 0x5a, 0xad, 0x3f, 0x99, 0x4b, 0x3c, 0xd2, 0x8c, 0xfd, 0x06, 0xd0, 0x47, 0x1f, 0x7e, + 0x86, 0x4d, 0x68, 0x34, 0xa8, 0x3c, 0xa1, 0x36, 0x09, 0xd1, 0x76, 0x04, 0xb3, 0xc5, 0xbd, 0xab, + 0x74, 0x2f, 0xa4, 0x7e, 0xa0, 0x55, 0xe1, 0xd5, 0xd4, 0xaa, 0xef, 0x32, 0xc7, 0xa7, 0xe8, 0x01, + 0x2c, 0x0a, 0x86, 0x69, 0x30, 0x0b, 0x16, 0x2f, 0xac, 0xdc, 0xd0, 0xfb, 0xde, 0x8f, 0x2e, 0xc2, + 0xd6, 0xc7, 0x8e, 0x7f, 0xdd, 0x2c, 0x54, 0x65, 0x88, 0xb6, 0x0d, 0x2f, 0x73, 0xcf, 0x0d, 0xcb, + 0xa6, 0x32, 0x0f, 0x9a, 0x86, 0x13, 0x64, 0x67, 0xc7, 0xa3, 0xbe, 0x70, 0x3c, 0x5f, 0x8d, 0x7f, + 0xa2, 0x39, 0x78, 0x89, 0xbd, 0x77, 0xa8, 0x57, 0x8b, 0xf7, 0x47, 0xf8, 0xfe, 0x45, 0xbe, 0xb8, + 0x26, 0xd6, 0xb4, 0x4d, 0x78, 0x25, 0x61, 0x29, 0x21, 0xef, 0xc2, 0xb1, 0x08, 0x44, 0x22, 0xce, + 0x0c, 0x40, 0x8c, 0x42, 0x62, 0x42, 0xae, 0xd7, 0x5e, 0xc1, 0x49, 0x6e, 0xb6, 0x66, 0xdb, 0x7c, + 0x33, 0x66, 0xdc, 0x80, 0xb0, 0x5b, 0x20, 0xe9, 0xba, 0xa0, 0x8b, 0x6a, 0xea, 0x51, 0x35, 0x75, + 0xd1, 0x31, 0xb2, 0x9a, 0xfa, 0x16, 0x31, 0xe3, 0xf3, 0x55, 0x13, 0x91, 0xda, 0x21, 0x80, 0x53, + 0x3d, 0x09, 0x24, 0xf1, 0x7d, 0x38, 0xce, 0xcb, 0x36, 0x0d, 0x66, 0x47, 0x73, 0x22, 0x8b, 0x00, + 0xf4, 0x34, 0xc5, 0x36, 0xc2, 0xd9, 0x4a, 0x99, 0x6c, 0x22, 0x6d, 0x0a, 0x4e, 0x8f, 0xdb, 0x20, + 0x34, 0x36, 0x69, 0x2b, 0xb3, 0x3c, 0xda, 0x8b, 0xb8, 0x41, 0xa4, 0x5e, 0x9e, 0xe4, 0x21, 0x9c, + 0x70, 0x43, 0xa3, 0xd6, 0xa0, 0xad, 0xac, 0x0e, 0xe1, 0x3d, 0xf8, 0xaf, 0x43, 0xb8, 0x8b, 0xf6, + 0x1a, 0x5e, 0x8b, 0x2f, 0x48, 0xf8, 0x9e, 0x79, 0x0d, 0x8e, 0x00, 0xbc, 0x7e, 0x2a, 0x45, 0x3f, + 0xf6, 0xd1, 0xff, 0x64, 0x3f, 0xb3, 0x4a, 0xac, 0x7c, 0x2c, 0xc2, 0x71, 0x8e, 0x88, 0x3e, 0x03, + 0x58, 0x14, 0x93, 0x84, 0x6e, 0x0f, 0x40, 0x39, 0x3d, 0xba, 0xca, 0x52, 0x1e, 0xa9, 0xc8, 0xab, + 0x2d, 0x7c, 0xfa, 0xf1, 0xe7, 0xdb, 0xc8, 0x2c, 0x52, 0xf1, 0x5b, 0x52, 0x6f, 0x10, 0x1b, 0x8b, + 0xd0, 0xde, 0x17, 0x07, 0x1d, 0x01, 0x38, 0x16, 0x75, 0x1f, 0x2a, 0x0d, 0x33, 0x4f, 0x0c, 0xb6, + 0xb2, 0x98, 0x2d, 0x94, 0x0c, 0x4f, 0x38, 0xc3, 0x63, 0xf4, 0x28, 0xcd, 0x50, 0xee, 0xf7, 0xae, + 0xe1, 0x7d, 0xd9, 0x7f, 0x07, 0x78, 0x3f, 0xf5, 0x3a, 0x1c, 0xa0, 0xaf, 0x00, 0x9e, 0x8b, 0x07, + 0x0b, 0x2d, 0x0f, 0xcb, 0xde, 0x33, 0xdf, 0xca, 0x9d, 0x7c, 0x62, 0x89, 0xbb, 0xcc, 0x71, 0xe7, + 0xd1, 0x5c, 0x0e, 0x5c, 0xf4, 0x3d, 0xaa, 0xa0, 0xe8, 0x8f, 0xe1, 0x15, 0x4c, 0x4e, 0x5d, 0x46, + 0x05, 0x53, 0x03, 0xa7, 0xdd, 0xe3, 0x38, 0x15, 0x84, 0x87, 0xe3, 0x88, 0x27, 0x3f, 0x71, 0x7f, + 0xe8, 0x10, 0x40, 0xd8, 0x1d, 0x02, 0x54, 0xce, 0xb8, 0x84, 0xf4, 0x3c, 0x2a, 0x7a, 0x5e, 0xb9, + 0xc4, 0x2c, 0x73, 0xcc, 0x12, 0x9a, 0xcf, 0x85, 0xb9, 0xfe, 0xfc, 0xb8, 0xad, 0x82, 0x93, 0xb6, + 0x0a, 0x7e, 0xb7, 0x55, 0xf0, 0xa5, 0xa3, 0x16, 0x4e, 0x3a, 0x6a, 0xe1, 0x67, 0x47, 0x2d, 0xbc, + 0x5c, 0x35, 0xad, 0x60, 0x37, 0x34, 0xf4, 0x3a, 0x6b, 0x4a, 0xab, 0x67, 0xc4, 0xf0, 0xd3, 0x76, + 0x1f, 0xba, 0x86, 0x41, 0xcb, 0xa5, 0xbe, 0x51, 0xe4, 0x7f, 0x75, 0xab, 0x7f, 0x03, 0x00, 0x00, + 0xff, 0xff, 0xf8, 0x89, 0x74, 0xd0, 0xf1, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -565,13 +565,13 @@ type QueryClient interface { // Parameters queries the parameters of the module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Queries a Files by index. - Files(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) + File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) // Queries a list of Files items. - FilesAll(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) + AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. PubKey(ctx context.Context, in *QueryPubKeyRequest, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - PubKeyAll(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) + AllPubKeys(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) } type queryClient struct { @@ -591,18 +591,18 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) Files(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) { +func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) { out := new(QueryFileResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/Files", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/File", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) FilesAll(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { +func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { out := new(QueryAllFilesResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/FilesAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/AllFiles", in, out, opts...) if err != nil { return nil, err } @@ -618,9 +618,9 @@ func (c *queryClient) PubKey(ctx context.Context, in *QueryPubKeyRequest, opts . return out, nil } -func (c *queryClient) PubKeyAll(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) { +func (c *queryClient) AllPubKeys(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) { out := new(QueryAllPubKeysResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/PubKeyAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/AllPubKeys", in, out, opts...) if err != nil { return nil, err } @@ -632,13 +632,13 @@ type QueryServer interface { // Parameters queries the parameters of the module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) // Queries a Files by index. - Files(context.Context, *QueryFileRequest) (*QueryFileResponse, error) + File(context.Context, *QueryFileRequest) (*QueryFileResponse, error) // Queries a list of Files items. - FilesAll(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) + AllFiles(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. PubKey(context.Context, *QueryPubKeyRequest) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - PubKeyAll(context.Context, *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) + AllPubKeys(context.Context, *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -648,17 +648,17 @@ type UnimplementedQueryServer struct { func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) Files(ctx context.Context, req *QueryFileRequest) (*QueryFileResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Files not implemented") +func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFileRequest) (*QueryFileResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method File not implemented") } -func (*UnimplementedQueryServer) FilesAll(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FilesAll not implemented") +func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllFiles not implemented") } func (*UnimplementedQueryServer) PubKey(ctx context.Context, req *QueryPubKeyRequest) (*QueryPubKeyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PubKey not implemented") } -func (*UnimplementedQueryServer) PubKeyAll(ctx context.Context, req *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PubKeyAll not implemented") +func (*UnimplementedQueryServer) AllPubKeys(ctx context.Context, req *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllPubKeys not implemented") } func RegisterQueryServer(s grpc1.Server, srv QueryServer) { @@ -683,38 +683,38 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } -func _Query_Files_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryFileRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Files(ctx, in) + return srv.(QueryServer).File(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Query/Files", + FullMethod: "/canine_chain.filetree.Query/File", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Files(ctx, req.(*QueryFileRequest)) + return srv.(QueryServer).File(ctx, req.(*QueryFileRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_FilesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllFilesRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).FilesAll(ctx, in) + return srv.(QueryServer).AllFiles(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Query/FilesAll", + FullMethod: "/canine_chain.filetree.Query/AllFiles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).FilesAll(ctx, req.(*QueryAllFilesRequest)) + return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFilesRequest)) } return interceptor(ctx, in, info, handler) } @@ -737,20 +737,20 @@ func _Query_PubKey_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } -func _Query_PubKeyAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllPubKeys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllPubKeysRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).PubKeyAll(ctx, in) + return srv.(QueryServer).AllPubKeys(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Query/PubKeyAll", + FullMethod: "/canine_chain.filetree.Query/AllPubKeys", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PubKeyAll(ctx, req.(*QueryAllPubKeysRequest)) + return srv.(QueryServer).AllPubKeys(ctx, req.(*QueryAllPubKeysRequest)) } return interceptor(ctx, in, info, handler) } @@ -764,20 +764,20 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_Params_Handler, }, { - MethodName: "Files", - Handler: _Query_Files_Handler, + MethodName: "File", + Handler: _Query_File_Handler, }, { - MethodName: "FilesAll", - Handler: _Query_FilesAll_Handler, + MethodName: "AllFiles", + Handler: _Query_AllFiles_Handler, }, { MethodName: "PubKey", Handler: _Query_PubKey_Handler, }, { - MethodName: "PubKeyAll", - Handler: _Query_PubKeyAll_Handler, + MethodName: "AllPubKeys", + Handler: _Query_AllPubKeys_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -898,7 +898,7 @@ func (m *QueryFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size, err := m.Files.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.File.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1195,7 +1195,7 @@ func (m *QueryFileResponse) Size() (n int) { } var l int _ = l - l = m.Files.Size() + l = m.File.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -1572,7 +1572,7 @@ func (m *QueryFileResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Files", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field File", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1599,7 +1599,7 @@ func (m *QueryFileResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Files.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.File.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/filetree/types/query.pb.gw.go b/x/filetree/types/query.pb.gw.go index 259a120fe..c2330062b 100644 --- a/x/filetree/types/query.pb.gw.go +++ b/x/filetree/types/query.pb.gw.go @@ -51,7 +51,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } -func request_Query_Files_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryFileRequest var metadata runtime.ServerMetadata @@ -84,12 +84,12 @@ func request_Query_Files_0(ctx context.Context, marshaler runtime.Marshaler, cli return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) } - msg, err := client.Files(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.File(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Files_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryFileRequest var metadata runtime.ServerMetadata @@ -122,43 +122,43 @@ func local_request_Query_Files_0(ctx context.Context, marshaler runtime.Marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "owner_address", err) } - msg, err := server.Files(ctx, &protoReq) + msg, err := server.File(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_FilesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllFiles_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_FilesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllFilesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FilesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllFiles_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.FilesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllFiles(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_FilesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllFilesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FilesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllFiles_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.FilesAll(ctx, &protoReq) + msg, err := server.AllFiles(ctx, &protoReq) return msg, metadata, err } @@ -218,37 +218,37 @@ func local_request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshal } var ( - filter_Query_PubKeyAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllPubKeys_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_PubKeyAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllPubKeys_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllPubKeysRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubKeyAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllPubKeys_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.PubKeyAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllPubKeys(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_PubKeyAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllPubKeys_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllPubKeysRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PubKeyAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllPubKeys_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.PubKeyAll(ctx, &protoReq) + msg, err := server.AllPubKeys(ctx, &protoReq) return msg, metadata, err } @@ -282,7 +282,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Files_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_File_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -293,7 +293,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Files_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_File_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -301,11 +301,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Files_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_File_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_FilesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllFiles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -316,7 +316,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_FilesAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllFiles_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -324,7 +324,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_FilesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllFiles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -351,7 +351,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_PubKeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllPubKeys_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -362,7 +362,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_PubKeyAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllPubKeys_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -370,7 +370,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_PubKeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllPubKeys_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -435,7 +435,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Files_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_File_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -444,18 +444,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Files_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_File_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Files_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_File_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_FilesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllFiles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -464,14 +464,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_FilesAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllFiles_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_FilesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllFiles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -495,7 +495,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_PubKeyAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllPubKeys_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -504,14 +504,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_PubKeyAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllPubKeys_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_PubKeyAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllPubKeys_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -519,25 +519,25 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackaldao", "canine", "filetree", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine", "filetree", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Files_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal-dao", "canine-chain", "filetree", "files", "address", "owner_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_File_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal", "canine-chain", "filetree", "files", "address", "owner_address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_FilesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "filetree", "files"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "filetree", "files"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PubKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PubKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "filetree", "pubkeys", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PubKeyAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "filetree", "pubkeys"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllPubKeys_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "filetree", "pubkeys"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( forward_Query_Params_0 = runtime.ForwardResponseMessage - forward_Query_Files_0 = runtime.ForwardResponseMessage + forward_Query_File_0 = runtime.ForwardResponseMessage - forward_Query_FilesAll_0 = runtime.ForwardResponseMessage + forward_Query_AllFiles_0 = runtime.ForwardResponseMessage forward_Query_PubKey_0 = runtime.ForwardResponseMessage - forward_Query_PubKeyAll_0 = runtime.ForwardResponseMessage + forward_Query_AllPubKeys_0 = runtime.ForwardResponseMessage ) diff --git a/x/oracle/types/query.pb.go b/x/oracle/types/query.pb.go index 560a48b93..8e7fe7235 100644 --- a/x/oracle/types/query.pb.go +++ b/x/oracle/types/query.pb.go @@ -303,38 +303,38 @@ func init() { func init() { proto.RegisterFile("canine_chain/oracle/query.proto", fileDescriptor_2a4eedcae49363dd) } var fileDescriptor_2a4eedcae49363dd = []byte{ - // 490 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x73, 0x6d, 0x88, 0xe0, 0x58, 0xe0, 0x1a, 0x50, 0x31, 0xc8, 0xad, 0x2c, 0x35, 0x09, - 0x15, 0xb9, 0x53, 0x5a, 0x16, 0x46, 0x3a, 0x00, 0x12, 0x0c, 0x21, 0x23, 0x0b, 0x7a, 0xed, 0x1c, - 0xae, 0xc1, 0xb9, 0x73, 0x7d, 0x0e, 0xa2, 0x42, 0x2c, 0xac, 0x2c, 0x95, 0x10, 0x5f, 0x85, 0xcf, - 0xd0, 0xb1, 0x12, 0x0b, 0x13, 0x42, 0x09, 0x1f, 0x04, 0xdd, 0x1f, 0x83, 0xdb, 0x3a, 0x4a, 0x36, - 0x2b, 0xef, 0xf3, 0x3e, 0xbf, 0xe7, 0xee, 0xb9, 0xe0, 0xad, 0x08, 0x44, 0x22, 0xf8, 0xeb, 0xe8, - 0x10, 0x12, 0xc1, 0x64, 0x0e, 0x51, 0xca, 0xd9, 0xd1, 0x94, 0xe7, 0xc7, 0x34, 0xcb, 0x65, 0x21, - 0xc9, 0x46, 0x55, 0x40, 0xad, 0xc0, 0x6b, 0xc7, 0x32, 0x96, 0x66, 0xce, 0xf4, 0x97, 0x95, 0x7a, - 0xf7, 0x62, 0x29, 0xe3, 0x94, 0x33, 0xc8, 0x12, 0x06, 0x42, 0xc8, 0x02, 0x8a, 0x44, 0x0a, 0xe5, - 0xa6, 0xbb, 0x91, 0x54, 0x13, 0xa9, 0x58, 0x08, 0xca, 0x11, 0xd8, 0xfb, 0x41, 0xc8, 0x0b, 0x18, - 0xb0, 0x0c, 0xe2, 0x44, 0x18, 0xb1, 0xd3, 0x6e, 0xd7, 0xa5, 0xca, 0x20, 0x87, 0x49, 0xe9, 0xe6, - 0xd7, 0x29, 0xde, 0x70, 0x3e, 0xb6, 0xf3, 0xa0, 0x8d, 0xc9, 0x4b, 0xcd, 0x18, 0x9a, 0xa5, 0x11, - 0x3f, 0x9a, 0x72, 0x55, 0x04, 0x43, 0xbc, 0x71, 0xee, 0x57, 0x95, 0x49, 0xa1, 0x38, 0x79, 0x84, - 0x5b, 0xd6, 0x7c, 0x13, 0x6d, 0xa3, 0xde, 0xf5, 0xbd, 0xbb, 0xb4, 0xe6, 0xd0, 0xd4, 0x2e, 0x1d, - 0x34, 0x4f, 0x7f, 0x6d, 0x35, 0x46, 0x6e, 0x21, 0xe8, 0xe0, 0x1b, 0xc6, 0xf1, 0x09, 0xe7, 0x63, - 0x47, 0x21, 0x04, 0x37, 0x05, 0x4c, 0xb8, 0x31, 0xbb, 0x36, 0x32, 0xdf, 0xc1, 0x33, 0x7c, 0xb3, - 0xa2, 0x73, 0xdc, 0x7d, 0xdc, 0xd4, 0x91, 0x1d, 0xf5, 0x4e, 0x2d, 0x55, 0x2f, 0x38, 0xa6, 0x11, - 0x07, 0xb7, 0x71, 0xdb, 0x38, 0x3d, 0x4e, 0x53, 0x3d, 0xfb, 0x77, 0xb6, 0x6f, 0x08, 0xdf, 0xba, - 0x30, 0xb8, 0x84, 0x59, 0x5f, 0x19, 0x43, 0x9e, 0x62, 0xfc, 0xbf, 0x96, 0xcd, 0x35, 0x93, 0xb0, - 0x4b, 0x6d, 0x87, 0x54, 0x77, 0x48, 0xed, 0x2b, 0x71, 0x1d, 0xd2, 0x21, 0xc4, 0xbc, 0x24, 0x8e, - 0x2a, 0xab, 0x7b, 0xdf, 0xd7, 0xf1, 0x15, 0x93, 0x8b, 0x7c, 0x41, 0xb8, 0x65, 0x2f, 0x91, 0x74, - 0x6b, 0x43, 0x5c, 0x6e, 0xcc, 0xeb, 0x2d, 0x17, 0x5a, 0x66, 0x40, 0x3f, 0xff, 0xf8, 0xf3, 0x75, - 0xad, 0x47, 0x3a, 0xec, 0x2d, 0x44, 0xef, 0x20, 0xed, 0x8f, 0x41, 0x32, 0xbb, 0xdc, 0xaf, 0x79, - 0x47, 0x3a, 0x4d, 0x53, 0x9f, 0x9a, 0xec, 0x2c, 0x46, 0x54, 0x5a, 0xf5, 0x3a, 0xcb, 0x64, 0x2e, - 0xc7, 0x43, 0x93, 0x83, 0x92, 0x07, 0xcb, 0x72, 0xe8, 0x6b, 0x56, 0xec, 0xa3, 0x7e, 0x1e, 0x9f, - 0xc8, 0x09, 0xc2, 0x57, 0xcb, 0xe2, 0xc8, 0xfd, 0xc5, 0xa8, 0x0b, 0xad, 0x7b, 0xbb, 0xab, 0x48, - 0x5d, 0xb2, 0xbe, 0x49, 0xd6, 0x25, 0x3b, 0x2b, 0x25, 0x3b, 0x78, 0x7e, 0x3a, 0xf3, 0xd1, 0xd9, - 0xcc, 0x47, 0xbf, 0x67, 0x3e, 0x3a, 0x99, 0xfb, 0x8d, 0xb3, 0xb9, 0xdf, 0xf8, 0x39, 0xf7, 0x1b, - 0xaf, 0x06, 0x71, 0x52, 0x1c, 0x4e, 0x43, 0x1a, 0xc9, 0x89, 0xb3, 0x7a, 0x01, 0xa1, 0x3a, 0x6f, - 0xf5, 0xa1, 0x34, 0x2b, 0x8e, 0x33, 0xae, 0xc2, 0x96, 0xf9, 0x5b, 0xee, 0xff, 0x0d, 0x00, 0x00, - 0xff, 0xff, 0x73, 0x5e, 0xae, 0xea, 0x70, 0x04, 0x00, 0x00, + // 486 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x3d, 0x6f, 0xd4, 0x30, + 0x18, 0x3e, 0xb7, 0xc7, 0x09, 0xcc, 0x02, 0xee, 0x81, 0x4a, 0x40, 0x69, 0x09, 0xd0, 0x5e, 0x4f, + 0xc2, 0xe6, 0xda, 0x89, 0x91, 0x0e, 0x80, 0x04, 0xc3, 0x91, 0x91, 0x05, 0xbd, 0x49, 0x4d, 0x1a, + 0x48, 0xec, 0x34, 0xce, 0x21, 0x2a, 0xc4, 0xc2, 0xc2, 0xc2, 0x80, 0x84, 0xf8, 0x13, 0xfc, 0x92, + 0x8e, 0x95, 0x58, 0x98, 0x10, 0xba, 0xe3, 0x87, 0x20, 0x7f, 0x04, 0xd2, 0x36, 0xe5, 0xba, 0x59, + 0x79, 0x9f, 0x2f, 0xfb, 0x79, 0x83, 0x57, 0x62, 0x10, 0xa9, 0xe0, 0x2f, 0xe2, 0x5d, 0x48, 0x05, + 0x93, 0x25, 0xc4, 0x19, 0x67, 0x7b, 0x13, 0x5e, 0xee, 0xd3, 0xa2, 0x94, 0x95, 0x24, 0x4b, 0x4d, + 0x00, 0xb5, 0x00, 0xaf, 0x9f, 0xc8, 0x44, 0x9a, 0x39, 0xd3, 0x27, 0x0b, 0xf5, 0x6e, 0x24, 0x52, + 0x26, 0x19, 0x67, 0x50, 0xa4, 0x0c, 0x84, 0x90, 0x15, 0x54, 0xa9, 0x14, 0xca, 0x4d, 0x87, 0xb1, + 0x54, 0xb9, 0x54, 0x2c, 0x02, 0xe5, 0x1c, 0xd8, 0x9b, 0x51, 0xc4, 0x2b, 0x18, 0xb1, 0x02, 0x92, + 0x54, 0x18, 0xb0, 0xc3, 0xae, 0xb6, 0xa5, 0x2a, 0xa0, 0x84, 0xbc, 0x56, 0xf3, 0xdb, 0x10, 0x2f, + 0x39, 0xdf, 0xb1, 0xf3, 0xa0, 0x8f, 0xc9, 0x33, 0xed, 0x31, 0x36, 0xa4, 0x90, 0xef, 0x4d, 0xb8, + 0xaa, 0x82, 0x31, 0x5e, 0x3a, 0xf2, 0x55, 0x15, 0x52, 0x28, 0x4e, 0xee, 0xe3, 0x9e, 0x15, 0x5f, + 0x46, 0xab, 0x68, 0x70, 0x71, 0xf3, 0x3a, 0x6d, 0xb9, 0x34, 0xb5, 0xa4, 0xed, 0xee, 0xc1, 0xcf, + 0x95, 0x4e, 0xe8, 0x08, 0xc1, 0x1a, 0xbe, 0x64, 0x14, 0x1f, 0x72, 0xbe, 0xe3, 0x5c, 0x08, 0xc1, + 0x5d, 0x01, 0x39, 0x37, 0x62, 0x17, 0x42, 0x73, 0x0e, 0x1e, 0xe3, 0xcb, 0x0d, 0x9c, 0xf3, 0xdd, + 0xc2, 0x5d, 0x1d, 0xd9, 0xb9, 0x5e, 0x6b, 0x75, 0xd5, 0x04, 0xe7, 0x69, 0xc0, 0xc1, 0x55, 0xdc, + 0x37, 0x4a, 0x0f, 0xb2, 0x4c, 0xcf, 0xfe, 0xde, 0xed, 0x2b, 0xc2, 0x57, 0x8e, 0x0d, 0x4e, 0xd8, + 0x2c, 0x9e, 0xd9, 0x86, 0x3c, 0xc2, 0xf8, 0x5f, 0x2d, 0xcb, 0x0b, 0x26, 0xe1, 0x3a, 0xb5, 0x1d, + 0x52, 0xdd, 0x21, 0xb5, 0x5b, 0xe2, 0x3a, 0xa4, 0x63, 0x48, 0x78, 0xed, 0x18, 0x36, 0xa8, 0x9b, + 0xdf, 0x16, 0xf1, 0x39, 0x93, 0x8b, 0x7c, 0x44, 0xb8, 0x67, 0x1f, 0x91, 0xac, 0xb7, 0x86, 0x38, + 0xd9, 0x98, 0x37, 0x98, 0x0f, 0xb4, 0x9e, 0xc1, 0xf0, 0xc3, 0xf7, 0xdf, 0x5f, 0x16, 0x6e, 0x93, + 0x80, 0xbd, 0x82, 0xf8, 0x35, 0x64, 0xcc, 0x12, 0xef, 0xb6, 0xec, 0x90, 0x4e, 0xd2, 0xd5, 0x37, + 0x26, 0x77, 0x4e, 0x97, 0x6f, 0x34, 0xea, 0xad, 0xcd, 0x83, 0xb9, 0x0c, 0xf7, 0x4c, 0x86, 0x21, + 0x19, 0xfc, 0x2f, 0x83, 0x7e, 0x5e, 0xc5, 0xde, 0xe9, 0xb5, 0x78, 0x4f, 0x3e, 0x21, 0x7c, 0xbe, + 0x2e, 0x8c, 0x6c, 0x9c, 0x6e, 0x73, 0xac, 0x6d, 0x6f, 0x78, 0x16, 0xa8, 0x4b, 0xb5, 0x61, 0x52, + 0xdd, 0x22, 0x37, 0xe7, 0xa6, 0xda, 0x7e, 0x72, 0x30, 0xf5, 0xd1, 0xe1, 0xd4, 0x47, 0xbf, 0xa6, + 0x3e, 0xfa, 0x3c, 0xf3, 0x3b, 0x87, 0x33, 0xbf, 0xf3, 0x63, 0xe6, 0x77, 0x9e, 0x8f, 0x92, 0xb4, + 0xda, 0x9d, 0x44, 0x34, 0x96, 0xb9, 0x93, 0x79, 0x0a, 0x91, 0x3a, 0x2a, 0xf5, 0xb6, 0x16, 0xab, + 0xf6, 0x0b, 0xae, 0xa2, 0x9e, 0xf9, 0x15, 0xb7, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x1c, + 0xe8, 0xe1, 0x64, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/oracle/types/query.pb.gw.go b/x/oracle/types/query.pb.gw.go index 4d115f3f3..45bfb94c5 100644 --- a/x/oracle/types/query.pb.gw.go +++ b/x/oracle/types/query.pb.gw.go @@ -303,11 +303,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "oracle", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "oracle", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Feed_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "oracle", "feeds", "name"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Feed_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "oracle", "feeds", "name"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AllFeeds_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "oracle", "feeds"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllFeeds_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "oracle", "feeds"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/rns/client/cli/query_bids.go b/x/rns/client/cli/query_bids.go index 8ea2c8497..a3b8a061a 100644 --- a/x/rns/client/cli/query_bids.go +++ b/x/rns/client/cli/query_bids.go @@ -27,7 +27,7 @@ func CmdListBids() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.BidsAll(context.Background(), params) + res, err := queryClient.AllBids(context.Background(), params) if err != nil { return err } @@ -58,7 +58,7 @@ func CmdShowBids() *cobra.Command { Index: argIndex, } - res, err := queryClient.Bids(context.Background(), params) + res, err := queryClient.Bid(context.Background(), params) if err != nil { return err } diff --git a/x/rns/client/cli/query_forsale.go b/x/rns/client/cli/query_forsale.go index 88c02395a..067b00c98 100644 --- a/x/rns/client/cli/query_forsale.go +++ b/x/rns/client/cli/query_forsale.go @@ -23,11 +23,11 @@ func CmdListForsale() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllForSalesRequest{ + params := &types.QueryAllForSaleRequest{ Pagination: pageReq, } - res, err := queryClient.ForSaleAll(context.Background(), params) + res, err := queryClient.AllForSale(context.Background(), params) if err != nil { return err } diff --git a/x/rns/client/cli/query_init.go b/x/rns/client/cli/query_init.go index 8b3b77f8a..2b00bc385 100644 --- a/x/rns/client/cli/query_init.go +++ b/x/rns/client/cli/query_init.go @@ -27,7 +27,7 @@ func CmdListInit() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.InitAll(context.Background(), params) + res, err := queryClient.AllInits(context.Background(), params) if err != nil { return err } diff --git a/x/rns/client/cli/query_names.go b/x/rns/client/cli/query_names.go index c66d7c868..7a10e59e0 100644 --- a/x/rns/client/cli/query_names.go +++ b/x/rns/client/cli/query_names.go @@ -27,7 +27,7 @@ func CmdListNames() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.NamesAll(context.Background(), params) + res, err := queryClient.AllNames(context.Background(), params) if err != nil { return err } @@ -58,7 +58,7 @@ func CmdShowNames() *cobra.Command { Index: argIndex, } - res, err := queryClient.Names(context.Background(), params) + res, err := queryClient.Name(context.Background(), params) if err != nil { return err } diff --git a/x/rns/keeper/bidding_test.go b/x/rns/keeper/bidding_test.go index cbea23ea1..a0867224d 100644 --- a/x/rns/keeper/bidding_test.go +++ b/x/rns/keeper/bidding_test.go @@ -68,9 +68,9 @@ func (suite *KeeperTestSuite) TestMsgAcceptBid() { Index: TestName, } - res, err := suite.queryClient.Names(suite.ctx.Context(), &nameReq) + res, err := suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) - suite.Require().Equal(res.Names.Value, address.String()) + suite.Require().Equal(res.Name.Value, address.String()) } func (suite *KeeperTestSuite) TestMsgMakeBid() { @@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) TestMsgMakeBid() { var leftover int64 = 1000 suite.Require().Equal(newamt.Int64(), leftover) // cost them the amount they bid - _, err = suite.queryClient.Bids(suite.ctx.Context(), &bidReq) + _, err = suite.queryClient.Bid(suite.ctx.Context(), &bidReq) suite.Require().NoError(err) } @@ -145,7 +145,7 @@ func (suite *KeeperTestSuite) TestMsgCancelBid() { var leftover int64 = 1000 // they spent 1000ujkl so they should have 1000ujkl less suite.Require().Equal(newamt.Int64(), leftover) // cost them the amount they bid - _, err = suite.queryClient.Bids(suite.ctx.Context(), &bidReq) + _, err = suite.queryClient.Bid(suite.ctx.Context(), &bidReq) suite.Require().NoError(err) err = suite.rnsKeeper.CancelOneBid(suite.ctx, address.String(), TestName) @@ -158,6 +158,6 @@ func (suite *KeeperTestSuite) TestMsgCancelBid() { leftover = 0 // they cancelled the bid and thus should receive their money back suite.Require().Equal(newamt.Int64(), leftover) // cost them the amount they bid - _, err = suite.queryClient.Bids(suite.ctx.Context(), &bidReq) + _, err = suite.queryClient.Bid(suite.ctx.Context(), &bidReq) suite.Require().Error(err) } diff --git a/x/rns/keeper/grpc_query_bids.go b/x/rns/keeper/grpc_query_bids.go index e97097852..8615ab09e 100644 --- a/x/rns/keeper/grpc_query_bids.go +++ b/x/rns/keeper/grpc_query_bids.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) BidsAll(c context.Context, req *types.QueryAllBidsRequest) (*types.QueryAllBidsResponse, error) { +func (k Keeper) AllBids(c context.Context, req *types.QueryAllBidsRequest) (*types.QueryAllBidsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) BidsAll(c context.Context, req *types.QueryAllBidsRequest) (*typ return &types.QueryAllBidsResponse{Bids: bidss, Pagination: pageRes}, nil } -func (k Keeper) Bids(c context.Context, req *types.QueryBidRequest) (*types.QueryBidResponse, error) { +func (k Keeper) Bid(c context.Context, req *types.QueryBidRequest) (*types.QueryBidResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_forsale.go b/x/rns/keeper/grpc_query_forsale.go index 7b9c52f60..ab094f4db 100644 --- a/x/rns/keeper/grpc_query_forsale.go +++ b/x/rns/keeper/grpc_query_forsale.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) ForSaleAll(c context.Context, req *types.QueryAllForSalesRequest) (*types.QueryAllForSalesResponse, error) { +func (k Keeper) AllForSale(c context.Context, req *types.QueryAllForSaleRequest) (*types.QueryAllForSaleResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -35,7 +35,7 @@ func (k Keeper) ForSaleAll(c context.Context, req *types.QueryAllForSalesRequest return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryAllForSalesResponse{ForSale: forsales, Pagination: pageRes}, nil + return &types.QueryAllForSaleResponse{ForSale: forsales, Pagination: pageRes}, nil } func (k Keeper) ForSale(c context.Context, req *types.QueryForSaleRequest) (*types.QueryForSaleResponse, error) { diff --git a/x/rns/keeper/grpc_query_init.go b/x/rns/keeper/grpc_query_init.go index c7fb4ae37..b9c4b80da 100644 --- a/x/rns/keeper/grpc_query_init.go +++ b/x/rns/keeper/grpc_query_init.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) InitAll(c context.Context, req *types.QueryAllInitsRequest) (*types.QueryAllInitsResponse, error) { +func (k Keeper) AllInits(c context.Context, req *types.QueryAllInitsRequest) (*types.QueryAllInitsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_names.go b/x/rns/keeper/grpc_query_names.go index 213220293..140e4a7ac 100644 --- a/x/rns/keeper/grpc_query_names.go +++ b/x/rns/keeper/grpc_query_names.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) NamesAll(c context.Context, req *types.QueryAllNamesRequest) (*types.QueryAllNamesResponse, error) { +func (k Keeper) AllNames(c context.Context, req *types.QueryAllNamesRequest) (*types.QueryAllNamesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -35,10 +35,10 @@ func (k Keeper) NamesAll(c context.Context, req *types.QueryAllNamesRequest) (*t return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryAllNamesResponse{Names: namess, Pagination: pageRes}, nil + return &types.QueryAllNamesResponse{Name: namess, Pagination: pageRes}, nil } -func (k Keeper) Names(c context.Context, req *types.QueryNameRequest) (*types.QueryNameResponse, error) { +func (k Keeper) Name(c context.Context, req *types.QueryNameRequest) (*types.QueryNameResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -63,10 +63,10 @@ func (k Keeper) Names(c context.Context, req *types.QueryNameRequest) (*types.Qu if hasSub { for _, domain := range val.Subdomains { if domain.Name == sub { - return &types.QueryNameResponse{Names: *domain}, nil + return &types.QueryNameResponse{Name: *domain}, nil } } } - return &types.QueryNameResponse{Names: val}, nil + return &types.QueryNameResponse{Name: val}, nil } diff --git a/x/rns/keeper/grpc_query_whois.go b/x/rns/keeper/grpc_query_whois.go deleted file mode 100644 index a8f9440b8..000000000 --- a/x/rns/keeper/grpc_query_whois.go +++ /dev/null @@ -1,56 +0,0 @@ -package keeper - -import ( - "context" - - "github.com/cosmos/cosmos-sdk/store/prefix" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/query" - "github.com/jackalLabs/canine-chain/v3/x/rns/types" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" -) - -func (k Keeper) WhoisAll(c context.Context, req *types.QueryAllWhoisRequest) (*types.QueryAllWhoisResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "invalid request") - } - - var whoiss []types.Whois - ctx := sdk.UnwrapSDKContext(c) - - store := ctx.KVStore(k.storeKey) - whoisStore := prefix.NewStore(store, types.KeyPrefix(types.WhoisKeyPrefix)) - - pageRes, err := query.Paginate(whoisStore, req.Pagination, func(key []byte, value []byte) error { - var whois types.Whois - if err := k.cdc.Unmarshal(value, &whois); err != nil { - return err - } - - whoiss = append(whoiss, whois) - return nil - }) - if err != nil { - return nil, status.Error(codes.Internal, err.Error()) - } - - return &types.QueryAllWhoisResponse{Whois: whoiss, Pagination: pageRes}, nil -} - -func (k Keeper) Whois(c context.Context, req *types.QueryWhoisRequest) (*types.QueryWhoisResponse, error) { - if req == nil { - return nil, status.Error(codes.InvalidArgument, "invalid request") - } - ctx := sdk.UnwrapSDKContext(c) - - val, found := k.GetWhois( - ctx, - req.Index, - ) - if !found { - return nil, status.Error(codes.NotFound, "not found") - } - - return &types.QueryWhoisResponse{Whois: val}, nil -} diff --git a/x/rns/keeper/keeper_test.go b/x/rns/keeper/keeper_test.go index d7bddbfff..f7c869567 100644 --- a/x/rns/keeper/keeper_test.go +++ b/x/rns/keeper/keeper_test.go @@ -110,7 +110,7 @@ func (suite *KeeperTestSuite) TestMakeBid() { Index: fmt.Sprintf("%s%s", address.String(), name), } - _, err = suite.queryClient.Bids(suite.ctx.Context(), &bidReq) + _, err = suite.queryClient.Bid(suite.ctx.Context(), &bidReq) suite.Require().NoError(err) } @@ -141,16 +141,16 @@ func (suite *KeeperTestSuite) TestUpdateName() { Index: "validname.jkl", } - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) newData := "{\"A\":\"192.168.0.1\"}" name.Data = newData suite.rnsKeeper.SetNames(suite.ctx, name) - res, err := suite.queryClient.Names(suite.ctx.Context(), &nameReq) + res, err := suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) - suite.Require().Equal(res.Names.Data, newData) + suite.Require().Equal(res.Name.Data, newData) } func (suite *KeeperTestSuite) TestRemoveName() { @@ -180,12 +180,12 @@ func (suite *KeeperTestSuite) TestRemoveName() { Index: "validname.jkl", } - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) suite.rnsKeeper.RemoveNames(suite.ctx, "validname", "jkl") - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().Error(err) } @@ -216,7 +216,7 @@ func (suite *KeeperTestSuite) TestSetName() { Index: "validname.jkl", } - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) badname := types.Names{ @@ -233,7 +233,7 @@ func (suite *KeeperTestSuite) TestSetName() { nameReq = types.QueryNameRequest{ Index: "badname.jkl", } - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().Error(err) } diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go index f36fed57e..4af635fa9 100644 --- a/x/rns/keeper/register_test.go +++ b/x/rns/keeper/register_test.go @@ -49,7 +49,7 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { leftover := 2 * cost suite.Require().Equal(leftover, newamt.Int64()) // cost them the price of the registration - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), capname, "{}", 2) // adding time to registration @@ -61,6 +61,6 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { newamt = amt.Sub(newamt) suite.Require().Equal(leftover, newamt.Int64()) // cost them the price of the registration - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) } diff --git a/x/rns/keeper/transfer_test.go b/x/rns/keeper/transfer_test.go index 0d96b42b7..7fec90775 100644 --- a/x/rns/keeper/transfer_test.go +++ b/x/rns/keeper/transfer_test.go @@ -50,20 +50,20 @@ func (suite *KeeperTestSuite) TestMsgTransfer() { leftover := cost * 2 suite.Require().Equal(newamt.Int64(), leftover) // cost them the amount they bid - _, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) err = suite.rnsKeeper.TransferName(suite.ctx, address.String(), receiver.String(), name) // will pass as the user owns the name suite.Require().NoError(err) - res, err := suite.queryClient.Names(suite.ctx.Context(), &nameReq) + res, err := suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) - suite.Require().Equal(res.Names.Value, receiver.String()) + suite.Require().Equal(res.Name.Value, receiver.String()) err = suite.rnsKeeper.TransferName(suite.ctx, address.String(), receiver.String(), name) // should fail sending a name from an address that doesn't have ownership suite.Require().Error(err) - res, err = suite.queryClient.Names(suite.ctx.Context(), &nameReq) + res, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().NoError(err) - suite.Require().Equal(res.Names.Value, receiver.String()) + suite.Require().Equal(res.Name.Value, receiver.String()) } diff --git a/x/rns/simulation/cancel_bid.go b/x/rns/simulation/cancel_bid.go index 7e7f482d7..4fcf3475d 100644 --- a/x/rns/simulation/cancel_bid.go +++ b/x/rns/simulation/cancel_bid.go @@ -22,7 +22,7 @@ func SimulateMsgCancelBid( // choosing a random account with a bid open nreq := &types.QueryAllBidsRequest{} wctx := sdk.WrapSDKContext(ctx) - allBidsResp, err := k.BidsAll(wctx, nreq) + allBidsResp, err := k.AllBids(wctx, nreq) if err != nil { return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgCancelBid, "Unable to collect bids"), nil, err } diff --git a/x/rns/types/query.pb.go b/x/rns/types/query.pb.go index f4c14c69f..0ec3ece9d 100644 --- a/x/rns/types/query.pb.go +++ b/x/rns/types/query.pb.go @@ -113,190 +113,6 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryWhoisRequest struct { - Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` -} - -func (m *QueryWhoisRequest) Reset() { *m = QueryWhoisRequest{} } -func (m *QueryWhoisRequest) String() string { return proto.CompactTextString(m) } -func (*QueryWhoisRequest) ProtoMessage() {} -func (*QueryWhoisRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{2} -} -func (m *QueryWhoisRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryWhoisRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryWhoisRequest.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 *QueryWhoisRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryWhoisRequest.Merge(m, src) -} -func (m *QueryWhoisRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryWhoisRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryWhoisRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryWhoisRequest proto.InternalMessageInfo - -func (m *QueryWhoisRequest) GetIndex() string { - if m != nil { - return m.Index - } - return "" -} - -type QueryWhoisResponse struct { - Whois Whois `protobuf:"bytes,1,opt,name=whois,proto3" json:"whois"` -} - -func (m *QueryWhoisResponse) Reset() { *m = QueryWhoisResponse{} } -func (m *QueryWhoisResponse) String() string { return proto.CompactTextString(m) } -func (*QueryWhoisResponse) ProtoMessage() {} -func (*QueryWhoisResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{3} -} -func (m *QueryWhoisResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryWhoisResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryWhoisResponse.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 *QueryWhoisResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryWhoisResponse.Merge(m, src) -} -func (m *QueryWhoisResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryWhoisResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryWhoisResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryWhoisResponse proto.InternalMessageInfo - -func (m *QueryWhoisResponse) GetWhois() Whois { - if m != nil { - return m.Whois - } - return Whois{} -} - -type QueryAllWhoisRequest struct { - Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllWhoisRequest) Reset() { *m = QueryAllWhoisRequest{} } -func (m *QueryAllWhoisRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllWhoisRequest) ProtoMessage() {} -func (*QueryAllWhoisRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{4} -} -func (m *QueryAllWhoisRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllWhoisRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllWhoisRequest.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 *QueryAllWhoisRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllWhoisRequest.Merge(m, src) -} -func (m *QueryAllWhoisRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryAllWhoisRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllWhoisRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllWhoisRequest proto.InternalMessageInfo - -func (m *QueryAllWhoisRequest) GetPagination() *query.PageRequest { - if m != nil { - return m.Pagination - } - return nil -} - -type QueryAllWhoisResponse struct { - Whois []Whois `protobuf:"bytes,1,rep,name=whois,proto3" json:"whois"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllWhoisResponse) Reset() { *m = QueryAllWhoisResponse{} } -func (m *QueryAllWhoisResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllWhoisResponse) ProtoMessage() {} -func (*QueryAllWhoisResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{5} -} -func (m *QueryAllWhoisResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllWhoisResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllWhoisResponse.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 *QueryAllWhoisResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllWhoisResponse.Merge(m, src) -} -func (m *QueryAllWhoisResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryAllWhoisResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllWhoisResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllWhoisResponse proto.InternalMessageInfo - -func (m *QueryAllWhoisResponse) GetWhois() []Whois { - if m != nil { - return m.Whois - } - return nil -} - -func (m *QueryAllWhoisResponse) GetPagination() *query.PageResponse { - if m != nil { - return m.Pagination - } - return nil -} - type QueryNameRequest struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` } @@ -305,7 +121,7 @@ func (m *QueryNameRequest) Reset() { *m = QueryNameRequest{} } func (m *QueryNameRequest) String() string { return proto.CompactTextString(m) } func (*QueryNameRequest) ProtoMessage() {} func (*QueryNameRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{6} + return fileDescriptor_8561b6b36d651aba, []int{2} } func (m *QueryNameRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,14 +158,14 @@ func (m *QueryNameRequest) GetIndex() string { } type QueryNameResponse struct { - Names Names `protobuf:"bytes,1,opt,name=names,proto3" json:"names"` + Name Names `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` } func (m *QueryNameResponse) Reset() { *m = QueryNameResponse{} } func (m *QueryNameResponse) String() string { return proto.CompactTextString(m) } func (*QueryNameResponse) ProtoMessage() {} func (*QueryNameResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{7} + return fileDescriptor_8561b6b36d651aba, []int{3} } func (m *QueryNameResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -378,9 +194,9 @@ func (m *QueryNameResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryNameResponse proto.InternalMessageInfo -func (m *QueryNameResponse) GetNames() Names { +func (m *QueryNameResponse) GetName() Names { if m != nil { - return m.Names + return m.Name } return Names{} } @@ -393,7 +209,7 @@ func (m *QueryAllNamesRequest) Reset() { *m = QueryAllNamesRequest{} } func (m *QueryAllNamesRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllNamesRequest) ProtoMessage() {} func (*QueryAllNamesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{8} + return fileDescriptor_8561b6b36d651aba, []int{4} } func (m *QueryAllNamesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -430,7 +246,7 @@ func (m *QueryAllNamesRequest) GetPagination() *query.PageRequest { } type QueryAllNamesResponse struct { - Names []Names `protobuf:"bytes,1,rep,name=names,proto3" json:"names"` + Name []Names `protobuf:"bytes,1,rep,name=name,proto3" json:"name"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -438,7 +254,7 @@ func (m *QueryAllNamesResponse) Reset() { *m = QueryAllNamesResponse{} } func (m *QueryAllNamesResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllNamesResponse) ProtoMessage() {} func (*QueryAllNamesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{9} + return fileDescriptor_8561b6b36d651aba, []int{5} } func (m *QueryAllNamesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,9 +283,9 @@ func (m *QueryAllNamesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllNamesResponse proto.InternalMessageInfo -func (m *QueryAllNamesResponse) GetNames() []Names { +func (m *QueryAllNamesResponse) GetName() []Names { if m != nil { - return m.Names + return m.Name } return nil } @@ -489,7 +305,7 @@ func (m *QueryBidRequest) Reset() { *m = QueryBidRequest{} } func (m *QueryBidRequest) String() string { return proto.CompactTextString(m) } func (*QueryBidRequest) ProtoMessage() {} func (*QueryBidRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{10} + return fileDescriptor_8561b6b36d651aba, []int{6} } func (m *QueryBidRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -533,7 +349,7 @@ func (m *QueryBidResponse) Reset() { *m = QueryBidResponse{} } func (m *QueryBidResponse) String() string { return proto.CompactTextString(m) } func (*QueryBidResponse) ProtoMessage() {} func (*QueryBidResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{11} + return fileDescriptor_8561b6b36d651aba, []int{7} } func (m *QueryBidResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -577,7 +393,7 @@ func (m *QueryAllBidsRequest) Reset() { *m = QueryAllBidsRequest{} } func (m *QueryAllBidsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllBidsRequest) ProtoMessage() {} func (*QueryAllBidsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{12} + return fileDescriptor_8561b6b36d651aba, []int{8} } func (m *QueryAllBidsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -622,7 +438,7 @@ func (m *QueryAllBidsResponse) Reset() { *m = QueryAllBidsResponse{} } func (m *QueryAllBidsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllBidsResponse) ProtoMessage() {} func (*QueryAllBidsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{13} + return fileDescriptor_8561b6b36d651aba, []int{9} } func (m *QueryAllBidsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -673,7 +489,7 @@ func (m *QueryForSaleRequest) Reset() { *m = QueryForSaleRequest{} } func (m *QueryForSaleRequest) String() string { return proto.CompactTextString(m) } func (*QueryForSaleRequest) ProtoMessage() {} func (*QueryForSaleRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{14} + return fileDescriptor_8561b6b36d651aba, []int{10} } func (m *QueryForSaleRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -717,7 +533,7 @@ func (m *QueryForSaleResponse) Reset() { *m = QueryForSaleResponse{} } func (m *QueryForSaleResponse) String() string { return proto.CompactTextString(m) } func (*QueryForSaleResponse) ProtoMessage() {} func (*QueryForSaleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{15} + return fileDescriptor_8561b6b36d651aba, []int{11} } func (m *QueryForSaleResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -753,22 +569,22 @@ func (m *QueryForSaleResponse) GetForSale() Forsale { return Forsale{} } -type QueryAllForSalesRequest struct { +type QueryAllForSaleRequest struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllForSalesRequest) Reset() { *m = QueryAllForSalesRequest{} } -func (m *QueryAllForSalesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllForSalesRequest) ProtoMessage() {} -func (*QueryAllForSalesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{16} +func (m *QueryAllForSaleRequest) Reset() { *m = QueryAllForSaleRequest{} } +func (m *QueryAllForSaleRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllForSaleRequest) ProtoMessage() {} +func (*QueryAllForSaleRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_8561b6b36d651aba, []int{12} } -func (m *QueryAllForSalesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllForSaleRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllForSalesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllForSalesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllForSaleRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -778,42 +594,42 @@ func (m *QueryAllForSalesRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryAllForSalesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllForSalesRequest.Merge(m, src) +func (m *QueryAllForSaleRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllForSaleRequest.Merge(m, src) } -func (m *QueryAllForSalesRequest) XXX_Size() int { +func (m *QueryAllForSaleRequest) XXX_Size() int { return m.Size() } -func (m *QueryAllForSalesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllForSalesRequest.DiscardUnknown(m) +func (m *QueryAllForSaleRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllForSaleRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllForSalesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllForSaleRequest proto.InternalMessageInfo -func (m *QueryAllForSalesRequest) GetPagination() *query.PageRequest { +func (m *QueryAllForSaleRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -type QueryAllForSalesResponse struct { +type QueryAllForSaleResponse struct { ForSale []Forsale `protobuf:"bytes,1,rep,name=for_sale,json=forSale,proto3" json:"for_sale"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllForSalesResponse) Reset() { *m = QueryAllForSalesResponse{} } -func (m *QueryAllForSalesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllForSalesResponse) ProtoMessage() {} -func (*QueryAllForSalesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{17} +func (m *QueryAllForSaleResponse) Reset() { *m = QueryAllForSaleResponse{} } +func (m *QueryAllForSaleResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllForSaleResponse) ProtoMessage() {} +func (*QueryAllForSaleResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8561b6b36d651aba, []int{13} } -func (m *QueryAllForSalesResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryAllForSaleResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllForSalesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllForSaleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllForSalesResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllForSaleResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -823,26 +639,26 @@ func (m *QueryAllForSalesResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryAllForSalesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllForSalesResponse.Merge(m, src) +func (m *QueryAllForSaleResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllForSaleResponse.Merge(m, src) } -func (m *QueryAllForSalesResponse) XXX_Size() int { +func (m *QueryAllForSaleResponse) XXX_Size() int { return m.Size() } -func (m *QueryAllForSalesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllForSalesResponse.DiscardUnknown(m) +func (m *QueryAllForSaleResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllForSaleResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllForSalesResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryAllForSaleResponse proto.InternalMessageInfo -func (m *QueryAllForSalesResponse) GetForSale() []Forsale { +func (m *QueryAllForSaleResponse) GetForSale() []Forsale { if m != nil { return m.ForSale } return nil } -func (m *QueryAllForSalesResponse) GetPagination() *query.PageResponse { +func (m *QueryAllForSaleResponse) GetPagination() *query.PageResponse { if m != nil { return m.Pagination } @@ -857,7 +673,7 @@ func (m *QueryInitRequest) Reset() { *m = QueryInitRequest{} } func (m *QueryInitRequest) String() string { return proto.CompactTextString(m) } func (*QueryInitRequest) ProtoMessage() {} func (*QueryInitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{18} + return fileDescriptor_8561b6b36d651aba, []int{14} } func (m *QueryInitRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -901,7 +717,7 @@ func (m *QueryInitResponse) Reset() { *m = QueryInitResponse{} } func (m *QueryInitResponse) String() string { return proto.CompactTextString(m) } func (*QueryInitResponse) ProtoMessage() {} func (*QueryInitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{19} + return fileDescriptor_8561b6b36d651aba, []int{15} } func (m *QueryInitResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -945,7 +761,7 @@ func (m *QueryAllInitsRequest) Reset() { *m = QueryAllInitsRequest{} } func (m *QueryAllInitsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllInitsRequest) ProtoMessage() {} func (*QueryAllInitsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{20} + return fileDescriptor_8561b6b36d651aba, []int{16} } func (m *QueryAllInitsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -990,7 +806,7 @@ func (m *QueryAllInitsResponse) Reset() { *m = QueryAllInitsResponse{} } func (m *QueryAllInitsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllInitsResponse) ProtoMessage() {} func (*QueryAllInitsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{21} + return fileDescriptor_8561b6b36d651aba, []int{17} } func (m *QueryAllInitsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1042,7 +858,7 @@ func (m *QueryListOwnedNamesRequest) Reset() { *m = QueryListOwnedNamesR func (m *QueryListOwnedNamesRequest) String() string { return proto.CompactTextString(m) } func (*QueryListOwnedNamesRequest) ProtoMessage() {} func (*QueryListOwnedNamesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{22} + return fileDescriptor_8561b6b36d651aba, []int{18} } func (m *QueryListOwnedNamesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1094,7 +910,7 @@ func (m *QueryListOwnedNamesResponse) Reset() { *m = QueryListOwnedNames func (m *QueryListOwnedNamesResponse) String() string { return proto.CompactTextString(m) } func (*QueryListOwnedNamesResponse) ProtoMessage() {} func (*QueryListOwnedNamesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8561b6b36d651aba, []int{23} + return fileDescriptor_8561b6b36d651aba, []int{19} } func (m *QueryListOwnedNamesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1140,10 +956,6 @@ func (m *QueryListOwnedNamesResponse) GetPagination() *query.PageResponse { func init() { proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.rns.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.rns.QueryParamsResponse") - proto.RegisterType((*QueryWhoisRequest)(nil), "canine_chain.rns.QueryWhoisRequest") - proto.RegisterType((*QueryWhoisResponse)(nil), "canine_chain.rns.QueryWhoisResponse") - proto.RegisterType((*QueryAllWhoisRequest)(nil), "canine_chain.rns.QueryAllWhoisRequest") - proto.RegisterType((*QueryAllWhoisResponse)(nil), "canine_chain.rns.QueryAllWhoisResponse") proto.RegisterType((*QueryNameRequest)(nil), "canine_chain.rns.QueryNameRequest") proto.RegisterType((*QueryNameResponse)(nil), "canine_chain.rns.QueryNameResponse") proto.RegisterType((*QueryAllNamesRequest)(nil), "canine_chain.rns.QueryAllNamesRequest") @@ -1154,8 +966,8 @@ func init() { proto.RegisterType((*QueryAllBidsResponse)(nil), "canine_chain.rns.QueryAllBidsResponse") proto.RegisterType((*QueryForSaleRequest)(nil), "canine_chain.rns.QueryForSaleRequest") proto.RegisterType((*QueryForSaleResponse)(nil), "canine_chain.rns.QueryForSaleResponse") - proto.RegisterType((*QueryAllForSalesRequest)(nil), "canine_chain.rns.QueryAllForSalesRequest") - proto.RegisterType((*QueryAllForSalesResponse)(nil), "canine_chain.rns.QueryAllForSalesResponse") + proto.RegisterType((*QueryAllForSaleRequest)(nil), "canine_chain.rns.QueryAllForSaleRequest") + proto.RegisterType((*QueryAllForSaleResponse)(nil), "canine_chain.rns.QueryAllForSaleResponse") proto.RegisterType((*QueryInitRequest)(nil), "canine_chain.rns.QueryInitRequest") proto.RegisterType((*QueryInitResponse)(nil), "canine_chain.rns.QueryInitResponse") proto.RegisterType((*QueryAllInitsRequest)(nil), "canine_chain.rns.QueryAllInitsRequest") @@ -1167,72 +979,69 @@ func init() { func init() { proto.RegisterFile("canine_chain/rns/query.proto", fileDescriptor_8561b6b36d651aba) } var fileDescriptor_8561b6b36d651aba = []byte{ - // 1027 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0x33, 0x89, 0x13, 0x87, 0x57, 0x09, 0xca, 0x10, 0x68, 0xd8, 0x16, 0x43, 0x37, 0x4d, - 0x5c, 0x27, 0xf1, 0x2e, 0x49, 0x10, 0x08, 0x2e, 0x28, 0x11, 0x0a, 0xad, 0x54, 0xa0, 0x98, 0x03, - 0x12, 0x12, 0x44, 0x63, 0x7b, 0xe3, 0x2c, 0xac, 0x77, 0xdc, 0xdd, 0x0d, 0x6d, 0x15, 0x05, 0xa1, - 0x02, 0xe2, 0x82, 0x10, 0x14, 0x71, 0xe2, 0xc0, 0x37, 0xe0, 0x73, 0xf4, 0x18, 0x89, 0x0b, 0x27, - 0x84, 0x12, 0x3e, 0x08, 0x9a, 0x37, 0x6f, 0xed, 0x5d, 0x6f, 0x76, 0x6d, 0x90, 0x91, 0x7a, 0xb3, - 0x33, 0xff, 0x79, 0xef, 0x37, 0xff, 0x37, 0xf3, 0x9e, 0x03, 0x57, 0x5a, 0xc2, 0x77, 0x7d, 0x67, - 0xaf, 0x75, 0x20, 0x5c, 0xdf, 0x0e, 0xfc, 0xd0, 0xbe, 0x73, 0xe8, 0x04, 0xf7, 0xad, 0x5e, 0x20, - 0x23, 0xc9, 0x2f, 0x26, 0x57, 0xad, 0xc0, 0x0f, 0x8d, 0x85, 0x8e, 0xec, 0x48, 0x5c, 0xb4, 0xd5, - 0x27, 0xad, 0x33, 0xae, 0x74, 0xa4, 0xec, 0x78, 0x8e, 0x2d, 0x7a, 0xae, 0x2d, 0x7c, 0x5f, 0x46, - 0x22, 0x72, 0xa5, 0x1f, 0xd2, 0xea, 0x6a, 0x4b, 0x86, 0x5d, 0x19, 0xda, 0x4d, 0x11, 0x3a, 0x3a, - 0xbc, 0xfd, 0xf9, 0x46, 0xd3, 0x89, 0xc4, 0x86, 0xdd, 0x13, 0x1d, 0xd7, 0x47, 0x31, 0x69, 0x5f, - 0xc8, 0xf0, 0xf4, 0x44, 0x20, 0xba, 0x71, 0xa8, 0x2c, 0xee, 0xdd, 0x03, 0xe9, 0xe6, 0xaf, 0xfa, - 0xa2, 0xeb, 0xc4, 0xab, 0x97, 0x33, 0xab, 0x4d, 0xb7, 0x1d, 0x2f, 0x56, 0x32, 0x8b, 0xfb, 0x32, - 0x08, 0x85, 0xe7, 0xe4, 0x6e, 0x76, 0x7d, 0x37, 0xd2, 0x8b, 0xe6, 0x02, 0xf0, 0xf7, 0xd5, 0xb1, - 0x6e, 0x23, 0x6a, 0xc3, 0xb9, 0x73, 0xe8, 0x84, 0x91, 0xf9, 0x0e, 0x3c, 0x93, 0xfa, 0x6b, 0xd8, - 0x93, 0x7e, 0xe8, 0xf0, 0x57, 0x61, 0x4e, 0x1f, 0x69, 0x91, 0xbd, 0xc4, 0xae, 0x5f, 0xd8, 0x5c, - 0xb4, 0x86, 0x4d, 0xb6, 0xf4, 0x8e, 0x9d, 0xd2, 0xa3, 0x3f, 0x5f, 0x9c, 0x6a, 0x90, 0xda, 0xac, - 0xc1, 0xd3, 0x18, 0xee, 0x43, 0x75, 0x60, 0xca, 0xc1, 0x17, 0x60, 0xd6, 0xf5, 0xdb, 0xce, 0x3d, - 0x8c, 0xf5, 0x44, 0x43, 0x7f, 0x31, 0x6f, 0x12, 0x0f, 0x49, 0x29, 0xf1, 0x16, 0xcc, 0xa2, 0x59, - 0x94, 0xf7, 0x52, 0x36, 0x2f, 0xea, 0x29, 0xad, 0xd6, 0x9a, 0x9f, 0xc0, 0x02, 0x86, 0xda, 0xf6, - 0xbc, 0x54, 0xe2, 0x5d, 0x80, 0x41, 0xed, 0x28, 0xe2, 0x8a, 0xa5, 0x0b, 0x6d, 0xa9, 0x42, 0x5b, - 0xfa, 0x1e, 0x51, 0xa1, 0xad, 0xdb, 0xa2, 0xe3, 0xd0, 0xde, 0x46, 0x62, 0xa7, 0xf9, 0x33, 0x83, - 0x67, 0x87, 0x12, 0x64, 0x71, 0x67, 0xc6, 0xc5, 0xe5, 0x6f, 0xa7, 0xb0, 0xa6, 0x11, 0xab, 0x3a, - 0x12, 0x4b, 0x67, 0x4c, 0x71, 0x5d, 0x87, 0x8b, 0x88, 0xf5, 0xae, 0xe8, 0x3a, 0xc5, 0x66, 0xdf, - 0xa0, 0xba, 0x68, 0xe5, 0x00, 0x1e, 0xaf, 0x5e, 0xbe, 0xd7, 0x4a, 0xde, 0x87, 0x47, 0x6d, 0xd2, - 0x6b, 0x5c, 0xfd, 0x3f, 0xbd, 0xa6, 0x04, 0x59, 0xdc, 0x99, 0x71, 0x71, 0x27, 0xe7, 0x75, 0x15, - 0x9e, 0x42, 0xac, 0x1d, 0xb7, 0x5d, 0x6c, 0xf5, 0x5b, 0x54, 0x14, 0x14, 0x12, 0xfa, 0xcb, 0x50, - 0x52, 0xcf, 0x98, 0x6c, 0x79, 0x2e, 0x4b, 0xbe, 0xe3, 0xb6, 0x63, 0x70, 0x54, 0x9a, 0x1f, 0xd3, - 0xbb, 0xdc, 0xf6, 0x3c, 0xb5, 0x36, 0x69, 0x97, 0x7f, 0x64, 0x83, 0x32, 0xea, 0xf8, 0x19, 0xd2, - 0x99, 0xf1, 0x48, 0x27, 0xe7, 0x70, 0x8d, 0x8e, 0xbc, 0x2b, 0x83, 0x0f, 0x84, 0xd7, 0xbf, 0xd0, - 0x1c, 0x4a, 0xaa, 0x94, 0x64, 0x32, 0x7e, 0x36, 0x1b, 0x44, 0xdf, 0x97, 0x12, 0xfd, 0x1b, 0x30, - 0xbf, 0x2f, 0x83, 0x3d, 0xd5, 0x12, 0xc9, 0x9c, 0xe7, 0xb3, 0x27, 0xd8, 0xd5, 0x3d, 0x93, 0x0e, - 0x51, 0xde, 0xd7, 0x31, 0x4c, 0x01, 0x97, 0x62, 0x47, 0x28, 0xec, 0xc4, 0x5d, 0xff, 0x95, 0xc1, - 0x62, 0x36, 0xc7, 0xb9, 0xec, 0x33, 0xff, 0x86, 0x7d, 0x72, 0x35, 0x58, 0xa7, 0xcb, 0x7b, 0xd3, - 0x77, 0xa3, 0xf8, 0xf4, 0x8b, 0x50, 0x16, 0xed, 0x76, 0xe0, 0x84, 0x21, 0xd5, 0x20, 0xfe, 0x6a, - 0x56, 0xa9, 0xab, 0x68, 0x35, 0x9d, 0x83, 0x43, 0x49, 0x4d, 0x1d, 0xd4, 0xce, 0x37, 0xf0, 0x73, - 0xb2, 0x69, 0x28, 0xed, 0xc4, 0x8d, 0x7d, 0x98, 0x68, 0x1a, 0x94, 0x60, 0x70, 0x9f, 0x89, 0x26, - 0xe7, 0x3e, 0x2b, 0x79, 0x7c, 0x9f, 0x95, 0x72, 0x72, 0x5e, 0x7e, 0x01, 0x06, 0x32, 0xdd, 0x72, - 0xc3, 0xe8, 0xbd, 0xbb, 0xbe, 0xd3, 0x4e, 0xf5, 0xcb, 0x5c, 0x57, 0x87, 0x4c, 0x99, 0xfe, 0xcf, - 0xa6, 0xfc, 0xc2, 0xe0, 0xf2, 0xb9, 0x00, 0x8f, 0x43, 0x3f, 0xdd, 0xfc, 0xee, 0x02, 0xcc, 0x22, - 0x1d, 0x7f, 0xc0, 0x60, 0x4e, 0xff, 0x98, 0xe0, 0xd7, 0xb2, 0x0c, 0xd9, 0xdf, 0x2c, 0xc6, 0xf2, - 0x08, 0x95, 0xce, 0x66, 0xae, 0x3d, 0xf8, 0xfd, 0xef, 0x9f, 0xa6, 0x97, 0xf9, 0x92, 0xfd, 0xa9, - 0x68, 0x7d, 0x26, 0xbc, 0x7a, 0x5b, 0x48, 0x5b, 0xef, 0xac, 0x0f, 0xff, 0x72, 0xe3, 0x5f, 0x33, - 0x98, 0xc5, 0xe3, 0x72, 0x33, 0x27, 0x7a, 0x62, 0xc8, 0x1a, 0x4b, 0x85, 0x1a, 0xca, 0xbf, 0x89, - 0xf9, 0xd7, 0xf9, 0x6a, 0x61, 0x7e, 0xb4, 0xd5, 0x3e, 0xc2, 0xd9, 0x71, 0xcc, 0xbf, 0x65, 0x30, - 0x8f, 0x18, 0xdb, 0x9e, 0xc7, 0x57, 0x72, 0xb2, 0x0c, 0x8d, 0x5e, 0xa3, 0x3a, 0x52, 0x47, 0x44, - 0xab, 0x48, 0x74, 0x8d, 0x9b, 0xa3, 0x89, 0xf8, 0x97, 0x0c, 0x4a, 0xaa, 0xd7, 0xf3, 0xab, 0x39, - 0xd1, 0x07, 0x83, 0xd0, 0x30, 0x8b, 0x24, 0x94, 0x7b, 0x03, 0x73, 0xaf, 0xf1, 0x5a, 0x61, 0x6e, - 0x35, 0x51, 0xfa, 0x66, 0x7c, 0xc5, 0xa0, 0xac, 0x10, 0x94, 0x17, 0xcb, 0xf9, 0x67, 0x4c, 0xcc, - 0x47, 0x63, 0x65, 0x94, 0x8c, 0x68, 0x6a, 0x48, 0xb3, 0xc4, 0xaf, 0x8e, 0xa4, 0xe1, 0xdf, 0x33, - 0x28, 0x53, 0xb3, 0xce, 0xa5, 0x48, 0x8f, 0xac, 0x5c, 0x8a, 0xa1, 0x71, 0x65, 0xbe, 0x82, 0x14, - 0x16, 0x5f, 0x2f, 0xa4, 0x88, 0xa7, 0x82, 0x7d, 0xa4, 0x2a, 0x73, 0xcc, 0x1f, 0x32, 0x00, 0x8a, - 0xa4, 0x9c, 0xa9, 0xe5, 0x1f, 0x79, 0x68, 0x8e, 0x19, 0xab, 0xe3, 0x48, 0x89, 0xad, 0x8e, 0x6c, - 0x55, 0xbe, 0x3c, 0x16, 0x9b, 0x7a, 0x3f, 0x25, 0xd5, 0x4a, 0x73, 0x9f, 0x4f, 0x62, 0xa2, 0xe4, - 0x3e, 0x9f, 0xe4, 0x1c, 0x31, 0xb7, 0x10, 0xa0, 0xce, 0xd7, 0x0a, 0x01, 0x54, 0xcb, 0xb6, 0x8f, - 0xa8, 0x75, 0x1e, 0xf3, 0x6f, 0x18, 0x94, 0x55, 0x94, 0x11, 0xcf, 0x27, 0x39, 0x84, 0x8a, 0x9e, - 0x4f, 0x6a, 0x96, 0x8c, 0x79, 0x69, 0x70, 0x88, 0xfc, 0xc6, 0xe0, 0xc9, 0x74, 0xdb, 0xe5, 0xeb, - 0x39, 0x69, 0xce, 0x1d, 0x0f, 0x46, 0x7d, 0x4c, 0x35, 0xa1, 0xbd, 0x89, 0x68, 0xaf, 0xf3, 0xd7, - 0x0a, 0xd1, 0x3c, 0x37, 0x8c, 0xf6, 0xa4, 0xda, 0xbd, 0x47, 0x6d, 0x27, 0x36, 0x6e, 0xe7, 0xc6, - 0xa3, 0xd3, 0x0a, 0x3b, 0x39, 0xad, 0xb0, 0xbf, 0x4e, 0x2b, 0xec, 0x87, 0xb3, 0xca, 0xd4, 0xc9, - 0x59, 0x65, 0xea, 0x8f, 0xb3, 0xca, 0xd4, 0x47, 0x56, 0xc7, 0x8d, 0x0e, 0x0e, 0x9b, 0x56, 0x4b, - 0x76, 0x29, 0xf8, 0x2d, 0xd1, 0x0c, 0xd3, 0xc1, 0xef, 0x61, 0xf8, 0xe8, 0x7e, 0xcf, 0x09, 0x9b, - 0x73, 0xf8, 0xef, 0xe6, 0xd6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xc0, 0xdd, 0x14, 0xb5, - 0x0f, 0x00, 0x00, + // 980 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x97, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xc7, 0xb3, 0x89, 0xf3, 0xa3, 0x0f, 0x09, 0xca, 0x10, 0xda, 0xb0, 0x6d, 0x37, 0xcd, 0x96, + 0xd8, 0x4e, 0xd5, 0xec, 0x36, 0x8d, 0xe0, 0x00, 0xa7, 0x5a, 0x28, 0x80, 0x54, 0xa0, 0x98, 0x1b, + 0x12, 0x84, 0xb1, 0x77, 0xe3, 0x0c, 0xac, 0x77, 0xdc, 0x9d, 0x0d, 0x6d, 0x15, 0xa5, 0x45, 0xe5, + 0x86, 0x38, 0x00, 0x3d, 0x22, 0xf1, 0x07, 0xf0, 0x97, 0xf4, 0x58, 0x89, 0x0b, 0x17, 0x10, 0x4a, + 0xf8, 0x43, 0xd0, 0xcc, 0xbc, 0x8d, 0xf7, 0x47, 0xc6, 0x36, 0x95, 0x6f, 0x76, 0xe6, 0x3b, 0xef, + 0xfb, 0x99, 0x37, 0x6f, 0xde, 0x8b, 0xe1, 0x72, 0x97, 0xc6, 0x2c, 0x0e, 0x77, 0xbb, 0xfb, 0x94, + 0xc5, 0x7e, 0x12, 0x0b, 0xff, 0xde, 0x41, 0x98, 0x3c, 0xf4, 0x06, 0x09, 0x4f, 0x39, 0x39, 0x9f, + 0x5f, 0xf5, 0x92, 0x58, 0xd8, 0xcb, 0x3d, 0xde, 0xe3, 0x6a, 0xd1, 0x97, 0x9f, 0xb4, 0xce, 0xbe, + 0xdc, 0xe3, 0xbc, 0x17, 0x85, 0x3e, 0x1d, 0x30, 0x9f, 0xc6, 0x31, 0x4f, 0x69, 0xca, 0x78, 0x2c, + 0x70, 0xf5, 0x7a, 0x97, 0x8b, 0x3e, 0x17, 0x7e, 0x87, 0x8a, 0x50, 0x87, 0xf7, 0xbf, 0xdd, 0xea, + 0x84, 0x29, 0xdd, 0xf2, 0x07, 0xb4, 0xc7, 0x62, 0x25, 0x46, 0xed, 0x95, 0x0a, 0xcf, 0x80, 0x26, + 0xb4, 0x9f, 0x85, 0xaa, 0xe2, 0xde, 0xdf, 0xe7, 0xcc, 0xbc, 0x1a, 0xd3, 0x7e, 0x98, 0xad, 0x5e, + 0xaa, 0xac, 0x76, 0x58, 0x90, 0x2d, 0x3a, 0x95, 0xc5, 0x3d, 0x9e, 0x08, 0x1a, 0x85, 0xc6, 0xcd, + 0x2c, 0x66, 0xa9, 0x5e, 0x74, 0x97, 0x81, 0x7c, 0x2a, 0x8f, 0x75, 0x57, 0xa1, 0xb6, 0xc3, 0x7b, + 0x07, 0xa1, 0x48, 0xdd, 0x8f, 0xe0, 0xb5, 0xc2, 0x5f, 0xc5, 0x80, 0xc7, 0x22, 0x24, 0x6f, 0xc3, + 0x82, 0x3e, 0xd2, 0x8a, 0x75, 0xd5, 0x6a, 0xbe, 0x74, 0x6b, 0xc5, 0x2b, 0x27, 0xd9, 0xd3, 0x3b, + 0x5a, 0xb5, 0x67, 0x7f, 0xaf, 0xce, 0xb4, 0x51, 0xed, 0x36, 0xe1, 0xbc, 0x0a, 0xf7, 0x31, 0xed, + 0x87, 0x68, 0x41, 0x96, 0x61, 0x9e, 0xc5, 0x41, 0xf8, 0x40, 0x85, 0x3a, 0xd7, 0xd6, 0x5f, 0xdc, + 0x1d, 0x78, 0x35, 0xa7, 0x44, 0xdb, 0x2d, 0xa8, 0xc9, 0x64, 0xa0, 0xe9, 0xc5, 0xaa, 0xa9, 0x54, + 0x67, 0x9e, 0x4a, 0xea, 0x7e, 0x09, 0xcb, 0x2a, 0xce, 0xed, 0x28, 0x52, 0x8b, 0x99, 0xeb, 0x0e, + 0xc0, 0xf0, 0xde, 0x30, 0x60, 0xdd, 0xd3, 0x97, 0xec, 0xc9, 0x4b, 0xf6, 0x74, 0x0d, 0xe1, 0x25, + 0x7b, 0x77, 0x69, 0x2f, 0x23, 0x6e, 0xe7, 0x76, 0xba, 0x4f, 0x2d, 0x78, 0xbd, 0x64, 0x50, 0x81, + 0x9d, 0x9b, 0x10, 0x96, 0xbc, 0x5f, 0x80, 0x9a, 0x55, 0x50, 0x8d, 0xb1, 0x50, 0xda, 0xaf, 0x40, + 0xd5, 0x80, 0x57, 0x14, 0x54, 0x8b, 0x05, 0xa3, 0xd3, 0xfc, 0x1e, 0x5e, 0x88, 0x12, 0x22, 0xf8, + 0x4d, 0xa8, 0xc9, 0xa2, 0xc2, 0xa4, 0x5c, 0xa8, 0x82, 0xb7, 0x58, 0x70, 0xca, 0x2d, 0x95, 0xee, + 0x17, 0x58, 0x25, 0xb7, 0xa3, 0x48, 0xae, 0x4d, 0x3b, 0xc7, 0x3f, 0x5b, 0xc3, 0x4b, 0xd4, 0xf1, + 0x2b, 0xa4, 0x73, 0x93, 0x91, 0x4e, 0x2f, 0xc3, 0x1b, 0x78, 0xe4, 0x1d, 0x9e, 0x7c, 0x46, 0xa3, + 0xd3, 0x62, 0x26, 0xb9, 0x0a, 0x3d, 0x87, 0x25, 0xd8, 0x46, 0xfa, 0x53, 0x29, 0xd2, 0xbf, 0x03, + 0x4b, 0x7b, 0x3c, 0xd9, 0x95, 0x0f, 0x14, 0x93, 0xf3, 0x46, 0xf5, 0x04, 0x3b, 0xfa, 0x05, 0xe3, + 0x21, 0x16, 0xf7, 0x74, 0x0c, 0xf7, 0x2b, 0xb8, 0x90, 0x65, 0xa4, 0x44, 0x30, 0xad, 0xa4, 0xff, + 0x66, 0xc1, 0xc5, 0x8a, 0xc5, 0x99, 0xe4, 0x73, 0xff, 0x87, 0x7c, 0x7a, 0x37, 0x70, 0x03, 0x4b, + 0xf7, 0xc3, 0x98, 0xa5, 0xd9, 0xe1, 0x57, 0x60, 0x91, 0x06, 0x41, 0x12, 0x0a, 0x81, 0x37, 0x90, + 0x7d, 0x75, 0x1b, 0xd8, 0x4f, 0xb4, 0x1a, 0xcf, 0x41, 0xa0, 0x26, 0x3b, 0xa0, 0xd2, 0x2e, 0xb5, + 0xd5, 0xe7, 0x7c, 0xc3, 0x90, 0xda, 0xa9, 0x17, 0xf3, 0x2f, 0xb9, 0x86, 0x81, 0x06, 0xc3, 0x6a, + 0x46, 0x1a, 0x43, 0x35, 0x4b, 0x79, 0x56, 0xcd, 0x52, 0x39, 0xbd, 0x5c, 0x3e, 0x02, 0x5b, 0x31, + 0xdd, 0x61, 0x22, 0xfd, 0xe4, 0x7e, 0x1c, 0x06, 0x85, 0x5e, 0x69, 0xcc, 0x6a, 0x29, 0x29, 0xb3, + 0x2f, 0x9c, 0x94, 0x5f, 0x2d, 0xb8, 0x74, 0x26, 0x00, 0xa6, 0x66, 0x1b, 0xe6, 0xd5, 0x14, 0x9c, + 0xac, 0x99, 0x6a, 0xed, 0xd4, 0xb2, 0x73, 0xeb, 0x2f, 0x80, 0x79, 0x45, 0x47, 0x1e, 0xc1, 0x82, + 0x9e, 0x6b, 0xe4, 0xcd, 0x2a, 0x42, 0x75, 0x7c, 0xda, 0xeb, 0x63, 0x54, 0xda, 0xcc, 0x6d, 0x3c, + 0xf9, 0xe3, 0xdf, 0xa7, 0xb3, 0x6b, 0x64, 0xd5, 0xff, 0x9a, 0x76, 0xbf, 0xa1, 0x91, 0xaf, 0x77, + 0x6d, 0x96, 0xff, 0x81, 0x20, 0x8f, 0xa1, 0x26, 0x0f, 0x4a, 0x5c, 0x43, 0xdc, 0xdc, 0x5c, 0xb5, + 0xaf, 0x8d, 0xd4, 0xa0, 0xb3, 0xa7, 0x9c, 0x9b, 0xa4, 0x6e, 0x74, 0x56, 0xb9, 0xf4, 0x0f, 0xd5, + 0xb8, 0x38, 0x22, 0xdf, 0x5b, 0xb0, 0x94, 0x4d, 0x3a, 0x52, 0x37, 0x38, 0x94, 0x66, 0xad, 0xdd, + 0x18, 0xab, 0x43, 0x9a, 0xba, 0xa2, 0xb9, 0x4a, 0x9c, 0xd1, 0x34, 0xe4, 0x10, 0xe6, 0x5a, 0x2c, + 0x20, 0x6b, 0x86, 0xb8, 0xc3, 0xa9, 0x67, 0xbb, 0xa3, 0x24, 0xe8, 0xba, 0xa9, 0x5c, 0x1b, 0x64, + 0xdd, 0xe8, 0x2a, 0x47, 0xc7, 0x69, 0x0a, 0x1e, 0xc3, 0x22, 0xce, 0x21, 0xb2, 0x6e, 0x3e, 0x58, + 0x6e, 0x0e, 0xda, 0xf5, 0x71, 0x32, 0x04, 0x59, 0x57, 0x20, 0xab, 0xe4, 0xca, 0x48, 0x10, 0xf2, + 0x83, 0x05, 0x8b, 0xd8, 0x91, 0x8d, 0x04, 0xc5, 0xa1, 0x60, 0x24, 0x28, 0x35, 0x76, 0xf7, 0xa6, + 0x22, 0xb8, 0x4e, 0x9a, 0x46, 0x82, 0xac, 0xef, 0xfb, 0x87, 0xf2, 0x2a, 0x8e, 0xc8, 0x8f, 0x16, + 0xc0, 0x70, 0x42, 0x90, 0xa6, 0xf9, 0xa8, 0x25, 0xa4, 0x8d, 0x09, 0x94, 0x48, 0xb5, 0xa1, 0xa8, + 0xae, 0x91, 0xb5, 0xb1, 0x54, 0xe4, 0x3b, 0x0b, 0x6a, 0xb2, 0x4d, 0x1a, 0x5f, 0x48, 0x6e, 0x5a, + 0x18, 0x5f, 0x48, 0x7e, 0x46, 0xb8, 0xbe, 0x32, 0xdf, 0x20, 0x0d, 0xa3, 0xb9, 0x6c, 0xc5, 0xfe, + 0x21, 0xb6, 0xc4, 0x23, 0xf2, 0x44, 0x3f, 0x11, 0xd5, 0xdb, 0x47, 0x3d, 0x91, 0xfc, 0x74, 0x19, + 0xf5, 0x44, 0x0a, 0x43, 0x62, 0x82, 0x1a, 0x51, 0x93, 0xe1, 0x77, 0x0b, 0x5e, 0x2e, 0xf6, 0x52, + 0x72, 0xc3, 0x60, 0x71, 0x66, 0xcf, 0xb7, 0x37, 0x27, 0x54, 0x23, 0xd6, 0xbb, 0x0a, 0xeb, 0x2d, + 0xb2, 0x6d, 0xc4, 0x8a, 0x98, 0x48, 0x77, 0xb9, 0xdc, 0xb9, 0x8b, 0x2d, 0x25, 0xcb, 0x58, 0xeb, + 0x83, 0x67, 0xc7, 0x8e, 0xf5, 0xfc, 0xd8, 0xb1, 0xfe, 0x39, 0x76, 0xac, 0x9f, 0x4e, 0x9c, 0x99, + 0xe7, 0x27, 0xce, 0xcc, 0x9f, 0x27, 0xce, 0xcc, 0xe7, 0x5e, 0x8f, 0xa5, 0xfb, 0x07, 0x1d, 0xaf, + 0xcb, 0xfb, 0x18, 0xf8, 0x0e, 0xed, 0x88, 0x62, 0xf0, 0x07, 0x2a, 0x7c, 0xfa, 0x70, 0x10, 0x8a, + 0xce, 0x82, 0xfa, 0x2d, 0xb3, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xf2, 0x24, 0x56, + 0x12, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1250,21 +1059,21 @@ type QueryClient interface { // Parameters queries the parameters of the module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Queries a Name by index. - Names(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) + Name(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) // Queries a list of Names. - NamesAll(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) + AllNames(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) // Queries a Bid by index. - Bids(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) + Bid(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) // Queries a list of Bids. - BidsAll(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) + AllBids(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) // Queries a Listing by index. ForSale(ctx context.Context, in *QueryForSaleRequest, opts ...grpc.CallOption) (*QueryForSaleResponse, error) // Queries all Listings. - ForSaleAll(ctx context.Context, in *QueryAllForSalesRequest, opts ...grpc.CallOption) (*QueryAllForSalesResponse, error) + AllForSale(ctx context.Context, in *QueryAllForSaleRequest, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) // Queries a Init by index. Init(ctx context.Context, in *QueryInitRequest, opts ...grpc.CallOption) (*QueryInitResponse, error) // Queries a list of Init items. - InitAll(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) + AllInits(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) // Queries a list of ListOwnedNames items. ListOwnedNames(ctx context.Context, in *QueryListOwnedNamesRequest, opts ...grpc.CallOption) (*QueryListOwnedNamesResponse, error) } @@ -1286,36 +1095,36 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) Names(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) { +func (c *queryClient) Name(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) { out := new(QueryNameResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Names", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Name", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) NamesAll(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) { +func (c *queryClient) AllNames(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) { out := new(QueryAllNamesResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/NamesAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllNames", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Bids(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) { +func (c *queryClient) Bid(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) { out := new(QueryBidResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Bids", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Bid", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) BidsAll(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) { +func (c *queryClient) AllBids(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) { out := new(QueryAllBidsResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/BidsAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllBids", in, out, opts...) if err != nil { return nil, err } @@ -1331,9 +1140,9 @@ func (c *queryClient) ForSale(ctx context.Context, in *QueryForSaleRequest, opts return out, nil } -func (c *queryClient) ForSaleAll(ctx context.Context, in *QueryAllForSalesRequest, opts ...grpc.CallOption) (*QueryAllForSalesResponse, error) { - out := new(QueryAllForSalesResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ForSaleAll", in, out, opts...) +func (c *queryClient) AllForSale(ctx context.Context, in *QueryAllForSaleRequest, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) { + out := new(QueryAllForSaleResponse) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllForSale", in, out, opts...) if err != nil { return nil, err } @@ -1349,9 +1158,9 @@ func (c *queryClient) Init(ctx context.Context, in *QueryInitRequest, opts ...gr return out, nil } -func (c *queryClient) InitAll(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) { +func (c *queryClient) AllInits(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) { out := new(QueryAllInitsResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/InitAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllInits", in, out, opts...) if err != nil { return nil, err } @@ -1372,21 +1181,21 @@ type QueryServer interface { // Parameters queries the parameters of the module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) // Queries a Name by index. - Names(context.Context, *QueryNameRequest) (*QueryNameResponse, error) + Name(context.Context, *QueryNameRequest) (*QueryNameResponse, error) // Queries a list of Names. - NamesAll(context.Context, *QueryAllNamesRequest) (*QueryAllNamesResponse, error) + AllNames(context.Context, *QueryAllNamesRequest) (*QueryAllNamesResponse, error) // Queries a Bid by index. - Bids(context.Context, *QueryBidRequest) (*QueryBidResponse, error) + Bid(context.Context, *QueryBidRequest) (*QueryBidResponse, error) // Queries a list of Bids. - BidsAll(context.Context, *QueryAllBidsRequest) (*QueryAllBidsResponse, error) + AllBids(context.Context, *QueryAllBidsRequest) (*QueryAllBidsResponse, error) // Queries a Listing by index. ForSale(context.Context, *QueryForSaleRequest) (*QueryForSaleResponse, error) // Queries all Listings. - ForSaleAll(context.Context, *QueryAllForSalesRequest) (*QueryAllForSalesResponse, error) + AllForSale(context.Context, *QueryAllForSaleRequest) (*QueryAllForSaleResponse, error) // Queries a Init by index. Init(context.Context, *QueryInitRequest) (*QueryInitResponse, error) // Queries a list of Init items. - InitAll(context.Context, *QueryAllInitsRequest) (*QueryAllInitsResponse, error) + AllInits(context.Context, *QueryAllInitsRequest) (*QueryAllInitsResponse, error) // Queries a list of ListOwnedNames items. ListOwnedNames(context.Context, *QueryListOwnedNamesRequest) (*QueryListOwnedNamesResponse, error) } @@ -1398,29 +1207,29 @@ type UnimplementedQueryServer struct { func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) Names(ctx context.Context, req *QueryNameRequest) (*QueryNameResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Names not implemented") +func (*UnimplementedQueryServer) Name(ctx context.Context, req *QueryNameRequest) (*QueryNameResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Name not implemented") } -func (*UnimplementedQueryServer) NamesAll(ctx context.Context, req *QueryAllNamesRequest) (*QueryAllNamesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method NamesAll not implemented") +func (*UnimplementedQueryServer) AllNames(ctx context.Context, req *QueryAllNamesRequest) (*QueryAllNamesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllNames not implemented") } -func (*UnimplementedQueryServer) Bids(ctx context.Context, req *QueryBidRequest) (*QueryBidResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Bids not implemented") +func (*UnimplementedQueryServer) Bid(ctx context.Context, req *QueryBidRequest) (*QueryBidResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Bid not implemented") } -func (*UnimplementedQueryServer) BidsAll(ctx context.Context, req *QueryAllBidsRequest) (*QueryAllBidsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method BidsAll not implemented") +func (*UnimplementedQueryServer) AllBids(ctx context.Context, req *QueryAllBidsRequest) (*QueryAllBidsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllBids not implemented") } func (*UnimplementedQueryServer) ForSale(ctx context.Context, req *QueryForSaleRequest) (*QueryForSaleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ForSale not implemented") } -func (*UnimplementedQueryServer) ForSaleAll(ctx context.Context, req *QueryAllForSalesRequest) (*QueryAllForSalesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ForSaleAll not implemented") +func (*UnimplementedQueryServer) AllForSale(ctx context.Context, req *QueryAllForSaleRequest) (*QueryAllForSaleResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllForSale not implemented") } func (*UnimplementedQueryServer) Init(ctx context.Context, req *QueryInitRequest) (*QueryInitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Init not implemented") } -func (*UnimplementedQueryServer) InitAll(ctx context.Context, req *QueryAllInitsRequest) (*QueryAllInitsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method InitAll not implemented") +func (*UnimplementedQueryServer) AllInits(ctx context.Context, req *QueryAllInitsRequest) (*QueryAllInitsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllInits not implemented") } func (*UnimplementedQueryServer) ListOwnedNames(ctx context.Context, req *QueryListOwnedNamesRequest) (*QueryListOwnedNamesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListOwnedNames not implemented") @@ -1448,74 +1257,74 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } -func _Query_Names_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_Name_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryNameRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Names(ctx, in) + return srv.(QueryServer).Name(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/Names", + FullMethod: "/canine_chain.rns.Query/Name", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Names(ctx, req.(*QueryNameRequest)) + return srv.(QueryServer).Name(ctx, req.(*QueryNameRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_NamesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllNames_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllNamesRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).NamesAll(ctx, in) + return srv.(QueryServer).AllNames(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/NamesAll", + FullMethod: "/canine_chain.rns.Query/AllNames", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).NamesAll(ctx, req.(*QueryAllNamesRequest)) + return srv.(QueryServer).AllNames(ctx, req.(*QueryAllNamesRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Bids_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_Bid_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryBidRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Bids(ctx, in) + return srv.(QueryServer).Bid(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/Bids", + FullMethod: "/canine_chain.rns.Query/Bid", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Bids(ctx, req.(*QueryBidRequest)) + return srv.(QueryServer).Bid(ctx, req.(*QueryBidRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_BidsAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllBids_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllBidsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).BidsAll(ctx, in) + return srv.(QueryServer).AllBids(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/BidsAll", + FullMethod: "/canine_chain.rns.Query/AllBids", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).BidsAll(ctx, req.(*QueryAllBidsRequest)) + return srv.(QueryServer).AllBids(ctx, req.(*QueryAllBidsRequest)) } return interceptor(ctx, in, info, handler) } @@ -1538,20 +1347,20 @@ func _Query_ForSale_Handler(srv interface{}, ctx context.Context, dec func(inter return interceptor(ctx, in, info, handler) } -func _Query_ForSaleAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllForSalesRequest) +func _Query_AllForSale_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllForSaleRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).ForSaleAll(ctx, in) + return srv.(QueryServer).AllForSale(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/ForSaleAll", + FullMethod: "/canine_chain.rns.Query/AllForSale", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ForSaleAll(ctx, req.(*QueryAllForSalesRequest)) + return srv.(QueryServer).AllForSale(ctx, req.(*QueryAllForSaleRequest)) } return interceptor(ctx, in, info, handler) } @@ -1574,20 +1383,20 @@ func _Query_Init_Handler(srv interface{}, ctx context.Context, dec func(interfac return interceptor(ctx, in, info, handler) } -func _Query_InitAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllInits_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllInitsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).InitAll(ctx, in) + return srv.(QueryServer).AllInits(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Query/InitAll", + FullMethod: "/canine_chain.rns.Query/AllInits", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).InitAll(ctx, req.(*QueryAllInitsRequest)) + return srv.(QueryServer).AllInits(ctx, req.(*QueryAllInitsRequest)) } return interceptor(ctx, in, info, handler) } @@ -1619,36 +1428,36 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_Params_Handler, }, { - MethodName: "Names", - Handler: _Query_Names_Handler, + MethodName: "Name", + Handler: _Query_Name_Handler, }, { - MethodName: "NamesAll", - Handler: _Query_NamesAll_Handler, + MethodName: "AllNames", + Handler: _Query_AllNames_Handler, }, { - MethodName: "Bids", - Handler: _Query_Bids_Handler, + MethodName: "Bid", + Handler: _Query_Bid_Handler, }, { - MethodName: "BidsAll", - Handler: _Query_BidsAll_Handler, + MethodName: "AllBids", + Handler: _Query_AllBids_Handler, }, { MethodName: "ForSale", Handler: _Query_ForSale_Handler, }, { - MethodName: "ForSaleAll", - Handler: _Query_ForSaleAll_Handler, + MethodName: "AllForSale", + Handler: _Query_AllForSale_Handler, }, { MethodName: "Init", Handler: _Query_Init_Handler, }, { - MethodName: "InitAll", - Handler: _Query_InitAll_Handler, + MethodName: "AllInits", + Handler: _Query_AllInits_Handler, }, { MethodName: "ListOwnedNames", @@ -1715,7 +1524,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryWhoisRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryNameRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1725,12 +1534,12 @@ func (m *QueryWhoisRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryWhoisRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryNameRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryWhoisRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryNameRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1745,7 +1554,7 @@ func (m *QueryWhoisRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryWhoisResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryNameResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1755,18 +1564,18 @@ func (m *QueryWhoisResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryWhoisResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryNameResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryWhoisResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryNameResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Whois.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Name.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1778,7 +1587,7 @@ func (m *QueryWhoisResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllWhoisRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllNamesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1788,12 +1597,12 @@ func (m *QueryAllWhoisRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllWhoisRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllNamesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllWhoisRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1813,7 +1622,7 @@ func (m *QueryAllWhoisRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllWhoisResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllNamesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1823,12 +1632,12 @@ func (m *QueryAllWhoisResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllWhoisResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllNamesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllWhoisResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllNamesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1845,10 +1654,10 @@ func (m *QueryAllWhoisResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Whois) > 0 { - for iNdEx := len(m.Whois) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Name) > 0 { + for iNdEx := len(m.Name) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Whois[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Name[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1862,7 +1671,7 @@ func (m *QueryAllWhoisResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryNameRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryBidRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1872,12 +1681,12 @@ func (m *QueryNameRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryNameRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryBidRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryNameRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryBidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1892,7 +1701,7 @@ func (m *QueryNameRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryNameResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryBidResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1902,18 +1711,18 @@ func (m *QueryNameResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryNameResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryBidResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryNameResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryBidResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Names.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Bids.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1925,7 +1734,7 @@ func (m *QueryNameResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllNamesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllBidsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1935,12 +1744,12 @@ func (m *QueryAllNamesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllNamesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllBidsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllBidsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1960,7 +1769,7 @@ func (m *QueryAllNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllNamesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllBidsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1970,12 +1779,12 @@ func (m *QueryAllNamesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllNamesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllBidsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllNamesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1992,10 +1801,10 @@ func (m *QueryAllNamesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Names) > 0 { - for iNdEx := len(m.Names) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Bids) > 0 { + for iNdEx := len(m.Bids) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Names[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Bids[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2009,7 +1818,7 @@ func (m *QueryAllNamesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryBidRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2019,27 +1828,27 @@ func (m *QueryBidRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryBidRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryForSaleRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryBidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Name))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryBidResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryForSaleResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2049,18 +1858,18 @@ func (m *QueryBidResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryBidResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryForSaleResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryBidResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Bids.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ForSale.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2072,7 +1881,7 @@ func (m *QueryBidResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllBidsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllForSaleRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2082,12 +1891,12 @@ func (m *QueryAllBidsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllBidsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllForSaleRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllBidsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2107,7 +1916,7 @@ func (m *QueryAllBidsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllBidsResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllForSaleResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2117,12 +1926,12 @@ func (m *QueryAllBidsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllBidsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllForSaleResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2139,10 +1948,10 @@ func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Bids) > 0 { - for iNdEx := len(m.Bids) - 1; iNdEx >= 0; iNdEx-- { + if len(m.ForSale) > 0 { + for iNdEx := len(m.ForSale) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Bids[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ForSale[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2156,7 +1965,7 @@ func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryInitRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2166,27 +1975,27 @@ func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryForSaleRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryInitRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryInitRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Name))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryForSaleResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryInitResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2196,159 +2005,12 @@ func (m *QueryForSaleResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryForSaleResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryInitResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.ForSale.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *QueryAllForSalesRequest) 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 *QueryAllForSalesRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryAllForSalesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryAllForSalesResponse) 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 *QueryAllForSalesResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryAllForSalesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.ForSale) > 0 { - for iNdEx := len(m.ForSale) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ForSale[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *QueryInitRequest) 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 *QueryInitRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryInitRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryInitResponse) 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 *QueryInitResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryInitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryInitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2572,62 +2234,6 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryWhoisRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Index) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryWhoisResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Whois.Size() - n += 1 + l + sovQuery(uint64(l)) - return n -} - -func (m *QueryAllWhoisRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryAllWhoisResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Whois) > 0 { - for _, e := range m.Whois { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - func (m *QueryNameRequest) Size() (n int) { if m == nil { return 0 @@ -2647,7 +2253,7 @@ func (m *QueryNameResponse) Size() (n int) { } var l int _ = l - l = m.Names.Size() + l = m.Name.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -2671,8 +2277,8 @@ func (m *QueryAllNamesResponse) Size() (n int) { } var l int _ = l - if len(m.Names) > 0 { - for _, e := range m.Names { + if len(m.Name) > 0 { + for _, e := range m.Name { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -2764,7 +2370,7 @@ func (m *QueryForSaleResponse) Size() (n int) { return n } -func (m *QueryAllForSalesRequest) Size() (n int) { +func (m *QueryAllForSaleRequest) Size() (n int) { if m == nil { return 0 } @@ -2777,7 +2383,7 @@ func (m *QueryAllForSalesRequest) Size() (n int) { return n } -func (m *QueryAllForSalesResponse) Size() (n int) { +func (m *QueryAllForSaleResponse) Size() (n int) { if m == nil { return 0 } @@ -3028,7 +2634,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryWhoisRequest) Unmarshal(dAtA []byte) error { +func (m *QueryNameRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3051,10 +2657,10 @@ func (m *QueryWhoisRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryWhoisRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryNameRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryWhoisRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryNameRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3110,7 +2716,7 @@ func (m *QueryWhoisRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryWhoisResponse) Unmarshal(dAtA []byte) error { +func (m *QueryNameResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3133,15 +2739,15 @@ func (m *QueryWhoisResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryWhoisResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryNameResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryWhoisResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryNameResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Whois", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3168,7 +2774,7 @@ func (m *QueryWhoisResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Whois.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Name.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3193,7 +2799,7 @@ func (m *QueryWhoisResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllWhoisRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllNamesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3216,10 +2822,10 @@ func (m *QueryAllWhoisRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllWhoisRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllNamesRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllWhoisRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllNamesRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3279,7 +2885,7 @@ func (m *QueryAllWhoisRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllWhoisResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllNamesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3302,49 +2908,15 @@ func (m *QueryAllWhoisResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllWhoisResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllNamesResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllWhoisResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllNamesResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Whois", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Whois = append(m.Whois, Whois{}) - if err := m.Whois[len(m.Whois)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3371,345 +2943,8 @@ func (m *QueryAllWhoisResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryNameRequest) 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: QueryNameRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryNameRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Index = string(dAtA[iNdEx:postIndex]) - 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 *QueryNameResponse) 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: QueryNameResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryNameResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Names", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Names.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllNamesRequest) 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: QueryAllNamesRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllNamesRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllNamesResponse) 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: QueryAllNamesResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllNamesResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Names", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Names = append(m.Names, Names{}) - if err := m.Names[len(m.Names)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Name = append(m.Name, Names{}) + if err := m.Name[len(m.Name)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4306,7 +3541,7 @@ func (m *QueryForSaleResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllForSalesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllForSaleRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4329,10 +3564,10 @@ func (m *QueryAllForSalesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllForSalesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllForSaleRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllForSalesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllForSaleRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4392,7 +3627,7 @@ func (m *QueryAllForSalesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllForSalesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllForSaleResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4415,10 +3650,10 @@ func (m *QueryAllForSalesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllForSalesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllForSaleResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllForSalesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllForSaleResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/rns/types/query.pb.gw.go b/x/rns/types/query.pb.gw.go index e137d0402..ac9568d78 100644 --- a/x/rns/types/query.pb.gw.go +++ b/x/rns/types/query.pb.gw.go @@ -51,7 +51,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } -func request_Query_Names_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryNameRequest var metadata runtime.ServerMetadata @@ -73,12 +73,12 @@ func request_Query_Names_0(ctx context.Context, marshaler runtime.Marshaler, cli return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) } - msg, err := client.Names(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.Name(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Names_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryNameRequest var metadata runtime.ServerMetadata @@ -100,48 +100,48 @@ func local_request_Query_Names_0(ctx context.Context, marshaler runtime.Marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) } - msg, err := server.Names(ctx, &protoReq) + msg, err := server.Name(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_NamesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllNames_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_NamesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllNamesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_NamesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllNames_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NamesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllNames(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_NamesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllNamesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_NamesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllNames_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NamesAll(ctx, &protoReq) + msg, err := server.AllNames(ctx, &protoReq) return msg, metadata, err } -func request_Query_Bids_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryBidRequest var metadata runtime.ServerMetadata @@ -163,12 +163,12 @@ func request_Query_Bids_0(ctx context.Context, marshaler runtime.Marshaler, clie return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) } - msg, err := client.Bids(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.Bid(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Bids_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryBidRequest var metadata runtime.ServerMetadata @@ -190,43 +190,43 @@ func local_request_Query_Bids_0(ctx context.Context, marshaler runtime.Marshaler return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) } - msg, err := server.Bids(ctx, &protoReq) + msg, err := server.Bid(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_BidsAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllBids_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_BidsAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllBidsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_BidsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllBids_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.BidsAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllBids(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_BidsAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllBidsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_BidsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllBids_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.BidsAll(ctx, &protoReq) + msg, err := server.AllBids(ctx, &protoReq) return msg, metadata, err } @@ -286,37 +286,37 @@ func local_request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marsha } var ( - filter_Query_ForSaleAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllForSale_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_ForSaleAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForSalesRequest +func request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllForSaleRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForSaleAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllForSale_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ForSaleAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllForSale(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_ForSaleAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForSalesRequest +func local_request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllForSaleRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ForSaleAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllForSale_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ForSaleAll(ctx, &protoReq) + msg, err := server.AllForSale(ctx, &protoReq) return msg, metadata, err } @@ -376,37 +376,37 @@ func local_request_Query_Init_0(ctx context.Context, marshaler runtime.Marshaler } var ( - filter_Query_InitAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllInits_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_InitAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllInits_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllInitsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_InitAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllInits_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.InitAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllInits(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_InitAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllInits_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllInitsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_InitAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllInits_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.InitAll(ctx, &protoReq) + msg, err := server.AllInits(ctx, &protoReq) return msg, metadata, err } @@ -512,7 +512,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Names_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Name_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -523,7 +523,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Names_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Name_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -531,11 +531,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Names_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Name_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_NamesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllNames_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -546,7 +546,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_NamesAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllNames_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -554,11 +554,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_NamesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllNames_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Bids_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Bid_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -569,7 +569,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Bids_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Bid_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -577,11 +577,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Bids_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Bid_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_BidsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllBids_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -592,7 +592,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_BidsAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllBids_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -600,7 +600,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_BidsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllBids_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -627,7 +627,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_ForSaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllForSale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -638,7 +638,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_ForSaleAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllForSale_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -646,7 +646,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_ForSaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllForSale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -673,7 +673,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_InitAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllInits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -684,7 +684,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_InitAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllInits_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -692,7 +692,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_InitAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllInits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -780,7 +780,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Names_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Name_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -789,18 +789,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Names_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Name_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Names_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Name_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_NamesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllNames_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -809,18 +809,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_NamesAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllNames_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_NamesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllNames_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Bids_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Bid_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -829,18 +829,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Bids_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Bid_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Bids_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Bid_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_BidsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllBids_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -849,14 +849,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_BidsAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllBids_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_BidsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllBids_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -880,7 +880,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_ForSaleAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllForSale_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -889,14 +889,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_ForSaleAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllForSale_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_ForSaleAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllForSale_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -920,7 +920,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_InitAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllInits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -929,14 +929,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_InitAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllInits_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_InitAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllInits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -964,45 +964,45 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Names_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "names", "index"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Name_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "names", "index"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_NamesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "names"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllNames_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "names"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Bids_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "bids", "index"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Bid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "bids", "index"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_BidsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "bids"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllBids_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "bids"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ForSale_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "for_sale", "name"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ForSale_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "for_sale", "name"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ForSaleAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "for_sale"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllForSale_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "for_sale"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Init_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "init", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Init_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "init", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_InitAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "rns", "init"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllInits_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "init"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ListOwnedNames_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "rns", "list_owned_names", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ListOwnedNames_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "list_owned_names", "address"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( forward_Query_Params_0 = runtime.ForwardResponseMessage - forward_Query_Names_0 = runtime.ForwardResponseMessage + forward_Query_Name_0 = runtime.ForwardResponseMessage - forward_Query_NamesAll_0 = runtime.ForwardResponseMessage + forward_Query_AllNames_0 = runtime.ForwardResponseMessage - forward_Query_Bids_0 = runtime.ForwardResponseMessage + forward_Query_Bid_0 = runtime.ForwardResponseMessage - forward_Query_BidsAll_0 = runtime.ForwardResponseMessage + forward_Query_AllBids_0 = runtime.ForwardResponseMessage forward_Query_ForSale_0 = runtime.ForwardResponseMessage - forward_Query_ForSaleAll_0 = runtime.ForwardResponseMessage + forward_Query_AllForSale_0 = runtime.ForwardResponseMessage forward_Query_Init_0 = runtime.ForwardResponseMessage - forward_Query_InitAll_0 = runtime.ForwardResponseMessage + forward_Query_AllInits_0 = runtime.ForwardResponseMessage forward_Query_ListOwnedNames_0 = runtime.ForwardResponseMessage ) diff --git a/x/storage/client/cli/query_active_deals.go b/x/storage/client/cli/query_active_deals.go index 9939ab12c..1dc0d8a26 100644 --- a/x/storage/client/cli/query_active_deals.go +++ b/x/storage/client/cli/query_active_deals.go @@ -29,7 +29,7 @@ func CmdListActiveDeals() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.FilesAll(context.Background(), params) + res, err := queryClient.AllFiles(context.Background(), params) if err != nil { return err } diff --git a/x/storage/client/cli/query_attest.go b/x/storage/client/cli/query_attest.go index 8b0a9dc98..6248b10c8 100644 --- a/x/storage/client/cli/query_attest.go +++ b/x/storage/client/cli/query_attest.go @@ -29,7 +29,7 @@ func CmdListAttestForms() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.AttestationsAll(context.Background(), params) + res, err := queryClient.AllAttestations(context.Background(), params) if err != nil { return err } @@ -103,11 +103,11 @@ func CmdListReportForms() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllReportRequest{ + params := &types.QueryAllReportsRequest{ Pagination: pageReq, } - res, err := queryClient.ReportsAll(context.Background(), params) + res, err := queryClient.AllReports(context.Background(), params) if err != nil { return err } @@ -153,7 +153,7 @@ func CmdShowReportForms() *cobra.Command { Start: start, } - res, err := queryClient.Reports(context.Background(), params) + res, err := queryClient.Report(context.Background(), params) if err != nil { return err } diff --git a/x/storage/client/cli/query_freespace.go b/x/storage/client/cli/query_freespace.go index 5751cfaaf..ea5d9d3a2 100644 --- a/x/storage/client/cli/query_freespace.go +++ b/x/storage/client/cli/query_freespace.go @@ -30,7 +30,7 @@ func CmdFreespace() *cobra.Command { Address: reqAddress, } - res, err := queryClient.Freespace(cmd.Context(), params) + res, err := queryClient.FreeSpace(cmd.Context(), params) if err != nil { return err } diff --git a/x/storage/client/cli/query_miners.go b/x/storage/client/cli/query_miners.go index efc8edcf8..8691f1e9b 100644 --- a/x/storage/client/cli/query_miners.go +++ b/x/storage/client/cli/query_miners.go @@ -27,7 +27,7 @@ func CmdListProviders() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.ProvidersAll(context.Background(), params) + res, err := queryClient.AllProviders(context.Background(), params) if err != nil { return err } @@ -82,7 +82,7 @@ func CmdShowProviders() *cobra.Command { Address: argAddress, } - res, err := queryClient.Providers(context.Background(), params) + res, err := queryClient.Provider(context.Background(), params) if err != nil { return err } diff --git a/x/storage/client/cli/query_payment_info.go b/x/storage/client/cli/query_payment_info.go index e1b20a365..2fc2cdc9f 100644 --- a/x/storage/client/cli/query_payment_info.go +++ b/x/storage/client/cli/query_payment_info.go @@ -27,7 +27,7 @@ func CmdListStoragePaymentInfo() *cobra.Command { Pagination: pageReq, } - res, err := queryClient.StoragePaymentInfoAll(context.Background(), params) + res, err := queryClient.AllStoragePaymentInfo(context.Background(), params) if err != nil { return err } diff --git a/x/storage/client/cli/tx_post_file.go b/x/storage/client/cli/tx_post_file.go index c958e0275..0dda89d98 100644 --- a/x/storage/client/cli/tx_post_file.go +++ b/x/storage/client/cli/tx_post_file.go @@ -284,7 +284,7 @@ func CmdPostFile() *cobra.Command { Pagination: pageReq, } - provRes, err := cl.ProvidersAll(context.Background(), &provReq) + provRes, err := cl.AllProviders(context.Background(), &provReq) if err != nil { panic(err) } diff --git a/x/storage/keeper/grpc_query_active_deals.go b/x/storage/keeper/grpc_query_active_deals.go index 40df8e146..5b4764f8d 100644 --- a/x/storage/keeper/grpc_query_active_deals.go +++ b/x/storage/keeper/grpc_query_active_deals.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) FilesAll(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { +func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -116,7 +116,7 @@ func (k Keeper) Proof(c context.Context, req *types.QueryProofRequest) (*types.Q return &types.QueryProofResponse{Proof: val}, nil } -func (k Keeper) ProofsAll(c context.Context, req *types.QueryProofsByAddressRequest) (*types.QueryProofsByAddressResponse, error) { +func (k Keeper) AllProofs(c context.Context, req *types.QueryProofsByAddressRequest) (*types.QueryProofsByAddressResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_attestation.go b/x/storage/keeper/grpc_query_attestation.go index 2f158a739..9cdffb8e2 100644 --- a/x/storage/keeper/grpc_query_attestation.go +++ b/x/storage/keeper/grpc_query_attestation.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AttestationsAll(c context.Context, req *types.QueryAllAttestationsRequest) (*types.QueryAllAttestationsResponse, error) { +func (k Keeper) AllAttestations(c context.Context, req *types.QueryAllAttestationsRequest) (*types.QueryAllAttestationsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_freespace.go b/x/storage/keeper/grpc_query_freespace.go index 010fbe6bd..38b2ba790 100644 --- a/x/storage/keeper/grpc_query_freespace.go +++ b/x/storage/keeper/grpc_query_freespace.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Freespace(goCtx context.Context, req *types.QueryFreeSpaceRequest) (*types.QueryFreeSpaceResponse, error) { +func (k Keeper) FreeSpace(goCtx context.Context, req *types.QueryFreeSpaceRequest) (*types.QueryFreeSpaceResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_payment_info.go b/x/storage/keeper/grpc_query_payment_info.go index 93b422553..383f30a7d 100644 --- a/x/storage/keeper/grpc_query_payment_info.go +++ b/x/storage/keeper/grpc_query_payment_info.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) StoragePaymentInfoAll(c context.Context, req *types.QueryAllStoragePaymentInfoRequest) (*types.QueryAllStoragePaymentInfoResponse, error) { +func (k Keeper) AllStoragePaymentInfo(c context.Context, req *types.QueryAllStoragePaymentInfoRequest) (*types.QueryAllStoragePaymentInfoResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_providers.go b/x/storage/keeper/grpc_query_providers.go index 5c99fef6b..f358a622c 100644 --- a/x/storage/keeper/grpc_query_providers.go +++ b/x/storage/keeper/grpc_query_providers.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) ProvidersAll(c context.Context, req *types.QueryAllProvidersRequest) (*types.QueryAllProvidersResponse, error) { +func (k Keeper) AllProviders(c context.Context, req *types.QueryAllProvidersRequest) (*types.QueryAllProvidersResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) ProvidersAll(c context.Context, req *types.QueryAllProvidersRequ return &types.QueryAllProvidersResponse{Providers: providerss, Pagination: pageRes}, nil } -func (k Keeper) Providers(c context.Context, req *types.QueryProviderRequest) (*types.QueryProviderResponse, error) { +func (k Keeper) Provider(c context.Context, req *types.QueryProviderRequest) (*types.QueryProviderResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -52,7 +52,7 @@ func (k Keeper) Providers(c context.Context, req *types.QueryProviderRequest) (* return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryProviderResponse{Providers: val}, nil + return &types.QueryProviderResponse{Provider: val}, nil } func (k Keeper) ActiveProviders(c context.Context, req *types.QueryActiveProvidersRequest) (*types.QueryActiveProvidersResponse, error) { diff --git a/x/storage/keeper/grpc_query_report.go b/x/storage/keeper/grpc_query_report.go index cace1307c..4aee1de87 100644 --- a/x/storage/keeper/grpc_query_report.go +++ b/x/storage/keeper/grpc_query_report.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) ReportsAll(c context.Context, req *types.QueryAllReportRequest) (*types.QueryAllReportResponse, error) { +func (k Keeper) AllReports(c context.Context, req *types.QueryAllReportsRequest) (*types.QueryAllReportsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -35,10 +35,10 @@ func (k Keeper) ReportsAll(c context.Context, req *types.QueryAllReportRequest) return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryAllReportResponse{Reports: reports, Pagination: pageRes}, nil + return &types.QueryAllReportsResponse{Reports: reports, Pagination: pageRes}, nil } -func (k Keeper) Reports(c context.Context, req *types.QueryReportRequest) (*types.QueryReportResponse, error) { +func (k Keeper) Report(c context.Context, req *types.QueryReportRequest) (*types.QueryReportResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/msg_server_report.go b/x/storage/keeper/msg_server_report.go index 5a49b8cca..799412d0f 100644 --- a/x/storage/keeper/msg_server_report.go +++ b/x/storage/keeper/msg_server_report.go @@ -8,7 +8,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/storage/types" ) -func (k Keeper) Report(ctx sdk.Context, prover string, merkle []byte, owner string, start int64, creator string) error { +func (k Keeper) DoReport(ctx sdk.Context, prover string, merkle []byte, owner string, start int64, creator string) error { form, found := k.GetReportForm(ctx, prover, merkle, owner, start) if !found { return sdkerrors.Wrapf(types.ErrAttestInvalid, "cannot find this report") @@ -55,7 +55,7 @@ func (k Keeper) Report(ctx sdk.Context, prover string, merkle []byte, owner stri func (k msgServer) Report(goCtx context.Context, msg *types.MsgReport) (*types.MsgReportResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - err := k.Keeper.Report(ctx, msg.Prover, msg.Merkle, msg.Owner, msg.Start, msg.Creator) + err := k.Keeper.DoReport(ctx, msg.Prover, msg.Merkle, msg.Owner, msg.Start, msg.Creator) if err != nil { return nil, err } diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 67cb120f0..336b32286 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -30,13 +30,13 @@ func (suite *KeeperTestSuite) TestSetProviders() { Address: user, } - res, err := suite.queryClient.Providers(suite.ctx.Context(), &providerRequest) + res, err := suite.queryClient.Provider(suite.ctx.Context(), &providerRequest) suite.Require().NoError(err) - suite.Require().Equal(res.Providers.Address, provider.Address) - suite.Require().Equal(res.Providers.Ip, provider.Ip) - suite.Require().Equal(res.Providers.Totalspace, provider.Totalspace) - suite.Require().Equal(res.Providers.BurnedContracts, provider.BurnedContracts) - suite.Require().Equal(res.Providers.Creator, provider.Creator) + suite.Require().Equal(res.Provider.Address, provider.Address) + suite.Require().Equal(res.Provider.Ip, provider.Ip) + suite.Require().Equal(res.Provider.Totalspace, provider.Totalspace) + suite.Require().Equal(res.Provider.BurnedContracts, provider.BurnedContracts) + suite.Require().Equal(res.Provider.Creator, provider.Creator) } // testing providers.go file @@ -71,13 +71,13 @@ func (suite *KeeperTestSuite) TestInitProviders() { Address: user, } - res, err := suite.queryClient.Providers(suite.ctx.Context(), &providerRequest) + res, err := suite.queryClient.Provider(suite.ctx.Context(), &providerRequest) suite.Require().NoError(err) - suite.Require().Equal(res.Providers.Address, user) - suite.Require().Equal(res.Providers.Ip, initMsg.Ip) - suite.Require().Equal(res.Providers.Totalspace, initMsg.TotalSpace) - suite.Require().Equal(res.Providers.BurnedContracts, "0") - suite.Require().Equal(res.Providers.Creator, initMsg.Creator) + suite.Require().Equal(res.Provider.Address, user) + suite.Require().Equal(res.Provider.Ip, initMsg.Ip) + suite.Require().Equal(res.Provider.Totalspace, initMsg.TotalSpace) + suite.Require().Equal(res.Provider.BurnedContracts, "0") + suite.Require().Equal(res.Provider.Creator, initMsg.Creator) coin := suite.bankKeeper.GetBalance(suite.ctx, userAcc, "ujkl") diff --git a/x/storage/keeper/report_test.go b/x/storage/keeper/report_test.go index d3345470c..69b53f4c4 100644 --- a/x/storage/keeper/report_test.go +++ b/x/storage/keeper/report_test.go @@ -29,7 +29,7 @@ func (suite *KeeperTestSuite) TestSetReportForm() { Start: 0, } - res, err := suite.queryClient.Reports(suite.ctx.Context(), &reportRequest) + res, err := suite.queryClient.Report(suite.ctx.Context(), &reportRequest) suite.Require().NoError(err) suite.Require().Equal(report.Prover, res.Report.Prover) suite.Require().Equal(report.Attestations, res.Report.Attestations) @@ -156,7 +156,7 @@ func (suite *KeeperTestSuite) TestMakeReport() { suite.Equal(true, found) for i, attestation := range form.Attestations { - err := suite.storageKeeper.Report(suite.ctx, addresses[10], uf.Merkle, uf.Owner, uf.Start, attestation.Provider) + err := suite.storageKeeper.DoReport(suite.ctx, addresses[10], uf.Merkle, uf.Owner, uf.Start, attestation.Provider) if i >= int(params.AttestMinToPass) { suite.Require().Error(err) } else { diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index fe4a9ea1d..90adf6147 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -627,7 +627,7 @@ func (m *QueryProviderRequest) GetAddress() string { } type QueryProviderResponse struct { - Providers Providers `protobuf:"bytes,1,opt,name=providers,proto3" json:"providers"` + Provider Providers `protobuf:"bytes,1,opt,name=provider,proto3" json:"provider"` } func (m *QueryProviderResponse) Reset() { *m = QueryProviderResponse{} } @@ -663,9 +663,9 @@ func (m *QueryProviderResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryProviderResponse proto.InternalMessageInfo -func (m *QueryProviderResponse) GetProviders() Providers { +func (m *QueryProviderResponse) GetProvider() Providers { if m != nil { - return m.Providers + return m.Provider } return Providers{} } @@ -1086,22 +1086,22 @@ func (m *QueryReportResponse) GetReport() ReportForm { return ReportForm{} } -type QueryAllReportRequest struct { +type QueryAllReportsRequest struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllReportRequest) Reset() { *m = QueryAllReportRequest{} } -func (m *QueryAllReportRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllReportRequest) ProtoMessage() {} -func (*QueryAllReportRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllReportsRequest) Reset() { *m = QueryAllReportsRequest{} } +func (m *QueryAllReportsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllReportsRequest) ProtoMessage() {} +func (*QueryAllReportsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{21} } -func (m *QueryAllReportRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllReportsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllReportsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllReportRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllReportsRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1111,42 +1111,42 @@ func (m *QueryAllReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryAllReportRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllReportRequest.Merge(m, src) +func (m *QueryAllReportsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllReportsRequest.Merge(m, src) } -func (m *QueryAllReportRequest) XXX_Size() int { +func (m *QueryAllReportsRequest) XXX_Size() int { return m.Size() } -func (m *QueryAllReportRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllReportRequest.DiscardUnknown(m) +func (m *QueryAllReportsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllReportsRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllReportRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllReportsRequest proto.InternalMessageInfo -func (m *QueryAllReportRequest) GetPagination() *query.PageRequest { +func (m *QueryAllReportsRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -type QueryAllReportResponse struct { +type QueryAllReportsResponse struct { Reports []ReportForm `protobuf:"bytes,1,rep,name=reports,proto3" json:"reports"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllReportResponse) Reset() { *m = QueryAllReportResponse{} } -func (m *QueryAllReportResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllReportResponse) ProtoMessage() {} -func (*QueryAllReportResponse) Descriptor() ([]byte, []int) { +func (m *QueryAllReportsResponse) Reset() { *m = QueryAllReportsResponse{} } +func (m *QueryAllReportsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllReportsResponse) ProtoMessage() {} +func (*QueryAllReportsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{22} } -func (m *QueryAllReportResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryAllReportsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllReportsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllReportResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllReportsResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1156,26 +1156,26 @@ func (m *QueryAllReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryAllReportResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllReportResponse.Merge(m, src) +func (m *QueryAllReportsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllReportsResponse.Merge(m, src) } -func (m *QueryAllReportResponse) XXX_Size() int { +func (m *QueryAllReportsResponse) XXX_Size() int { return m.Size() } -func (m *QueryAllReportResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllReportResponse.DiscardUnknown(m) +func (m *QueryAllReportsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllReportsResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllReportResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryAllReportsResponse proto.InternalMessageInfo -func (m *QueryAllReportResponse) GetReports() []ReportForm { +func (m *QueryAllReportsResponse) GetReports() []ReportForm { if m != nil { return m.Reports } return nil } -func (m *QueryAllReportResponse) GetPagination() *query.PageResponse { +func (m *QueryAllReportsResponse) GetPagination() *query.PageResponse { if m != nil { return m.Pagination } @@ -2213,8 +2213,8 @@ func init() { proto.RegisterType((*QueryAllAttestationsResponse)(nil), "canine_chain.storage.QueryAllAttestationsResponse") proto.RegisterType((*QueryReportRequest)(nil), "canine_chain.storage.QueryReportRequest") proto.RegisterType((*QueryReportResponse)(nil), "canine_chain.storage.QueryReportResponse") - proto.RegisterType((*QueryAllReportRequest)(nil), "canine_chain.storage.QueryAllReportRequest") - proto.RegisterType((*QueryAllReportResponse)(nil), "canine_chain.storage.QueryAllReportResponse") + proto.RegisterType((*QueryAllReportsRequest)(nil), "canine_chain.storage.QueryAllReportsRequest") + proto.RegisterType((*QueryAllReportsResponse)(nil), "canine_chain.storage.QueryAllReportsResponse") proto.RegisterType((*QueryFreeSpaceRequest)(nil), "canine_chain.storage.QueryFreeSpaceRequest") proto.RegisterType((*QueryStoreCountRequest)(nil), "canine_chain.storage.QueryStoreCountRequest") proto.RegisterType((*QueryFreeSpaceResponse)(nil), "canine_chain.storage.QueryFreeSpaceResponse") @@ -2243,136 +2243,136 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/query.proto", fileDescriptor_9fe03bff51a37284) } var fileDescriptor_9fe03bff51a37284 = []byte{ - // 2060 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0x1c, 0x49, - 0x15, 0x4e, 0x79, 0x6c, 0x27, 0xf3, 0xec, 0x25, 0xa1, 0xf0, 0x2e, 0x66, 0xc8, 0x3a, 0x4e, 0x8b, - 0x4d, 0x1c, 0x13, 0x77, 0xc7, 0x93, 0x64, 0xb3, 0xeb, 0x25, 0xd9, 0xd8, 0x59, 0x1c, 0xb2, 0x4a, - 0x14, 0xa7, 0x43, 0x40, 0x5a, 0x21, 0x9a, 0xf2, 0x4c, 0x79, 0xd2, 0x78, 0xa6, 0xbb, 0xb7, 0xbb, - 0xc7, 0x30, 0xb2, 0x7c, 0x59, 0x0e, 0x48, 0x1c, 0xd0, 0x4a, 0x7b, 0xe2, 0xc4, 0x8a, 0xdd, 0x15, - 0xe2, 0x80, 0x90, 0x16, 0x84, 0xb8, 0x82, 0x84, 0xb4, 0x37, 0x56, 0xe2, 0x82, 0x38, 0x44, 0x28, - 0x81, 0xff, 0x03, 0x55, 0xd5, 0xeb, 0xe9, 0xee, 0x99, 0x9e, 0xee, 0x9e, 0x68, 0x04, 0x27, 0x4f, - 0x55, 0xd7, 0x7b, 0xef, 0x7b, 0x3f, 0xea, 0x55, 0x7d, 0x25, 0xc3, 0x72, 0x83, 0x39, 0xb6, 0xc3, - 0xad, 0xc6, 0x63, 0x66, 0x3b, 0x46, 0x10, 0xba, 0x3e, 0x6b, 0x71, 0xe3, 0xdd, 0x2e, 0xf7, 0x7b, - 0xba, 0xe7, 0xbb, 0xa1, 0x4b, 0x17, 0x92, 0x2b, 0x74, 0x5c, 0x51, 0x5b, 0x68, 0xb9, 0x2d, 0x57, - 0x2e, 0x30, 0xc4, 0x2f, 0xb5, 0xb6, 0x76, 0xba, 0xe5, 0xba, 0xad, 0x36, 0x37, 0x98, 0x67, 0x1b, - 0xcc, 0x71, 0xdc, 0x90, 0x85, 0xb6, 0xeb, 0x04, 0xf8, 0x75, 0xb5, 0xe1, 0x06, 0x1d, 0x37, 0x30, - 0x76, 0x59, 0x80, 0x26, 0x8c, 0x83, 0xf5, 0x5d, 0x1e, 0xb2, 0x75, 0xc3, 0x63, 0x2d, 0xdb, 0x91, - 0x8b, 0x71, 0xed, 0xd9, 0x4c, 0x5c, 0x1e, 0xf3, 0x59, 0x27, 0x52, 0x77, 0x3e, 0x73, 0x09, 0x6b, - 0x84, 0xf6, 0x01, 0xb7, 0x9a, 0x9c, 0xb5, 0xa3, 0x85, 0x5f, 0xcb, 0xd6, 0xe5, 0xbb, 0x07, 0x76, - 0x93, 0xfb, 0xf9, 0xea, 0x3c, 0xd6, 0xeb, 0x70, 0x27, 0xb4, 0x6c, 0x67, 0x0f, 0x9d, 0xd4, 0x16, - 0x80, 0x3e, 0x10, 0xe0, 0x77, 0x24, 0x18, 0x93, 0xbf, 0xdb, 0xe5, 0x41, 0xa8, 0x3d, 0x80, 0x2f, - 0xa5, 0x66, 0x03, 0xcf, 0x75, 0x02, 0x4e, 0x37, 0x60, 0x56, 0x81, 0x5e, 0x24, 0xcb, 0x64, 0x65, - 0xae, 0x7e, 0x5a, 0xcf, 0x0a, 0xa7, 0xae, 0xa4, 0xb6, 0xa6, 0x3f, 0x7b, 0x72, 0xe6, 0x98, 0x89, - 0x12, 0xda, 0x7b, 0x04, 0xbe, 0xa8, 0x74, 0xfa, 0xae, 0xbb, 0x87, 0x86, 0xe8, 0x05, 0x38, 0x15, - 0x41, 0xb7, 0x58, 0xb3, 0xe9, 0xf3, 0x40, 0xe9, 0xae, 0x9a, 0x27, 0xa3, 0xf9, 0x4d, 0x35, 0x4d, - 0x5f, 0x82, 0xd9, 0x0e, 0xf7, 0xf7, 0xdb, 0x7c, 0x71, 0x6a, 0x99, 0xac, 0xcc, 0x9b, 0x38, 0xa2, - 0x0b, 0x30, 0xe3, 0xfe, 0xc8, 0xe1, 0xfe, 0x62, 0x45, 0xca, 0xa9, 0x81, 0x98, 0x0d, 0x42, 0xe6, - 0x87, 0x8b, 0xd3, 0xcb, 0x64, 0xa5, 0x62, 0xaa, 0x81, 0xf6, 0x20, 0xf2, 0x56, 0x61, 0x40, 0xb7, - 0xde, 0x80, 0x19, 0x4f, 0x4c, 0xa0, 0x57, 0x67, 0xb2, 0xbd, 0xda, 0xb6, 0xdb, 0x5c, 0xca, 0xa1, - 0x63, 0x4a, 0x46, 0x7b, 0x9f, 0xc0, 0x57, 0x63, 0x9d, 0xc1, 0x56, 0x0f, 0xf1, 0x3e, 0x87, 0x87, - 0xdb, 0x00, 0x71, 0xe9, 0x48, 0x2f, 0xe7, 0xea, 0xe7, 0x74, 0x55, 0x67, 0xba, 0xa8, 0x33, 0x5d, - 0x95, 0x32, 0xd6, 0x99, 0xbe, 0xc3, 0x5a, 0x1c, 0xcd, 0x98, 0x09, 0x49, 0xed, 0x63, 0x02, 0xa7, - 0xb3, 0x21, 0x0d, 0x3b, 0x5c, 0x19, 0xd7, 0x61, 0x7a, 0x3b, 0x03, 0xe5, 0xf9, 0x42, 0x94, 0xca, - 0x72, 0x0a, 0xe6, 0x77, 0xe0, 0x94, 0x44, 0x29, 0xec, 0x44, 0xd1, 0x8a, 0x93, 0x4c, 0xb2, 0x93, - 0x3c, 0x95, 0x99, 0xe4, 0x4a, 0x32, 0xc9, 0x3b, 0x58, 0x68, 0x4a, 0x6f, 0xdf, 0xe5, 0xe9, 0x3d, - 0x1b, 0xd5, 0xce, 0xd5, 0xcf, 0x66, 0x7b, 0xfc, 0xc8, 0xb1, 0xf7, 0x6c, 0xde, 0x14, 0x82, 0xe8, - 0xb3, 0x14, 0xd2, 0xbe, 0x0f, 0x0b, 0x52, 0xe3, 0x66, 0xbb, 0x2d, 0xbe, 0xf5, 0x73, 0x9b, 0x4e, - 0x18, 0x79, 0xee, 0x84, 0xfd, 0x8c, 0xc0, 0x8b, 0xd2, 0xc0, 0x7d, 0x8f, 0x3b, 0x29, 0x0b, 0xff, - 0x87, 0xea, 0xf9, 0x65, 0x04, 0x26, 0xf6, 0x16, 0x63, 0x78, 0x1d, 0x66, 0x44, 0x38, 0x02, 0x2c, - 0x9b, 0xd2, 0x41, 0x54, 0x52, 0x93, 0x2b, 0x9c, 0x4b, 0x98, 0x8e, 0x1d, 0x8c, 0x40, 0x14, 0xac, - 0x45, 0x38, 0x9e, 0x8e, 0x51, 0x34, 0xd4, 0xbe, 0x87, 0x2e, 0xc5, 0x12, 0xe8, 0xd2, 0x2d, 0xa8, - 0xf6, 0x5b, 0x67, 0xfe, 0xf6, 0x8f, 0x44, 0xa3, 0xbe, 0x16, 0xcb, 0x69, 0xbb, 0xb0, 0x18, 0x05, - 0xac, 0xbf, 0x6a, 0xd2, 0x25, 0xf2, 0x1b, 0x02, 0x5f, 0xc9, 0x30, 0x92, 0xed, 0x46, 0xe5, 0x79, - 0xdc, 0x98, 0x5c, 0x7e, 0xba, 0xf0, 0x65, 0x05, 0x35, 0x0c, 0x79, 0xa0, 0x4e, 0xcd, 0xc4, 0xfe, - 0x16, 0x06, 0xb9, 0x8f, 0x19, 0xc2, 0xd1, 0x44, 0x9a, 0xbb, 0x1d, 0xa5, 0x21, 0x69, 0x16, 0x03, - 0x74, 0x0f, 0xe6, 0x58, 0x3c, 0x8d, 0x79, 0x78, 0x25, 0x3b, 0x44, 0x09, 0xf9, 0x6d, 0xd7, 0xef, - 0x60, 0xa0, 0x92, 0xf2, 0x1a, 0xc7, 0x9e, 0xbf, 0xd9, 0x6e, 0x27, 0x56, 0x4f, 0x3c, 0xe9, 0x7f, - 0x8a, 0x1a, 0xf9, 0x90, 0x1d, 0x74, 0xeb, 0x3e, 0xcc, 0x27, 0x60, 0x45, 0xa9, 0x1f, 0xcb, 0xaf, - 0x94, 0x82, 0xc9, 0xd5, 0x80, 0x87, 0x27, 0xad, 0xc9, 0x3d, 0xd7, 0x0f, 0xff, 0x17, 0xe9, 0x7f, - 0x84, 0x77, 0x96, 0xc8, 0x22, 0x86, 0xe8, 0x06, 0xcc, 0xfa, 0x72, 0x06, 0xf3, 0xb0, 0x9c, 0x1d, - 0x1c, 0x25, 0x95, 0x88, 0x0b, 0x4a, 0x69, 0x56, 0xdc, 0x0d, 0xd3, 0xbe, 0x4c, 0x2a, 0xc9, 0x1f, - 0x11, 0x78, 0x69, 0xd0, 0x02, 0x62, 0xbf, 0x09, 0xc7, 0x15, 0x8a, 0x28, 0xb3, 0x65, 0xc1, 0x47, - 0x62, 0x93, 0xcb, 0xe7, 0x3a, 0x86, 0x61, 0xdb, 0xe7, 0xfc, 0xa1, 0xc7, 0x1a, 0xbc, 0xb8, 0xe9, - 0xd6, 0xd1, 0xaf, 0x87, 0xa1, 0xeb, 0xf3, 0x5b, 0x6e, 0xd7, 0x09, 0x8b, 0x65, 0x74, 0x94, 0x49, - 0x98, 0xc1, 0x58, 0x88, 0xa4, 0x8b, 0x09, 0x94, 0x50, 0x03, 0xcd, 0xc0, 0x56, 0x93, 0xb4, 0x11, - 0x0b, 0x34, 0xc4, 0x44, 0x24, 0x20, 0x07, 0x9a, 0x8e, 0x67, 0xc7, 0xb6, 0xed, 0x34, 0x4b, 0x5c, - 0x3c, 0xb4, 0x8d, 0xc8, 0xef, 0xfe, 0x7a, 0x54, 0x7f, 0x16, 0xe6, 0xfb, 0x27, 0xb3, 0xed, 0x45, - 0x8e, 0xcc, 0x45, 0x73, 0x77, 0xbc, 0x40, 0xbb, 0x86, 0x5d, 0xe2, 0x56, 0xdb, 0xe6, 0x4e, 0x38, - 0x46, 0xe4, 0xae, 0xe3, 0xb6, 0x1f, 0x12, 0x44, 0xdb, 0x2f, 0x03, 0xec, 0xf6, 0x42, 0x1e, 0x58, - 0x7b, 0x3e, 0x57, 0x80, 0x2b, 0x66, 0x55, 0xce, 0x88, 0xb5, 0x9a, 0xd1, 0xbf, 0xbd, 0xf7, 0xde, - 0x62, 0x21, 0x2b, 0xb6, 0xf7, 0x30, 0x3a, 0x50, 0x23, 0x01, 0xb4, 0xf3, 0x0a, 0x7c, 0x21, 0xb4, - 0x3b, 0xdc, 0xf2, 0x79, 0x87, 0xd9, 0x8e, 0xed, 0xb4, 0xd0, 0xd6, 0x0b, 0x62, 0xd6, 0x8c, 0x26, - 0x45, 0xa4, 0xa5, 0x71, 0x59, 0x5f, 0x15, 0x53, 0x0d, 0xb4, 0x0d, 0x58, 0xea, 0xa7, 0x86, 0xb5, - 0xf8, 0x8e, 0xe2, 0x1e, 0x77, 0x9c, 0x3d, 0xb7, 0x18, 0xd0, 0x4f, 0x08, 0x9c, 0x19, 0x29, 0x8c, - 0xe0, 0x7e, 0x00, 0x0b, 0x58, 0xff, 0x56, 0x92, 0xd7, 0xe0, 0x4e, 0x5c, 0xc9, 0xde, 0x29, 0xc3, - 0xfa, 0x70, 0xc7, 0xd0, 0x60, 0xe8, 0x8b, 0xb6, 0x0f, 0x67, 0xa3, 0x8d, 0x39, 0xda, 0x89, 0x49, - 0xb5, 0x81, 0xbf, 0x11, 0xd0, 0xf2, 0xac, 0x15, 0x7a, 0x5d, 0x99, 0x8c, 0xd7, 0x93, 0x6b, 0x19, - 0xf7, 0xb0, 0xfc, 0xc5, 0xb6, 0x79, 0xe4, 0xb5, 0x5d, 0xd6, 0xbc, 0xf5, 0x98, 0x37, 0xf6, 0x0b, - 0xb3, 0x3f, 0xa2, 0x9e, 0xae, 0xe0, 0xa6, 0x18, 0x52, 0x17, 0xef, 0xf7, 0x03, 0xd6, 0xb6, 0x9b, - 0x52, 0xdb, 0x09, 0x53, 0x0d, 0xb4, 0xb7, 0xb1, 0xa1, 0xec, 0xf8, 0x76, 0x83, 0xa7, 0xec, 0xd7, - 0xe0, 0x44, 0xb3, 0xeb, 0xc7, 0x69, 0xab, 0x9a, 0xfd, 0xf1, 0x08, 0x04, 0x51, 0xb3, 0x49, 0xea, - 0x8a, 0x8d, 0x7b, 0x62, 0x16, 0x37, 0x88, 0x1a, 0x68, 0x2f, 0x47, 0xd7, 0x04, 0x49, 0xe3, 0x07, - 0xef, 0x86, 0x9a, 0x1d, 0x9d, 0xee, 0x83, 0x9f, 0x51, 0xe9, 0x9d, 0xe1, 0x5b, 0xdd, 0xa8, 0xa3, - 0x3d, 0xad, 0x61, 0xf8, 0x8a, 0x5a, 0xc3, 0xbb, 0x11, 0x56, 0xc2, 0xc3, 0x90, 0x85, 0x7d, 0x18, - 0xff, 0x99, 0xc2, 0xab, 0x65, 0xfa, 0x23, 0x82, 0x38, 0x0d, 0x55, 0xaf, 0xeb, 0x37, 0x1e, 0xb3, - 0x80, 0xab, 0xd0, 0x4e, 0x9b, 0xf1, 0x04, 0xa5, 0x30, 0xdd, 0x15, 0x1f, 0xa6, 0xe4, 0x07, 0xf9, - 0x9b, 0xde, 0x03, 0x10, 0x7f, 0x2d, 0x19, 0x4b, 0x79, 0x72, 0xcf, 0x6f, 0xe9, 0x02, 0xd0, 0x3f, - 0x9f, 0x9c, 0x39, 0xd7, 0xb2, 0xc3, 0xc7, 0xdd, 0x5d, 0xbd, 0xe1, 0x76, 0x0c, 0x7c, 0x40, 0x51, - 0x7f, 0xd6, 0x82, 0xe6, 0xbe, 0x11, 0xf6, 0x3c, 0x1e, 0xe8, 0x6f, 0xf1, 0x86, 0x59, 0x15, 0x1a, - 0x4c, 0xa1, 0x40, 0x34, 0x5a, 0x7c, 0x06, 0xe9, 0x06, 0x22, 0x10, 0xd3, 0xd2, 0xd4, 0x9c, 0x9a, - 0x7b, 0x24, 0xa6, 0x68, 0x13, 0x5e, 0x90, 0xdf, 0xac, 0xdd, 0x9e, 0xe5, 0xb5, 0x99, 0xb3, 0x38, - 0x23, 0x83, 0x75, 0x33, 0x3b, 0x58, 0x23, 0x7d, 0xd5, 0xa5, 0xb6, 0xad, 0xde, 0x4e, 0x9b, 0x39, - 0xdf, 0x74, 0x42, 0xbf, 0x67, 0xce, 0x75, 0xe3, 0x99, 0xda, 0x0d, 0x38, 0x35, 0xb8, 0x80, 0x9e, - 0x82, 0xca, 0x3e, 0xef, 0x61, 0xd6, 0xc5, 0x4f, 0x2c, 0xc3, 0x2e, 0x8f, 0x4a, 0x47, 0x0e, 0x36, - 0xa6, 0x5e, 0x23, 0xf5, 0x9f, 0x2e, 0xc1, 0x8c, 0xb4, 0x4d, 0x7f, 0x4e, 0x60, 0x56, 0x3d, 0x92, - 0xd0, 0x95, 0x1c, 0x8c, 0xa9, 0x37, 0x99, 0xda, 0x85, 0x12, 0x2b, 0x95, 0x1f, 0x9a, 0xf1, 0xde, - 0xdf, 0xff, 0xfd, 0xc1, 0xd4, 0x05, 0x7a, 0xde, 0xf8, 0x21, 0x6b, 0xec, 0xb3, 0xf6, 0x5a, 0x93, - 0xb9, 0x86, 0x92, 0x5e, 0xcb, 0x7a, 0x83, 0xa2, 0x1f, 0x12, 0x98, 0x16, 0xfb, 0x8a, 0x9e, 0xcb, - 0x31, 0x92, 0x38, 0x2e, 0x6b, 0xe7, 0x0b, 0xd7, 0x21, 0x94, 0xdb, 0x12, 0xca, 0x26, 0x7d, 0xb3, - 0x10, 0x8a, 0x24, 0x89, 0xc6, 0xa1, 0x3a, 0x77, 0x8f, 0x8c, 0x43, 0x79, 0xd7, 0x3b, 0x32, 0x0e, - 0xe5, 0xed, 0xee, 0x88, 0x7e, 0x40, 0xe0, 0x84, 0xa4, 0xa3, 0x9b, 0xed, 0x36, 0x5d, 0xcd, 0x31, - 0x3f, 0x40, 0xd2, 0x6b, 0x5f, 0x2f, 0xb5, 0x16, 0xe1, 0xea, 0x12, 0xee, 0x0a, 0x3d, 0x57, 0x0e, - 0x2e, 0xfd, 0x2d, 0x81, 0x6a, 0x9f, 0xb4, 0xd3, 0x3c, 0x53, 0x83, 0xd4, 0x7e, 0x3c, 0x5c, 0xdb, - 0x12, 0xd7, 0x4d, 0x7a, 0xa3, 0x10, 0x97, 0xeb, 0x71, 0xc7, 0xc2, 0x58, 0x0e, 0x3e, 0x1d, 0x1c, - 0xd1, 0x3f, 0x12, 0x98, 0x91, 0x6f, 0x3a, 0x34, 0x2f, 0x83, 0xc9, 0x27, 0xba, 0xda, 0x4a, 0xf1, - 0x42, 0x04, 0xf9, 0x8e, 0x04, 0xf9, 0x6d, 0x6a, 0x16, 0x97, 0x9d, 0x90, 0xcb, 0xc0, 0x37, 0x3a, - 0xfd, 0xbf, 0x22, 0x50, 0xed, 0xf7, 0xb7, 0xdc, 0xfc, 0x0f, 0xbc, 0x0a, 0xe4, 0xc6, 0x79, 0xf0, - 0x3d, 0x40, 0xfb, 0x86, 0x74, 0xe1, 0x55, 0x7a, 0xa5, 0x8c, 0x0b, 0x0a, 0x8c, 0x71, 0xd8, 0x8f, - 0xee, 0x47, 0x04, 0xe6, 0xfb, 0x20, 0x45, 0x9d, 0xea, 0xf9, 0x39, 0x1e, 0x3c, 0x11, 0x6a, 0x46, - 0xe9, 0xf5, 0x88, 0xb7, 0x2e, 0xf1, 0x5e, 0xa4, 0xab, 0xe5, 0xf1, 0xd2, 0xbf, 0x12, 0x98, 0x4b, - 0x70, 0x41, 0xba, 0x96, 0x67, 0x74, 0x88, 0xc2, 0xd7, 0xf4, 0xb2, 0xcb, 0x11, 0xe2, 0x77, 0x25, - 0xc4, 0x07, 0xf4, 0x7e, 0x21, 0xc4, 0x24, 0x13, 0x55, 0xc5, 0x21, 0x2b, 0x60, 0x54, 0x49, 0xfc, - 0x8e, 0xc0, 0xc9, 0x24, 0x2b, 0x16, 0x01, 0x5f, 0xcf, 0x0f, 0x60, 0x06, 0x59, 0xaf, 0xd5, 0xc7, - 0x11, 0x41, 0x9f, 0xae, 0x4a, 0x9f, 0x0c, 0xba, 0x36, 0x96, 0x4f, 0xf4, 0x53, 0x02, 0xc7, 0x4d, - 0x64, 0x66, 0x79, 0xdb, 0x2a, 0x45, 0x34, 0x73, 0x1b, 0x7f, 0x9a, 0x30, 0x6a, 0xa6, 0xc4, 0x75, - 0x97, 0xbe, 0x5d, 0x88, 0x0b, 0x09, 0x62, 0x89, 0x30, 0xff, 0x82, 0x00, 0x20, 0x68, 0x11, 0xe1, - 0x82, 0xb6, 0x95, 0x86, 0x7e, 0xb1, 0xdc, 0x62, 0x44, 0x7f, 0x49, 0xa2, 0x5f, 0xa5, 0x2b, 0x65, - 0xd1, 0xd3, 0x4f, 0x08, 0x54, 0x05, 0xe5, 0x91, 0x64, 0x30, 0x17, 0xda, 0x20, 0xfb, 0xca, 0x85, - 0x36, 0xc4, 0xb8, 0xb4, 0xeb, 0x12, 0xda, 0x35, 0x7a, 0xb5, 0xf8, 0x5c, 0xf0, 0x39, 0xb7, 0x24, - 0x9e, 0x44, 0x63, 0xf8, 0x84, 0x00, 0xc4, 0x14, 0x95, 0x5e, 0x2c, 0xb8, 0x98, 0xa4, 0xd8, 0x72, - 0x6d, 0xad, 0xe4, 0x6a, 0x84, 0xba, 0x21, 0xa1, 0x5e, 0xa1, 0xf5, 0x42, 0xa8, 0xe2, 0xaf, 0xed, - 0xb4, 0x12, 0x38, 0x3f, 0x94, 0x87, 0xac, 0x62, 0xba, 0xb9, 0x4d, 0x76, 0x80, 0x3e, 0xe7, 0x36, - 0xd9, 0x41, 0xea, 0xac, 0xbd, 0x21, 0x11, 0x5e, 0xa5, 0x97, 0x4b, 0x1c, 0xb2, 0x4e, 0x53, 0x1e, - 0x66, 0xfd, 0xf2, 0x14, 0xdd, 0x8b, 0xde, 0xe6, 0xe1, 0x00, 0x35, 0xce, 0xdd, 0xf8, 0xd9, 0xfc, - 0x3b, 0x77, 0xe3, 0x8f, 0x60, 0xde, 0xda, 0xb7, 0x24, 0xf4, 0x2d, 0x7a, 0xb3, 0x10, 0x7a, 0x8b, - 0x87, 0x56, 0x43, 0x6a, 0xb1, 0x32, 0x4b, 0xe2, 0x63, 0x02, 0x70, 0x9b, 0x87, 0x48, 0xb9, 0x69, - 0xfe, 0xed, 0x2e, 0xc9, 0xe3, 0x6b, 0xab, 0x65, 0x96, 0x22, 0xde, 0x37, 0x25, 0xde, 0xd7, 0xe9, - 0xb5, 0x52, 0x78, 0x3d, 0xd6, 0xb3, 0x9a, 0x2c, 0x64, 0x09, 0x98, 0x7f, 0x21, 0x40, 0x87, 0xe9, - 0x23, 0xbd, 0x52, 0x7c, 0xb5, 0x1e, 0xe6, 0xca, 0xb5, 0xab, 0x63, 0x4a, 0x8d, 0xed, 0x44, 0x92, - 0x12, 0x27, 0x9c, 0xf8, 0x33, 0x81, 0x17, 0x87, 0xf5, 0x8b, 0x6e, 0x76, 0x2d, 0xbf, 0x41, 0x8d, - 0x76, 0xe5, 0xb5, 0xf1, 0x05, 0xc7, 0x3e, 0x3b, 0x92, 0xde, 0xd0, 0x3f, 0x10, 0x38, 0x39, 0x40, - 0x7d, 0x73, 0x8b, 0x3e, 0x9b, 0x75, 0xe7, 0x16, 0xfd, 0x08, 0x66, 0x3d, 0x46, 0x47, 0x11, 0x5b, - 0xd5, 0xea, 0x4a, 0x15, 0x56, 0x43, 0x42, 0xfc, 0x94, 0x00, 0xc4, 0x7c, 0x39, 0xb7, 0xf3, 0x0d, - 0x51, 0xf4, 0xdc, 0xce, 0x37, 0x4c, 0xc2, 0xc7, 0xe0, 0x1a, 0x92, 0x9e, 0x2b, 0x84, 0xc6, 0x61, - 0xc4, 0xfa, 0x8f, 0x8c, 0x43, 0xc9, 0xf3, 0x8f, 0xe8, 0xef, 0xc5, 0xcd, 0x22, 0x4d, 0xa9, 0xf3, - 0x6f, 0x16, 0x99, 0xfc, 0x3e, 0xff, 0x66, 0x91, 0xcd, 0xf9, 0xb5, 0xd7, 0xa5, 0x0f, 0x97, 0xe9, - 0x7a, 0xf1, 0xcd, 0x42, 0x91, 0xe2, 0xf8, 0x5e, 0xf7, 0x6b, 0x02, 0xf3, 0x49, 0x5a, 0x9b, 0x7b, - 0xfb, 0xcc, 0x78, 0x08, 0xc8, 0xbd, 0x7d, 0x66, 0xf1, 0x65, 0xed, 0x55, 0x09, 0xf6, 0x12, 0xd5, - 0x4b, 0x1d, 0x35, 0xac, 0xc5, 0x2d, 0x71, 0x15, 0x0a, 0xb6, 0xee, 0x7e, 0xf6, 0x74, 0x89, 0x7c, - 0xfe, 0x74, 0x89, 0xfc, 0xeb, 0xe9, 0x12, 0x79, 0xff, 0xd9, 0xd2, 0xb1, 0xcf, 0x9f, 0x2d, 0x1d, - 0xfb, 0xc7, 0xb3, 0xa5, 0x63, 0xef, 0xd4, 0x13, 0xef, 0x03, 0x4a, 0xe7, 0x5d, 0xb6, 0x1b, 0xa4, - 0x75, 0xfe, 0xb8, 0xaf, 0x55, 0xbe, 0x17, 0xec, 0xce, 0xca, 0xff, 0x64, 0xb8, 0xfc, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x12, 0x85, 0x70, 0xf5, 0xfe, 0x21, 0x00, 0x00, + // 2051 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcd, 0x73, 0x1c, 0x47, + 0x15, 0x77, 0xeb, 0x2b, 0xda, 0x27, 0x05, 0x9b, 0x46, 0x09, 0x62, 0xb1, 0x65, 0x79, 0xb0, 0x65, + 0x59, 0xb6, 0x66, 0xac, 0x75, 0x8c, 0x8d, 0x1c, 0xbb, 0x62, 0xc9, 0xc8, 0x18, 0xe2, 0x44, 0x5e, + 0x95, 0x73, 0xc8, 0x81, 0x49, 0x6b, 0xb7, 0xb5, 0x1e, 0xb4, 0x9a, 0x99, 0xcc, 0xcc, 0x0a, 0xb6, + 0x54, 0xba, 0x84, 0x5b, 0x2e, 0xa4, 0x8a, 0x03, 0x97, 0x50, 0x21, 0x45, 0x2e, 0x29, 0x0a, 0x42, + 0x71, 0xe2, 0x02, 0x55, 0xdc, 0x72, 0x23, 0x55, 0x5c, 0x28, 0x0e, 0x29, 0xca, 0x86, 0xff, 0x83, + 0xea, 0xee, 0xd7, 0x3b, 0xb3, 0xbb, 0xb3, 0xbd, 0xbb, 0xae, 0x2d, 0x72, 0xd2, 0x4e, 0xcf, 0xfb, + 0xf8, 0xbd, 0x8f, 0x7e, 0xdd, 0xbf, 0x29, 0xc1, 0x62, 0x85, 0xf9, 0x9e, 0xcf, 0xdd, 0xca, 0x13, + 0xe6, 0xf9, 0x4e, 0x9c, 0x04, 0x11, 0xab, 0x71, 0xe7, 0xdd, 0x06, 0x8f, 0x9a, 0x76, 0x18, 0x05, + 0x49, 0x40, 0xe7, 0xb2, 0x12, 0x36, 0x4a, 0x14, 0xe7, 0x6a, 0x41, 0x2d, 0x90, 0x02, 0x8e, 0xf8, + 0xa5, 0x64, 0x8b, 0xa7, 0x6b, 0x41, 0x50, 0xab, 0x73, 0x87, 0x85, 0x9e, 0xc3, 0x7c, 0x3f, 0x48, + 0x58, 0xe2, 0x05, 0x7e, 0x8c, 0x6f, 0x57, 0x2a, 0x41, 0x7c, 0x10, 0xc4, 0xce, 0x2e, 0x8b, 0xd1, + 0x85, 0x73, 0xb8, 0xb6, 0xcb, 0x13, 0xb6, 0xe6, 0x84, 0xac, 0xe6, 0xf9, 0x52, 0x18, 0x65, 0xcf, + 0xe5, 0xe2, 0x0a, 0x59, 0xc4, 0x0e, 0xb4, 0xb9, 0x8b, 0xb9, 0x22, 0xac, 0x92, 0x78, 0x87, 0xdc, + 0xad, 0x72, 0x56, 0xd7, 0x82, 0xe7, 0xf3, 0x6d, 0x45, 0xc1, 0xa1, 0x57, 0xe5, 0x91, 0xd9, 0x5c, + 0xc8, 0x9a, 0x07, 0xdc, 0x4f, 0x5c, 0xcf, 0xdf, 0xc3, 0x20, 0xad, 0x39, 0xa0, 0x8f, 0x04, 0xf8, + 0x6d, 0x09, 0xa6, 0xcc, 0xdf, 0x6d, 0xf0, 0x38, 0xb1, 0x1e, 0xc1, 0x37, 0xda, 0x56, 0xe3, 0x30, + 0xf0, 0x63, 0x4e, 0xd7, 0x61, 0x4a, 0x81, 0x9e, 0x27, 0x8b, 0x64, 0x79, 0xa6, 0x74, 0xda, 0xce, + 0x4b, 0xa7, 0xad, 0xb4, 0x36, 0x26, 0x3e, 0xff, 0xf2, 0xec, 0x89, 0x32, 0x6a, 0x58, 0xef, 0x11, + 0xf8, 0xba, 0xb2, 0x19, 0x05, 0xc1, 0x1e, 0x3a, 0xa2, 0x97, 0xe0, 0x94, 0x86, 0xee, 0xb2, 0x6a, + 0x35, 0xe2, 0xb1, 0xb2, 0x5d, 0x28, 0x9f, 0xd4, 0xeb, 0x77, 0xd5, 0x32, 0x7d, 0x19, 0xa6, 0x0e, + 0x78, 0xb4, 0x5f, 0xe7, 0xf3, 0x63, 0x8b, 0x64, 0x79, 0xb6, 0x8c, 0x4f, 0x74, 0x0e, 0x26, 0x83, + 0x9f, 0xfa, 0x3c, 0x9a, 0x1f, 0x97, 0x7a, 0xea, 0x41, 0xac, 0xc6, 0x09, 0x8b, 0x92, 0xf9, 0x89, + 0x45, 0xb2, 0x3c, 0x5e, 0x56, 0x0f, 0xd6, 0x23, 0x1d, 0xad, 0xc2, 0x80, 0x61, 0xdd, 0x82, 0xc9, + 0x50, 0x2c, 0x60, 0x54, 0x67, 0xf3, 0xa3, 0xda, 0xf2, 0xea, 0x5c, 0xea, 0x61, 0x60, 0x4a, 0xc7, + 0xfa, 0x80, 0xc0, 0xb7, 0x53, 0x9b, 0xf1, 0x46, 0x13, 0xf1, 0x3e, 0x47, 0x84, 0x5b, 0x00, 0x69, + 0xeb, 0xc8, 0x28, 0x67, 0x4a, 0x4b, 0xb6, 0xea, 0x33, 0x5b, 0xf4, 0x99, 0xad, 0x5a, 0x19, 0xfb, + 0xcc, 0xde, 0x66, 0x35, 0x8e, 0x6e, 0xca, 0x19, 0x4d, 0xeb, 0x13, 0x02, 0xa7, 0xf3, 0x21, 0x75, + 0x07, 0x3c, 0x3e, 0x6c, 0xc0, 0xf4, 0x7e, 0x0e, 0xca, 0x8b, 0x7d, 0x51, 0x2a, 0xcf, 0x6d, 0x30, + 0xdf, 0x82, 0x53, 0x12, 0xa5, 0xf0, 0xa3, 0xb3, 0x95, 0x16, 0x99, 0xe4, 0x17, 0x79, 0x2c, 0xb7, + 0xc8, 0xe3, 0xd9, 0x22, 0x6f, 0x63, 0xa3, 0x29, 0xbb, 0xad, 0x90, 0x27, 0xf6, 0x3c, 0x34, 0x3b, + 0x53, 0x3a, 0x97, 0x1f, 0xf1, 0x63, 0xdf, 0xdb, 0xf3, 0x78, 0x55, 0x28, 0x62, 0xcc, 0x52, 0xc9, + 0xfa, 0x31, 0xcc, 0x49, 0x8b, 0x77, 0xeb, 0x75, 0xf1, 0xae, 0x55, 0xdb, 0xf6, 0x82, 0x91, 0xe7, + 0x2e, 0xd8, 0xfb, 0x04, 0x5e, 0x92, 0x0e, 0xde, 0x0c, 0xb9, 0xdf, 0xe6, 0xe1, 0x2b, 0xe8, 0x9e, + 0x8f, 0x34, 0x98, 0x34, 0x5a, 0xcc, 0xe1, 0x6d, 0x98, 0x14, 0xe9, 0x88, 0xb1, 0x6d, 0x06, 0x4e, + 0xa2, 0xd2, 0x1a, 0x5d, 0xe3, 0x5c, 0xc5, 0x72, 0x6c, 0x63, 0x06, 0x74, 0xb2, 0xe6, 0xe1, 0x85, + 0xf6, 0x1c, 0xe9, 0x47, 0xeb, 0x6d, 0x0c, 0x29, 0xd5, 0xc0, 0x90, 0xee, 0xc2, 0xb4, 0xce, 0xa3, + 0x79, 0xf7, 0x6b, 0x4d, 0x3d, 0xd6, 0x5a, 0x6a, 0xd6, 0x2e, 0xcc, 0xeb, 0x74, 0xb5, 0x84, 0x46, + 0xdd, 0x20, 0x9f, 0x12, 0xf8, 0x56, 0x8e, 0x13, 0x0c, 0x62, 0x13, 0x0a, 0xad, 0xf9, 0x6f, 0xde, + 0xd2, 0x9d, 0x51, 0xa4, 0x7a, 0xa3, 0xab, 0x4e, 0x03, 0xbe, 0xa9, 0xa0, 0x26, 0x09, 0x8f, 0xd5, + 0x99, 0x99, 0xd9, 0xdd, 0xc2, 0x21, 0xe6, 0xba, 0x50, 0xc6, 0xa7, 0x91, 0x8c, 0x76, 0x4f, 0x97, + 0x21, 0xeb, 0x16, 0x13, 0xf4, 0x10, 0x66, 0x58, 0xba, 0x8c, 0x75, 0xb8, 0x90, 0x9f, 0xa2, 0x8c, + 0xfe, 0x56, 0x10, 0x1d, 0x60, 0xa2, 0xb2, 0xfa, 0x16, 0xc7, 0x89, 0x7f, 0xb7, 0x5e, 0xcf, 0x48, + 0x8f, 0xbc, 0xe8, 0x7f, 0xd6, 0x63, 0xbc, 0xcb, 0x0f, 0x86, 0xf5, 0x26, 0xcc, 0x66, 0x60, 0xe9, + 0xd2, 0x0f, 0x15, 0x57, 0x9b, 0x81, 0xd1, 0xf5, 0x40, 0x88, 0xe7, 0x6c, 0x99, 0x87, 0x41, 0x94, + 0xfc, 0x3f, 0xca, 0xff, 0x18, 0x6f, 0x2c, 0xda, 0x23, 0xa6, 0xe8, 0x0e, 0x4c, 0x45, 0x72, 0x05, + 0xeb, 0xb0, 0x98, 0x9f, 0x1c, 0xa5, 0x95, 0xc9, 0x0b, 0x6a, 0x59, 0xef, 0xc0, 0xcb, 0xba, 0x04, + 0x4a, 0x66, 0xe4, 0x55, 0xfe, 0x84, 0xe8, 0xfd, 0x92, 0x71, 0x81, 0xe8, 0x5f, 0x83, 0x17, 0x14, + 0x0e, 0x5d, 0xdb, 0x41, 0xe1, 0x6b, 0xb5, 0xd1, 0x55, 0x74, 0x0d, 0x27, 0xe8, 0x56, 0xc4, 0xf9, + 0x4e, 0xc8, 0x2a, 0xbc, 0xff, 0xd0, 0x2d, 0x61, 0xee, 0x76, 0x92, 0x20, 0xe2, 0x9b, 0x41, 0xc3, + 0x4f, 0xfa, 0xeb, 0xd8, 0xa8, 0x93, 0x71, 0x83, 0xb9, 0x10, 0x65, 0x17, 0x0b, 0xa8, 0xa1, 0x1e, + 0x2c, 0x07, 0x93, 0x97, 0xf5, 0x91, 0x2a, 0x54, 0xc4, 0x82, 0x56, 0x90, 0x0f, 0x96, 0x8d, 0x67, + 0xc7, 0x96, 0xe7, 0x57, 0x07, 0xb8, 0x78, 0x58, 0xeb, 0x3a, 0xee, 0x96, 0x3c, 0x9a, 0x3f, 0x07, + 0xb3, 0xad, 0x93, 0xd9, 0x0b, 0x75, 0x20, 0x33, 0x7a, 0xed, 0x41, 0x18, 0x5b, 0x37, 0x70, 0x4e, + 0x6c, 0xd6, 0x3d, 0xee, 0x27, 0x43, 0x64, 0xee, 0x36, 0x6e, 0xfc, 0x2e, 0x45, 0xf4, 0x7d, 0x06, + 0x60, 0xb7, 0x99, 0xf0, 0xd8, 0xdd, 0x8b, 0xb8, 0x02, 0x3c, 0x5e, 0x2e, 0xc8, 0x15, 0x21, 0x6b, + 0x39, 0xad, 0xdb, 0x7b, 0xf3, 0x1e, 0x4b, 0x58, 0x7f, 0x7f, 0x3b, 0xfa, 0x40, 0xd5, 0x0a, 0xe8, + 0xe7, 0x02, 0x7c, 0x2d, 0xf1, 0x0e, 0xb8, 0x1b, 0xf1, 0x03, 0xe6, 0xf9, 0x9e, 0x5f, 0x43, 0x5f, + 0x2f, 0x8a, 0xd5, 0xb2, 0x5e, 0x14, 0x99, 0x96, 0xce, 0x65, 0x7f, 0x8d, 0x97, 0xd5, 0x83, 0xb5, + 0x0e, 0x0b, 0xad, 0xd2, 0xb0, 0x1a, 0xdf, 0x56, 0xdc, 0xe3, 0x81, 0xbf, 0x17, 0xf4, 0x07, 0xf4, + 0x73, 0x02, 0x67, 0x7b, 0x2a, 0x23, 0xb8, 0x77, 0x60, 0x0e, 0xfb, 0xdf, 0xcd, 0xf2, 0x1a, 0xdc, + 0x8a, 0xcb, 0xf9, 0x3b, 0xa5, 0xdb, 0x1e, 0xee, 0x18, 0x1a, 0x77, 0xbd, 0xb1, 0xf6, 0xe1, 0x9c, + 0xde, 0x99, 0xbd, 0x83, 0x18, 0xd5, 0x1c, 0xf8, 0x3b, 0x01, 0xcb, 0xe4, 0xad, 0x6f, 0xd4, 0xe3, + 0xa3, 0x89, 0x7a, 0x74, 0x23, 0xe3, 0x21, 0xb6, 0xbf, 0xd8, 0x36, 0x8f, 0xc3, 0x7a, 0xc0, 0xaa, + 0x9b, 0x4f, 0x78, 0x65, 0xbf, 0x6f, 0xf5, 0x7b, 0xf4, 0xd3, 0x2b, 0xb8, 0x29, 0xba, 0xcc, 0xa5, + 0xfb, 0xfd, 0x90, 0xd5, 0xbd, 0xaa, 0xb4, 0x36, 0x5d, 0x56, 0x0f, 0xd6, 0x0f, 0x71, 0xa0, 0x6c, + 0x47, 0x5e, 0x85, 0xb7, 0xf9, 0x2f, 0xc2, 0x74, 0xb5, 0x11, 0xa5, 0x65, 0x2b, 0x94, 0x5b, 0xcf, + 0x3d, 0x10, 0xe8, 0x61, 0x93, 0xb5, 0x95, 0x3a, 0x0f, 0xc5, 0x2a, 0x6e, 0x10, 0xf5, 0x60, 0x9d, + 0xd1, 0x17, 0x05, 0x49, 0xe3, 0x3b, 0x6f, 0x87, 0x96, 0xa7, 0xcf, 0xf7, 0xce, 0xd7, 0x68, 0xf4, + 0x41, 0xf7, 0xbd, 0xae, 0xd7, 0xe1, 0xde, 0x6e, 0xa1, 0xeb, 0x76, 0x67, 0x15, 0xf1, 0x76, 0x84, + 0x9d, 0xb0, 0x93, 0xb0, 0xd6, 0x49, 0x66, 0xfd, 0x77, 0x0c, 0x2f, 0x97, 0xed, 0x2f, 0x11, 0xc4, + 0x69, 0x28, 0x84, 0x8d, 0xa8, 0xf2, 0x84, 0xc5, 0x5c, 0xa5, 0x76, 0xa2, 0x9c, 0x2e, 0x50, 0x0a, + 0x13, 0x0d, 0xf1, 0x62, 0x4c, 0xbe, 0x90, 0xbf, 0xe9, 0x43, 0x00, 0xf1, 0xd7, 0x95, 0xb9, 0x94, + 0x67, 0xf7, 0xec, 0x86, 0x2d, 0x00, 0xfd, 0xeb, 0xcb, 0xb3, 0x4b, 0x35, 0x2f, 0x79, 0xd2, 0xd8, + 0xb5, 0x2b, 0xc1, 0x81, 0x83, 0x1f, 0x50, 0xd4, 0x9f, 0xd5, 0xb8, 0xba, 0xef, 0x24, 0xcd, 0x90, + 0xc7, 0xf6, 0x3d, 0x5e, 0x29, 0x17, 0x84, 0x85, 0xb2, 0x30, 0x20, 0x06, 0x2d, 0x7e, 0x06, 0x69, + 0xc4, 0x22, 0x11, 0x13, 0xd2, 0xd5, 0x8c, 0x5a, 0x7b, 0x2c, 0x96, 0x68, 0x15, 0x5e, 0x94, 0xef, + 0xdc, 0xdd, 0xa6, 0x1b, 0xd6, 0x99, 0x3f, 0x3f, 0x29, 0x93, 0xf5, 0x5a, 0x7e, 0xb2, 0x7a, 0xc6, + 0x6a, 0x4b, 0x6b, 0x1b, 0xcd, 0xed, 0x3a, 0xf3, 0xbf, 0xef, 0x27, 0x51, 0xb3, 0x3c, 0xd3, 0x48, + 0x57, 0x8a, 0x77, 0xe0, 0x54, 0xa7, 0x00, 0x3d, 0x05, 0xe3, 0xfb, 0xbc, 0x89, 0x55, 0x17, 0x3f, + 0xb1, 0x0d, 0x1b, 0x5c, 0xb7, 0x8e, 0x7c, 0x58, 0x1f, 0xbb, 0x49, 0x4a, 0x9f, 0x9d, 0x81, 0x49, + 0xe9, 0x9b, 0xbe, 0x4f, 0x60, 0x4a, 0x7d, 0x24, 0xa1, 0xcb, 0x06, 0x8c, 0x6d, 0xdf, 0x64, 0x8a, + 0x97, 0x06, 0x90, 0x54, 0x71, 0x58, 0x97, 0xdf, 0xfb, 0xc7, 0x7f, 0x7e, 0x39, 0x76, 0x81, 0x7e, + 0xc7, 0xf9, 0x09, 0xab, 0xec, 0xb3, 0xba, 0xa3, 0x34, 0x57, 0xf3, 0xbe, 0x3f, 0xd1, 0x0f, 0x09, + 0x4c, 0x88, 0x3d, 0x45, 0x97, 0x0c, 0x0e, 0x32, 0x47, 0x65, 0xf1, 0x62, 0x5f, 0x39, 0x84, 0xb1, + 0x29, 0x61, 0xdc, 0xa6, 0xb7, 0x8c, 0x30, 0x24, 0x39, 0x74, 0x8e, 0xd4, 0x79, 0x7b, 0xec, 0x1c, + 0xc9, 0x5b, 0xde, 0xb1, 0x73, 0x24, 0xef, 0x75, 0xc7, 0xf4, 0x17, 0x04, 0xa6, 0x35, 0x13, 0xa5, + 0x2b, 0x06, 0xd7, 0x1d, 0xe4, 0xbc, 0x78, 0x79, 0x20, 0x59, 0x84, 0xba, 0x22, 0xa1, 0x9e, 0xa7, + 0x56, 0x7f, 0xa8, 0xf4, 0x53, 0x02, 0x85, 0x16, 0x51, 0xa7, 0x26, 0x37, 0x9d, 0x74, 0x7e, 0x38, + 0x4c, 0x1b, 0x12, 0xd3, 0xab, 0x74, 0xdd, 0x88, 0x29, 0x08, 0xb9, 0xef, 0x62, 0x0e, 0x3b, 0x3f, + 0x15, 0x1c, 0xd3, 0x3f, 0x11, 0x98, 0x94, 0xdf, 0x70, 0xa8, 0xa9, 0x6a, 0xd9, 0x4f, 0x72, 0xc5, + 0xe5, 0xfe, 0x82, 0x08, 0xf0, 0x2d, 0x09, 0x70, 0x9b, 0xbe, 0x61, 0x6e, 0x33, 0xa1, 0x93, 0x83, + 0xad, 0x77, 0xc9, 0x7f, 0x4d, 0x60, 0x5a, 0xcf, 0x32, 0x63, 0xc9, 0x3b, 0x3e, 0x00, 0x18, 0xd3, + 0xdb, 0x49, 0xfd, 0xad, 0x9b, 0x12, 0x7d, 0x89, 0x5e, 0xed, 0x87, 0x5e, 0x8d, 0x50, 0xe7, 0xa8, + 0x95, 0xd4, 0x8f, 0x08, 0xcc, 0x66, 0x89, 0x38, 0xb5, 0xcd, 0x65, 0xed, 0x1c, 0xfc, 0x45, 0x67, + 0x60, 0x79, 0xc4, 0x6a, 0x4b, 0xac, 0xcb, 0x74, 0x69, 0x30, 0xac, 0xf4, 0x6f, 0x04, 0x66, 0x32, + 0x84, 0x8f, 0xae, 0x9a, 0x1c, 0x76, 0xf1, 0xf4, 0xa2, 0x3d, 0xa8, 0x38, 0xc2, 0xdb, 0x91, 0xf0, + 0x1e, 0xd2, 0x1f, 0x19, 0xe1, 0x65, 0xa9, 0xa6, 0xea, 0x07, 0x59, 0xf4, 0x5e, 0x5d, 0xf0, 0x3b, + 0x02, 0x27, 0x3b, 0x98, 0x2f, 0x5d, 0x33, 0x27, 0x2e, 0x87, 0x8d, 0x17, 0x4b, 0xc3, 0xa8, 0x60, + 0x3c, 0x6b, 0x32, 0x9e, 0xcb, 0xf4, 0xd2, 0xc0, 0xf1, 0xd0, 0xdf, 0x13, 0x98, 0x52, 0x34, 0xcc, + 0x38, 0xd2, 0xdb, 0x08, 0xb1, 0x71, 0xa4, 0xb7, 0x13, 0x59, 0xeb, 0x0d, 0x09, 0xe9, 0x07, 0x74, + 0xcb, 0x08, 0x09, 0x69, 0xdf, 0x00, 0xd9, 0xfd, 0x15, 0x01, 0x48, 0x19, 0x27, 0xbd, 0x62, 0xce, + 0x52, 0x3b, 0xf7, 0x2d, 0xae, 0x0e, 0x28, 0x8d, 0xd8, 0xaf, 0x48, 0xec, 0x4b, 0xf4, 0xfc, 0x20, + 0xd8, 0xe9, 0xc7, 0x04, 0x0a, 0x2d, 0xca, 0x63, 0x1c, 0xaf, 0x9d, 0x8c, 0xaa, 0x78, 0x65, 0x30, + 0x61, 0x84, 0xf5, 0x3d, 0x09, 0xeb, 0x1a, 0x5d, 0x33, 0xcf, 0xfc, 0x88, 0x73, 0x57, 0x92, 0xcd, + 0xcc, 0x04, 0xf8, 0x98, 0x00, 0xa4, 0x94, 0xd3, 0x98, 0xbd, 0x2e, 0xf6, 0x6b, 0xcc, 0x5e, 0x37, + 0x8f, 0xb5, 0xbe, 0x2b, 0x61, 0x5e, 0xa5, 0xb6, 0x11, 0xa6, 0xf8, 0xeb, 0xf9, 0xb5, 0x0c, 0xc6, + 0x0f, 0x09, 0x4c, 0x6b, 0xd6, 0x6a, 0x9c, 0xa2, 0x1d, 0x54, 0xd8, 0x38, 0x45, 0x3b, 0x69, 0xb0, + 0x75, 0x43, 0xa2, 0x5b, 0xa3, 0x4e, 0x9f, 0x83, 0xd3, 0xaf, 0xca, 0x43, 0xaa, 0xd5, 0x90, 0x62, + 0x44, 0xd1, 0xfb, 0x3c, 0xe9, 0xa0, 0xb8, 0xc6, 0x1d, 0x9e, 0xcf, 0xa3, 0x8d, 0x3b, 0xbc, 0x07, + 0x83, 0xb6, 0xee, 0x49, 0xd8, 0x77, 0xe8, 0xab, 0x46, 0xd8, 0x35, 0x9e, 0xb8, 0x15, 0x69, 0xc1, + 0xcd, 0x6d, 0x83, 0xdf, 0x10, 0x80, 0xfb, 0x3c, 0x41, 0xda, 0x4c, 0xcd, 0x37, 0xb4, 0x2c, 0x17, + 0x2f, 0xae, 0x0c, 0x22, 0x8a, 0x58, 0x6f, 0x49, 0xac, 0xd7, 0xe9, 0xb5, 0xbe, 0x58, 0x43, 0xd6, + 0x74, 0xab, 0x2c, 0x61, 0x19, 0x88, 0x7f, 0x25, 0x40, 0xbb, 0xe9, 0x1f, 0x7d, 0xa5, 0xff, 0xd5, + 0xb8, 0x9b, 0xeb, 0x16, 0xaf, 0x0f, 0xa9, 0x35, 0x54, 0x00, 0x59, 0x3a, 0x9b, 0x09, 0xe0, 0x2f, + 0x04, 0x5e, 0xca, 0xa5, 0xc4, 0xf4, 0x86, 0x79, 0x0a, 0xf5, 0x0e, 0xe3, 0xe6, 0xf0, 0x8a, 0x43, + 0x1d, 0x0c, 0xd9, 0x48, 0xe8, 0x1f, 0x09, 0x9c, 0xec, 0xa0, 0xac, 0xc6, 0x26, 0xcf, 0x67, 0xcb, + 0xc6, 0x26, 0xef, 0xc1, 0x88, 0x07, 0x9c, 0x1c, 0x62, 0x5b, 0xba, 0x0d, 0xa9, 0xee, 0x56, 0x24, + 0xbc, 0x3f, 0x10, 0x80, 0x94, 0xe3, 0x1a, 0xa7, 0x5b, 0x17, 0xad, 0x36, 0x4e, 0xb7, 0x6e, 0xe2, + 0x3c, 0x20, 0x47, 0x90, 0x74, 0x5a, 0xa1, 0x73, 0x8e, 0x34, 0x4b, 0x3f, 0x76, 0x8e, 0x24, 0x2f, + 0x3f, 0xa6, 0x9f, 0x89, 0xab, 0x42, 0x3b, 0x05, 0x36, 0x5f, 0x15, 0x72, 0xf9, 0xb8, 0xf9, 0xaa, + 0x90, 0xcf, 0xd1, 0xad, 0xeb, 0x12, 0xbf, 0x43, 0x57, 0xcd, 0x57, 0x05, 0x45, 0x60, 0xd3, 0x0b, + 0xda, 0x6f, 0x09, 0xcc, 0x66, 0x29, 0xa8, 0xf1, 0x0a, 0x99, 0x43, 0xda, 0x8d, 0x57, 0xc8, 0x3c, + 0x6e, 0x6b, 0x95, 0x24, 0xd0, 0x2b, 0x74, 0xa5, 0xef, 0x31, 0xc2, 0x6a, 0xdc, 0x15, 0xf7, 0x9a, + 0x78, 0xe3, 0xf5, 0xcf, 0x9f, 0x2e, 0x90, 0x2f, 0x9e, 0x2e, 0x90, 0x7f, 0x3f, 0x5d, 0x20, 0x1f, + 0x3c, 0x5b, 0x38, 0xf1, 0xc5, 0xb3, 0x85, 0x13, 0xff, 0x7c, 0xb6, 0x70, 0xe2, 0xed, 0x52, 0x86, + 0xc7, 0x2b, 0x7b, 0xaf, 0xb3, 0xdd, 0xb8, 0xdd, 0xe6, 0xcf, 0x5a, 0x56, 0x25, 0xaf, 0xdf, 0x9d, + 0x92, 0xff, 0x71, 0x70, 0xed, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x95, 0xcf, 0xfa, 0xb6, 0xa6, + 0x21, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2392,25 +2392,25 @@ type QueryClient interface { // Queries a File by index. File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) // Queries a list of File items. - FilesAll(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) + AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a list of File items. OpenFiles(ctx context.Context, in *QueryOpenFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a list of File items. Proof(ctx context.Context, in *QueryProofRequest, opts ...grpc.CallOption) (*QueryProofResponse, error) // Queries a Providers by index. - Providers(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) + Provider(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) // Queries a list of Providers items. - ProvidersAll(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) + AllProviders(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) // Queries a Attestation by index. Attestation(ctx context.Context, in *QueryAttestationRequest, opts ...grpc.CallOption) (*QueryAttestationResponse, error) // Queries a list of Attestation items. - AttestationsAll(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) + AllAttestations(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) // Queries a Report by index. - Reports(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) + Report(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) // Queries a list of Attestation items. - ReportsAll(ctx context.Context, in *QueryAllReportRequest, opts ...grpc.CallOption) (*QueryAllReportResponse, error) + AllReports(ctx context.Context, in *QueryAllReportsRequest, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) // Queries a list of Freespace items. - Freespace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) + FreeSpace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) // Queries a list of Freespace items. StoreCount(ctx context.Context, in *QueryStoreCountRequest, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. @@ -2422,7 +2422,7 @@ type QueryClient interface { // Queries a StoragePaymentInfo by address. StoragePaymentInfo(ctx context.Context, in *QueryStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryStoragePaymentInfoResponse, error) // Queries a list of StoragePaymentInfo items. - StoragePaymentInfoAll(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) + AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) // Queries whether user can upload a file based on size FileUploadCheck(ctx context.Context, in *QueryFileUploadCheckRequest, opts ...grpc.CallOption) (*QueryFileUploadCheckResponse, error) // Queries whether user can upload a file based on size @@ -2459,9 +2459,9 @@ func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...gr return out, nil } -func (c *queryClient) FilesAll(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { +func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { out := new(QueryAllFilesResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/FilesAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllFiles", in, out, opts...) if err != nil { return nil, err } @@ -2486,18 +2486,18 @@ func (c *queryClient) Proof(ctx context.Context, in *QueryProofRequest, opts ... return out, nil } -func (c *queryClient) Providers(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) { +func (c *queryClient) Provider(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) { out := new(QueryProviderResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Providers", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Provider", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) ProvidersAll(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) { +func (c *queryClient) AllProviders(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) { out := new(QueryAllProvidersResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/ProvidersAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllProviders", in, out, opts...) if err != nil { return nil, err } @@ -2513,36 +2513,36 @@ func (c *queryClient) Attestation(ctx context.Context, in *QueryAttestationReque return out, nil } -func (c *queryClient) AttestationsAll(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) { +func (c *queryClient) AllAttestations(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) { out := new(QueryAllAttestationsResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AttestationsAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllAttestations", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Reports(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) { +func (c *queryClient) Report(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) { out := new(QueryReportResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Reports", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Report", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) ReportsAll(ctx context.Context, in *QueryAllReportRequest, opts ...grpc.CallOption) (*QueryAllReportResponse, error) { - out := new(QueryAllReportResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/ReportsAll", in, out, opts...) +func (c *queryClient) AllReports(ctx context.Context, in *QueryAllReportsRequest, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) { + out := new(QueryAllReportsResponse) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllReports", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Freespace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) { +func (c *queryClient) FreeSpace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) { out := new(QueryFreeSpaceResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Freespace", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/FreeSpace", in, out, opts...) if err != nil { return nil, err } @@ -2594,9 +2594,9 @@ func (c *queryClient) StoragePaymentInfo(ctx context.Context, in *QueryStoragePa return out, nil } -func (c *queryClient) StoragePaymentInfoAll(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) { +func (c *queryClient) AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) { out := new(QueryAllStoragePaymentInfoResponse) - err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/StoragePaymentInfoAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllStoragePaymentInfo", in, out, opts...) if err != nil { return nil, err } @@ -2646,25 +2646,25 @@ type QueryServer interface { // Queries a File by index. File(context.Context, *QueryFileRequest) (*QueryFileResponse, error) // Queries a list of File items. - FilesAll(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) + AllFiles(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) // Queries a list of File items. OpenFiles(context.Context, *QueryOpenFilesRequest) (*QueryAllFilesResponse, error) // Queries a list of File items. Proof(context.Context, *QueryProofRequest) (*QueryProofResponse, error) // Queries a Providers by index. - Providers(context.Context, *QueryProviderRequest) (*QueryProviderResponse, error) + Provider(context.Context, *QueryProviderRequest) (*QueryProviderResponse, error) // Queries a list of Providers items. - ProvidersAll(context.Context, *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) + AllProviders(context.Context, *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) // Queries a Attestation by index. Attestation(context.Context, *QueryAttestationRequest) (*QueryAttestationResponse, error) // Queries a list of Attestation items. - AttestationsAll(context.Context, *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) + AllAttestations(context.Context, *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) // Queries a Report by index. - Reports(context.Context, *QueryReportRequest) (*QueryReportResponse, error) + Report(context.Context, *QueryReportRequest) (*QueryReportResponse, error) // Queries a list of Attestation items. - ReportsAll(context.Context, *QueryAllReportRequest) (*QueryAllReportResponse, error) + AllReports(context.Context, *QueryAllReportsRequest) (*QueryAllReportsResponse, error) // Queries a list of Freespace items. - Freespace(context.Context, *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) + FreeSpace(context.Context, *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) // Queries a list of Freespace items. StoreCount(context.Context, *QueryStoreCountRequest) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. @@ -2676,7 +2676,7 @@ type QueryServer interface { // Queries a StoragePaymentInfo by address. StoragePaymentInfo(context.Context, *QueryStoragePaymentInfoRequest) (*QueryStoragePaymentInfoResponse, error) // Queries a list of StoragePaymentInfo items. - StoragePaymentInfoAll(context.Context, *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) + AllStoragePaymentInfo(context.Context, *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) // Queries whether user can upload a file based on size FileUploadCheck(context.Context, *QueryFileUploadCheckRequest) (*QueryFileUploadCheckResponse, error) // Queries whether user can upload a file based on size @@ -2697,8 +2697,8 @@ func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsReq func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFileRequest) (*QueryFileResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method File not implemented") } -func (*UnimplementedQueryServer) FilesAll(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FilesAll not implemented") +func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllFiles not implemented") } func (*UnimplementedQueryServer) OpenFiles(ctx context.Context, req *QueryOpenFilesRequest) (*QueryAllFilesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method OpenFiles not implemented") @@ -2706,26 +2706,26 @@ func (*UnimplementedQueryServer) OpenFiles(ctx context.Context, req *QueryOpenFi func (*UnimplementedQueryServer) Proof(ctx context.Context, req *QueryProofRequest) (*QueryProofResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proof not implemented") } -func (*UnimplementedQueryServer) Providers(ctx context.Context, req *QueryProviderRequest) (*QueryProviderResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Providers not implemented") +func (*UnimplementedQueryServer) Provider(ctx context.Context, req *QueryProviderRequest) (*QueryProviderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Provider not implemented") } -func (*UnimplementedQueryServer) ProvidersAll(ctx context.Context, req *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ProvidersAll not implemented") +func (*UnimplementedQueryServer) AllProviders(ctx context.Context, req *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllProviders not implemented") } func (*UnimplementedQueryServer) Attestation(ctx context.Context, req *QueryAttestationRequest) (*QueryAttestationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Attestation not implemented") } -func (*UnimplementedQueryServer) AttestationsAll(ctx context.Context, req *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method AttestationsAll not implemented") +func (*UnimplementedQueryServer) AllAttestations(ctx context.Context, req *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllAttestations not implemented") } -func (*UnimplementedQueryServer) Reports(ctx context.Context, req *QueryReportRequest) (*QueryReportResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Reports not implemented") +func (*UnimplementedQueryServer) Report(ctx context.Context, req *QueryReportRequest) (*QueryReportResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Report not implemented") } -func (*UnimplementedQueryServer) ReportsAll(ctx context.Context, req *QueryAllReportRequest) (*QueryAllReportResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ReportsAll not implemented") +func (*UnimplementedQueryServer) AllReports(ctx context.Context, req *QueryAllReportsRequest) (*QueryAllReportsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllReports not implemented") } -func (*UnimplementedQueryServer) Freespace(ctx context.Context, req *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Freespace not implemented") +func (*UnimplementedQueryServer) FreeSpace(ctx context.Context, req *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FreeSpace not implemented") } func (*UnimplementedQueryServer) StoreCount(ctx context.Context, req *QueryStoreCountRequest) (*QueryStoreCountResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StoreCount not implemented") @@ -2742,8 +2742,8 @@ func (*UnimplementedQueryServer) GetPayData(ctx context.Context, req *QueryPayDa func (*UnimplementedQueryServer) StoragePaymentInfo(ctx context.Context, req *QueryStoragePaymentInfoRequest) (*QueryStoragePaymentInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StoragePaymentInfo not implemented") } -func (*UnimplementedQueryServer) StoragePaymentInfoAll(ctx context.Context, req *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StoragePaymentInfoAll not implemented") +func (*UnimplementedQueryServer) AllStoragePaymentInfo(ctx context.Context, req *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllStoragePaymentInfo not implemented") } func (*UnimplementedQueryServer) FileUploadCheck(ctx context.Context, req *QueryFileUploadCheckRequest) (*QueryFileUploadCheckResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FileUploadCheck not implemented") @@ -2798,20 +2798,20 @@ func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interfac return interceptor(ctx, in, info, handler) } -func _Query_FilesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllFilesRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).FilesAll(ctx, in) + return srv.(QueryServer).AllFiles(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/FilesAll", + FullMethod: "/canine_chain.storage.Query/AllFiles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).FilesAll(ctx, req.(*QueryAllFilesRequest)) + return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFilesRequest)) } return interceptor(ctx, in, info, handler) } @@ -2852,38 +2852,38 @@ func _Query_Proof_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } -func _Query_Providers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_Provider_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryProviderRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Providers(ctx, in) + return srv.(QueryServer).Provider(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/Providers", + FullMethod: "/canine_chain.storage.Query/Provider", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Providers(ctx, req.(*QueryProviderRequest)) + return srv.(QueryServer).Provider(ctx, req.(*QueryProviderRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_ProvidersAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllProviders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllProvidersRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).ProvidersAll(ctx, in) + return srv.(QueryServer).AllProviders(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/ProvidersAll", + FullMethod: "/canine_chain.storage.Query/AllProviders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ProvidersAll(ctx, req.(*QueryAllProvidersRequest)) + return srv.(QueryServer).AllProviders(ctx, req.(*QueryAllProvidersRequest)) } return interceptor(ctx, in, info, handler) } @@ -2906,74 +2906,74 @@ func _Query_Attestation_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Query_AttestationsAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllAttestations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllAttestationsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).AttestationsAll(ctx, in) + return srv.(QueryServer).AllAttestations(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/AttestationsAll", + FullMethod: "/canine_chain.storage.Query/AllAttestations", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AttestationsAll(ctx, req.(*QueryAllAttestationsRequest)) + return srv.(QueryServer).AllAttestations(ctx, req.(*QueryAllAttestationsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Reports_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_Report_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryReportRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Reports(ctx, in) + return srv.(QueryServer).Report(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/Reports", + FullMethod: "/canine_chain.storage.Query/Report", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Reports(ctx, req.(*QueryReportRequest)) + return srv.(QueryServer).Report(ctx, req.(*QueryReportRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_ReportsAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllReportRequest) +func _Query_AllReports_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllReportsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).ReportsAll(ctx, in) + return srv.(QueryServer).AllReports(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/ReportsAll", + FullMethod: "/canine_chain.storage.Query/AllReports", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ReportsAll(ctx, req.(*QueryAllReportRequest)) + return srv.(QueryServer).AllReports(ctx, req.(*QueryAllReportsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Freespace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_FreeSpace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryFreeSpaceRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Freespace(ctx, in) + return srv.(QueryServer).FreeSpace(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/Freespace", + FullMethod: "/canine_chain.storage.Query/FreeSpace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Freespace(ctx, req.(*QueryFreeSpaceRequest)) + return srv.(QueryServer).FreeSpace(ctx, req.(*QueryFreeSpaceRequest)) } return interceptor(ctx, in, info, handler) } @@ -3068,20 +3068,20 @@ func _Query_StoragePaymentInfo_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Query_StoragePaymentInfoAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Query_AllStoragePaymentInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllStoragePaymentInfoRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).StoragePaymentInfoAll(ctx, in) + return srv.(QueryServer).AllStoragePaymentInfo(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.storage.Query/StoragePaymentInfoAll", + FullMethod: "/canine_chain.storage.Query/AllStoragePaymentInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).StoragePaymentInfoAll(ctx, req.(*QueryAllStoragePaymentInfoRequest)) + return srv.(QueryServer).AllStoragePaymentInfo(ctx, req.(*QueryAllStoragePaymentInfoRequest)) } return interceptor(ctx, in, info, handler) } @@ -3171,8 +3171,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_File_Handler, }, { - MethodName: "FilesAll", - Handler: _Query_FilesAll_Handler, + MethodName: "AllFiles", + Handler: _Query_AllFiles_Handler, }, { MethodName: "OpenFiles", @@ -3183,32 +3183,32 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_Proof_Handler, }, { - MethodName: "Providers", - Handler: _Query_Providers_Handler, + MethodName: "Provider", + Handler: _Query_Provider_Handler, }, { - MethodName: "ProvidersAll", - Handler: _Query_ProvidersAll_Handler, + MethodName: "AllProviders", + Handler: _Query_AllProviders_Handler, }, { MethodName: "Attestation", Handler: _Query_Attestation_Handler, }, { - MethodName: "AttestationsAll", - Handler: _Query_AttestationsAll_Handler, + MethodName: "AllAttestations", + Handler: _Query_AllAttestations_Handler, }, { - MethodName: "Reports", - Handler: _Query_Reports_Handler, + MethodName: "Report", + Handler: _Query_Report_Handler, }, { - MethodName: "ReportsAll", - Handler: _Query_ReportsAll_Handler, + MethodName: "AllReports", + Handler: _Query_AllReports_Handler, }, { - MethodName: "Freespace", - Handler: _Query_Freespace_Handler, + MethodName: "FreeSpace", + Handler: _Query_FreeSpace_Handler, }, { MethodName: "StoreCount", @@ -3231,8 +3231,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_StoragePaymentInfo_Handler, }, { - MethodName: "StoragePaymentInfoAll", - Handler: _Query_StoragePaymentInfoAll_Handler, + MethodName: "AllStoragePaymentInfo", + Handler: _Query_AllStoragePaymentInfo_Handler, }, { MethodName: "FileUploadCheck", @@ -3736,7 +3736,7 @@ func (m *QueryProviderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size, err := m.Providers.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Provider.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4080,7 +4080,7 @@ func (m *QueryReportResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllReportRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllReportsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4090,12 +4090,12 @@ func (m *QueryAllReportRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllReportRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllReportsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllReportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllReportsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4115,7 +4115,7 @@ func (m *QueryAllReportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllReportResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllReportsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4125,12 +4125,12 @@ func (m *QueryAllReportResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllReportResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllReportsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllReportResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllReportsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -5090,7 +5090,7 @@ func (m *QueryProviderResponse) Size() (n int) { } var l int _ = l - l = m.Providers.Size() + l = m.Provider.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -5229,7 +5229,7 @@ func (m *QueryReportResponse) Size() (n int) { return n } -func (m *QueryAllReportRequest) Size() (n int) { +func (m *QueryAllReportsRequest) Size() (n int) { if m == nil { return 0 } @@ -5242,7 +5242,7 @@ func (m *QueryAllReportRequest) Size() (n int) { return n } -func (m *QueryAllReportResponse) Size() (n int) { +func (m *QueryAllReportsResponse) Size() (n int) { if m == nil { return 0 } @@ -6847,7 +6847,7 @@ func (m *QueryProviderResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Providers", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Provider", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6874,7 +6874,7 @@ func (m *QueryProviderResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Providers.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Provider.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7811,7 +7811,7 @@ func (m *QueryReportResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllReportRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllReportsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7834,10 +7834,10 @@ func (m *QueryAllReportRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllReportRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllReportsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllReportRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllReportsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7897,7 +7897,7 @@ func (m *QueryAllReportRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllReportResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllReportsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7920,10 +7920,10 @@ func (m *QueryAllReportResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllReportResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllReportsResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllReportResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllReportsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/storage/types/query.pb.gw.go b/x/storage/types/query.pb.gw.go index 304e49a32..31bdcf58a 100644 --- a/x/storage/types/query.pb.gw.go +++ b/x/storage/types/query.pb.gw.go @@ -150,37 +150,37 @@ func local_request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler } var ( - filter_Query_FilesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllFiles_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_FilesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllFilesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FilesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllFiles_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.FilesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllFiles(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_FilesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllFilesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_FilesAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllFiles_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.FilesAll(ctx, &protoReq) + msg, err := server.AllFiles(ctx, &protoReq) return msg, metadata, err } @@ -377,7 +377,7 @@ func local_request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshale } -func request_Query_Providers_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProviderRequest var metadata runtime.ServerMetadata @@ -399,12 +399,12 @@ func request_Query_Providers_0(ctx context.Context, marshaler runtime.Marshaler, return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := client.Providers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.Provider(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Providers_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProviderRequest var metadata runtime.ServerMetadata @@ -426,43 +426,43 @@ func local_request_Query_Providers_0(ctx context.Context, marshaler runtime.Mars return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := server.Providers(ctx, &protoReq) + msg, err := server.Provider(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_ProvidersAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllProviders_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_ProvidersAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllProviders_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllProvidersRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ProvidersAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllProviders_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ProvidersAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllProviders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_ProvidersAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllProviders_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllProvidersRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ProvidersAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllProviders_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ProvidersAll(ctx, &protoReq) + msg, err := server.AllProviders(ctx, &protoReq) return msg, metadata, err } @@ -588,42 +588,42 @@ func local_request_Query_Attestation_0(ctx context.Context, marshaler runtime.Ma } var ( - filter_Query_AttestationsAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllAttestations_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_AttestationsAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllAttestations_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllAttestationsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AttestationsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllAttestations_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.AttestationsAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllAttestations(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_AttestationsAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllAttestations_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllAttestationsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AttestationsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllAttestations_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.AttestationsAll(ctx, &protoReq) + msg, err := server.AllAttestations(ctx, &protoReq) return msg, metadata, err } -func request_Query_Reports_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_Report_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryReportRequest var metadata runtime.ServerMetadata @@ -678,12 +678,12 @@ func request_Query_Reports_0(ctx context.Context, marshaler runtime.Marshaler, c return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "start", err) } - msg, err := client.Reports(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.Report(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Reports_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_Report_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryReportRequest var metadata runtime.ServerMetadata @@ -738,48 +738,48 @@ func local_request_Query_Reports_0(ctx context.Context, marshaler runtime.Marsha return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "start", err) } - msg, err := server.Reports(ctx, &protoReq) + msg, err := server.Report(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_ReportsAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllReports_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_ReportsAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllReportRequest +func request_Query_AllReports_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllReportsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ReportsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllReports_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ReportsAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllReports(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_ReportsAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllReportRequest +func local_request_Query_AllReports_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllReportsRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ReportsAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllReports_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ReportsAll(ctx, &protoReq) + msg, err := server.AllReports(ctx, &protoReq) return msg, metadata, err } -func request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryFreeSpaceRequest var metadata runtime.ServerMetadata @@ -801,12 +801,12 @@ func request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := client.Freespace(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.FreeSpace(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Freespace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryFreeSpaceRequest var metadata runtime.ServerMetadata @@ -828,7 +828,7 @@ func local_request_Query_Freespace_0(ctx context.Context, marshaler runtime.Mars return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } - msg, err := server.Freespace(ctx, &protoReq) + msg, err := server.FreeSpace(ctx, &protoReq) return msg, metadata, err } @@ -1104,37 +1104,37 @@ func local_request_Query_StoragePaymentInfo_0(ctx context.Context, marshaler run } var ( - filter_Query_StoragePaymentInfoAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_AllStoragePaymentInfo_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_Query_StoragePaymentInfoAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_Query_AllStoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllStoragePaymentInfoRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_StoragePaymentInfoAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllStoragePaymentInfo_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.StoragePaymentInfoAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllStoragePaymentInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_StoragePaymentInfoAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func local_request_Query_AllStoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllStoragePaymentInfoRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_StoragePaymentInfoAll_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllStoragePaymentInfo_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.StoragePaymentInfoAll(ctx, &protoReq) + msg, err := server.AllStoragePaymentInfo(ctx, &protoReq) return msg, metadata, err } @@ -1339,7 +1339,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_FilesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllFiles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1350,7 +1350,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_FilesAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllFiles_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1358,7 +1358,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_FilesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllFiles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1408,7 +1408,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Providers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Provider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1419,7 +1419,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Providers_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Provider_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1427,11 +1427,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Providers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Provider_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ProvidersAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllProviders_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1442,7 +1442,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_ProvidersAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllProviders_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1450,7 +1450,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_ProvidersAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllProviders_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1477,7 +1477,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_AttestationsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllAttestations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1488,7 +1488,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_AttestationsAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllAttestations_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1496,11 +1496,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_AttestationsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllAttestations_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Reports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Report_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1511,7 +1511,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Reports_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Report_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1519,11 +1519,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Reports_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Report_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ReportsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllReports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1534,7 +1534,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_ReportsAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllReports_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1542,11 +1542,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_ReportsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllReports_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Freespace_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_FreeSpace_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1557,7 +1557,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Freespace_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_FreeSpace_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1565,7 +1565,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Freespace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_FreeSpace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1684,7 +1684,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_StoragePaymentInfoAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllStoragePaymentInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1695,7 +1695,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_StoragePaymentInfoAll_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllStoragePaymentInfo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1703,7 +1703,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_StoragePaymentInfoAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllStoragePaymentInfo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1880,7 +1880,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_FilesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllFiles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1889,14 +1889,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_FilesAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllFiles_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_FilesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllFiles_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1940,7 +1940,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Providers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Provider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1949,18 +1949,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Providers_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Provider_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Providers_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Provider_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ProvidersAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllProviders_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1969,14 +1969,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_ProvidersAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllProviders_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_ProvidersAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllProviders_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -2000,7 +2000,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_AttestationsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllAttestations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -2009,18 +2009,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_AttestationsAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllAttestations_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_AttestationsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllAttestations_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Reports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Report_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -2029,18 +2029,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Reports_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Report_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Reports_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Report_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_ReportsAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllReports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -2049,18 +2049,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_ReportsAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllReports_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_ReportsAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllReports_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Freespace_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_FreeSpace_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -2069,14 +2069,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Freespace_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_FreeSpace_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Freespace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_FreeSpace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -2180,7 +2180,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_StoragePaymentInfoAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllStoragePaymentInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -2189,14 +2189,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_StoragePaymentInfoAll_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllStoragePaymentInfo_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_StoragePaymentInfoAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllStoragePaymentInfo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -2284,49 +2284,49 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "params"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_File_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"jackal-dao", "canine-chain", "storage", "files", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_File_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"jackal", "canine-chain", "storage", "files", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_FilesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "files"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "files"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_OpenFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "open_files", "provider_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_OpenFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "open_files", "provider_address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Proof_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal-dao", "canine-chain", "storage", "proof", "provider_address", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Proof_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal", "canine-chain", "storage", "proof", "provider_address", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Providers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "providers", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Provider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "providers", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ProvidersAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "providers"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllProviders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "providers"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Attestation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal-dao", "canine-chain", "storage", "attestations", "prover", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Attestation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal", "canine-chain", "storage", "attestations", "prover", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AttestationsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "attestations"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllAttestations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "attestations"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Reports_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal-dao", "canine-chain", "storage", "reports", "prover", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Report_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal", "canine-chain", "storage", "reports", "prover", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ReportsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "reports"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllReports_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "reports"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Freespace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "free_space", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_FreeSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "free_space", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_StoreCount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "storing", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_StoreCount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "storing", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_FindFile_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "find_file", "merkle"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_FindFile_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "find_file", "merkle"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetClientFreeSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "get_client_free_space", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_GetClientFreeSpace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "get_client_free_space", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetPayData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "get_pay_data", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_GetPayData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "get_pay_data", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_StoragePaymentInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal-dao", "canine-chain", "storage", "payment_info", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_StoragePaymentInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "payment_info", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_StoragePaymentInfoAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "payment_info"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllStoragePaymentInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "payment_info"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_FileUploadCheck_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "file_upload_check"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_FileUploadCheck_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "file_upload_check"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PriceCheck_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal-dao", "canine-chain", "storage", "price_check", "duration", "bytes"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PriceCheck_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"jackal", "canine-chain", "storage", "price_check", "duration", "bytes"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ActiveProviders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "active_providers"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ActiveProviders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "active_providers"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_StorageStats_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal-dao", "canine-chain", "storage", "storage_stats"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_StorageStats_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "storage_stats"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -2334,25 +2334,25 @@ var ( forward_Query_File_0 = runtime.ForwardResponseMessage - forward_Query_FilesAll_0 = runtime.ForwardResponseMessage + forward_Query_AllFiles_0 = runtime.ForwardResponseMessage forward_Query_OpenFiles_0 = runtime.ForwardResponseMessage forward_Query_Proof_0 = runtime.ForwardResponseMessage - forward_Query_Providers_0 = runtime.ForwardResponseMessage + forward_Query_Provider_0 = runtime.ForwardResponseMessage - forward_Query_ProvidersAll_0 = runtime.ForwardResponseMessage + forward_Query_AllProviders_0 = runtime.ForwardResponseMessage forward_Query_Attestation_0 = runtime.ForwardResponseMessage - forward_Query_AttestationsAll_0 = runtime.ForwardResponseMessage + forward_Query_AllAttestations_0 = runtime.ForwardResponseMessage - forward_Query_Reports_0 = runtime.ForwardResponseMessage + forward_Query_Report_0 = runtime.ForwardResponseMessage - forward_Query_ReportsAll_0 = runtime.ForwardResponseMessage + forward_Query_AllReports_0 = runtime.ForwardResponseMessage - forward_Query_Freespace_0 = runtime.ForwardResponseMessage + forward_Query_FreeSpace_0 = runtime.ForwardResponseMessage forward_Query_StoreCount_0 = runtime.ForwardResponseMessage @@ -2364,7 +2364,7 @@ var ( forward_Query_StoragePaymentInfo_0 = runtime.ForwardResponseMessage - forward_Query_StoragePaymentInfoAll_0 = runtime.ForwardResponseMessage + forward_Query_AllStoragePaymentInfo_0 = runtime.ForwardResponseMessage forward_Query_FileUploadCheck_0 = runtime.ForwardResponseMessage From b7e852960312707cee9c07826086aa38e32b59fe Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 23:06:12 -0500 Subject: [PATCH 04/14] storage module query refactor --- proto/canine_chain/storage/query.proto | 96 +- x/storage/client/cli/query_active_deals.go | 6 +- x/storage/client/cli/query_attest.go | 8 +- x/storage/client/cli/query_check_price.go | 2 +- .../client/cli/query_file_upload_check.go | 2 +- x/storage/client/cli/query_find_file.go | 2 +- x/storage/client/cli/query_freespace.go | 4 +- .../client/cli/query_get_client_free_space.go | 2 +- x/storage/client/cli/query_get_pay_data.go | 2 +- x/storage/client/cli/query_miners.go | 6 +- x/storage/client/cli/query_params.go | 2 +- x/storage/client/cli/query_pay_info.go | 2 +- x/storage/client/cli/query_payment_info.go | 4 +- x/storage/client/cli/query_storage_stats.go | 2 +- x/storage/client/cli/tx_post_file.go | 2 +- x/storage/keeper/attestation_test.go | 2 +- x/storage/keeper/grpc_query_active_deals.go | 10 +- x/storage/keeper/grpc_query_attestation.go | 4 +- .../keeper/grpc_query_file_upload_check.go | 2 +- x/storage/keeper/grpc_query_find_file.go | 2 +- x/storage/keeper/grpc_query_freespace.go | 4 +- .../grpc_query_get_client_free_space.go | 2 +- x/storage/keeper/grpc_query_get_pay_data.go | 2 +- x/storage/keeper/grpc_query_params.go | 2 +- x/storage/keeper/grpc_query_pay_info.go | 2 +- x/storage/keeper/grpc_query_payment_info.go | 4 +- x/storage/keeper/grpc_query_price_check.go | 2 +- x/storage/keeper/grpc_query_providers.go | 6 +- x/storage/keeper/grpc_query_report.go | 4 +- x/storage/keeper/grpc_query_storage_stats.go | 2 +- x/storage/keeper/providers_test.go | 4 +- x/storage/keeper/report_test.go | 2 +- x/storage/types/query.pb.go | 1614 ++++++++--------- x/storage/types/query.pb.gw.go | 88 +- 34 files changed, 949 insertions(+), 951 deletions(-) diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index 5da79a298..faa8c6a2a 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -16,145 +16,145 @@ option go_package = "github.com/jackalLabs/canine-chain/x/storage/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params(QueryParams) returns (QueryParamsResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/params"; } // Queries a File by index. - rpc File(QueryFileRequest) returns (QueryFileResponse) { + rpc File(QueryFile) returns (QueryFileResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/files/{merkle}/{owner}/{start}"; } // Queries a list of File items. - rpc AllFiles(QueryAllFilesRequest) + rpc AllFiles(QueryAllFiles) returns (QueryAllFilesResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/files"; } // Queries a list of File items. - rpc OpenFiles(QueryOpenFilesRequest) + rpc OpenFiles(QueryOpenFiles) returns (QueryAllFilesResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/open_files/{provider_address}"; } // Queries a list of File items. - rpc Proof(QueryProofRequest) + rpc Proof(QueryProof) returns (QueryProofResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/proof/{provider_address}/{merkle}/{owner}/{start}"; } // Queries a Providers by index. - rpc Provider(QueryProviderRequest) returns (QueryProviderResponse) { + rpc Provider(QueryProvider) returns (QueryProviderResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/providers/{address}"; } // Queries a list of Providers items. - rpc AllProviders(QueryAllProvidersRequest) + rpc AllProviders(QueryAllProviders) returns (QueryAllProvidersResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/providers"; } // Queries a Attestation by index. - rpc Attestation(QueryAttestationRequest) returns (QueryAttestationResponse) { + rpc Attestation(QueryAttestation) returns (QueryAttestationResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/attestations/{prover}/{merkle}/{owner}/{start}"; } // Queries a list of Attestation items. - rpc AllAttestations(QueryAllAttestationsRequest) + rpc AllAttestations(QueryAllAttestations) returns (QueryAllAttestationsResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/attestations"; } // Queries a Report by index. - rpc Report(QueryReportRequest) returns (QueryReportResponse) { + rpc Report(QueryReport) returns (QueryReportResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/reports/{prover}/{merkle}/{owner}/{start}"; } // Queries a list of Attestation items. - rpc AllReports(QueryAllReportsRequest) + rpc AllReports(QueryAllReports) returns (QueryAllReportsResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/reports"; } - // Queries a list of Freespace items. - rpc FreeSpace(QueryFreeSpaceRequest) returns (QueryFreeSpaceResponse) { + // Queries a list of FreeSpace items. + rpc FreeSpace(QueryFreeSpace) returns (QueryFreeSpaceResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/free_space/{address}"; } - // Queries a list of Freespace items. - rpc StoreCount(QueryStoreCountRequest) returns (QueryStoreCountResponse) { + // Queries a list of FreeSpace items. + rpc StoreCount(QueryStoreCount) returns (QueryStoreCountResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/storing/{address}"; } // Queries a list of FindFile items. - rpc FindFile(QueryFindFileRequest) returns (QueryFindFileResponse) { + rpc FindFile(QueryFindFile) returns (QueryFindFileResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/find_file/{merkle}"; } // Queries a list of GetClientFreeSpace items. - rpc GetClientFreeSpace(QueryClientFreeSpaceRequest) + rpc GetClientFreeSpace(QueryClientFreeSpace) returns (QueryClientFreeSpaceResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/get_client_free_space/{address}"; } // Queries a list of GetPayData items. - rpc GetPayData(QueryPayDataRequest) returns (QueryPayDataResponse) { + rpc GetPayData(QueryPayData) returns (QueryPayDataResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/get_pay_data/{address}"; } // Queries a StoragePaymentInfo by address. - rpc StoragePaymentInfo(QueryStoragePaymentInfoRequest) returns (QueryStoragePaymentInfoResponse) { + rpc StoragePaymentInfo(QueryStoragePaymentInfo) returns (QueryStoragePaymentInfoResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/payment_info/{address}"; } // Queries a list of StoragePaymentInfo items. - rpc AllStoragePaymentInfo(QueryAllStoragePaymentInfoRequest) + rpc AllStoragePaymentInfo(QueryAllStoragePaymentInfo) returns (QueryAllStoragePaymentInfoResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/payment_info"; } // Queries whether user can upload a file based on size - rpc FileUploadCheck(QueryFileUploadCheckRequest) returns (QueryFileUploadCheckResponse) { + rpc FileUploadCheck(QueryFileUploadCheck) returns (QueryFileUploadCheckResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/file_upload_check"; } // Queries whether user can upload a file based on size - rpc PriceCheck(QueryPriceCheckRequest) returns (QueryPriceCheckResponse) { + rpc PriceCheck(QueryPriceCheck) returns (QueryPriceCheckResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/price_check/{duration}/{bytes}"; } // Queries whether user can upload a file based on size - rpc ActiveProviders(QueryActiveProvidersRequest) returns (QueryActiveProvidersResponse) { + rpc ActiveProviders(QueryActiveProviders) returns (QueryActiveProvidersResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/active_providers"; } // Queries the storage space used and purchased - rpc StorageStats(QueryStorageStatsRequest) returns (QueryStorageStatsResponse) { + rpc StorageStats(QueryStorageStats) returns (QueryStorageStatsResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/storage_stats"; } } -// QueryParamsRequest is request type for the Query/Params RPC method. -message QueryParamsRequest {} +// QueryParams is request type for the Query/Params RPC method. +message QueryParams {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { @@ -162,7 +162,7 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryProofRequest { +message QueryProof { string provider_address = 1; bytes merkle = 2; string owner = 3; @@ -173,7 +173,7 @@ message QueryProofResponse { FileProof proof = 1 [ (gogoproto.nullable) = false ]; } -message QueryProofsByAddressRequest { +message QueryProofsByAddress { string provider_address = 1; cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -183,7 +183,7 @@ message QueryProofsByAddressResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryFileRequest { +message QueryFile { bytes merkle = 1; string owner = 2; int64 start = 3; @@ -193,11 +193,11 @@ message QueryFileResponse { UnifiedFile file = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllFilesRequest { +message QueryAllFiles { cosmos.base.query.v1beta1.PageRequest pagination = 1; } -message QueryOpenFilesRequest { +message QueryOpenFiles { string provider_address= 1; cosmos.base.query.v1beta1.PageRequest pagination = 2; } @@ -207,13 +207,13 @@ message QueryAllFilesResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryProviderRequest { string address = 1; } +message QueryProvider { string address = 1; } message QueryProviderResponse { Providers provider = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllProvidersRequest { +message QueryAllProviders { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -223,7 +223,7 @@ message QueryAllProvidersResponse { } -message QueryAttestationRequest { +message QueryAttestation { string prover = 1; bytes merkle = 2; string owner = 3; @@ -234,7 +234,7 @@ message QueryAttestationResponse { AttestationForm attestation = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllAttestationsRequest { +message QueryAllAttestations { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -244,7 +244,7 @@ message QueryAllAttestationsResponse { } -message QueryReportRequest { +message QueryReport { string prover = 1; bytes merkle = 2; string owner = 3; @@ -255,7 +255,7 @@ message QueryReportResponse { ReportForm report = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllReportsRequest { +message QueryAllReports { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -264,39 +264,39 @@ message QueryAllReportsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryFreeSpaceRequest { string address = 1; } +message QueryFreeSpace { string address = 1; } -message QueryStoreCountRequest { string address = 1; } +message QueryStoreCount { string address = 1; } message QueryFreeSpaceResponse { string space = 1; } message QueryStoreCountResponse { string count = 1; } -message QueryFindFileRequest { bytes merkle = 1; } +message QueryFindFile { bytes merkle = 1; } message QueryFindFileResponse { string provider_ips = 1; } -message QueryClientFreeSpaceRequest { string address = 1; } +message QueryClientFreeSpace { string address = 1; } message QueryClientFreeSpaceResponse { int64 bytes_free = 1; } -message QueryPayDataRequest { string address = 1; } +message QueryPayData { string address = 1; } message QueryPayDataResponse { int64 time_remaining = 1; int64 bytes = 2; } -message QueryStoragePaymentInfoRequest { string address = 1; } +message QueryStoragePaymentInfo { string address = 1; } message QueryStoragePaymentInfoResponse { StoragePaymentInfo storage_payment_info = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllStoragePaymentInfoRequest { +message QueryAllStoragePaymentInfo { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -305,7 +305,7 @@ message QueryAllStoragePaymentInfoResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryFileUploadCheckRequest { +message QueryFileUploadCheck { string address = 1; int64 bytes = 2; } @@ -314,7 +314,7 @@ message QueryFileUploadCheckResponse { bool valid = 1; } -message QueryPriceCheckRequest { +message QueryPriceCheck { string duration = 1; int64 bytes = 2; } @@ -323,14 +323,14 @@ message QueryPriceCheckResponse { int64 price = 1; } -message QueryActiveProvidersRequest { +message QueryActiveProviders { } message QueryActiveProvidersResponse { repeated ActiveProviders providers = 1 [ (gogoproto.nullable) = false ]; } -message QueryStorageStatsRequest {} +message QueryStorageStats {} message QueryStorageStatsResponse { uint64 purchased = 1; diff --git a/x/storage/client/cli/query_active_deals.go b/x/storage/client/cli/query_active_deals.go index 1dc0d8a26..7145c48a5 100644 --- a/x/storage/client/cli/query_active_deals.go +++ b/x/storage/client/cli/query_active_deals.go @@ -25,7 +25,7 @@ func CmdListActiveDeals() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllFilesRequest{ + params := &types.QueryAllFiles{ Pagination: pageReq, } @@ -67,7 +67,7 @@ func CmdShowActiveDeals() *cobra.Command { panic(err) } - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Merkle: merkle, Start: start, Owner: argOwner, @@ -110,7 +110,7 @@ func CmdShowProof() *cobra.Command { panic(err) } - params := &types.QueryProofRequest{ + params := &types.QueryProof{ ProviderAddress: argProver, Merkle: merkle, Start: start, diff --git a/x/storage/client/cli/query_attest.go b/x/storage/client/cli/query_attest.go index 6248b10c8..24a083ba1 100644 --- a/x/storage/client/cli/query_attest.go +++ b/x/storage/client/cli/query_attest.go @@ -25,7 +25,7 @@ func CmdListAttestForms() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllAttestationsRequest{ + params := &types.QueryAllAttestations{ Pagination: pageReq, } @@ -68,7 +68,7 @@ func CmdShowAttestForms() *cobra.Command { panic(err) } - params := &types.QueryAttestationRequest{ + params := &types.QueryAttestation{ Prover: argProver, Merkle: merkle, Owner: argOwner, @@ -103,7 +103,7 @@ func CmdListReportForms() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllReportsRequest{ + params := &types.QueryAllReports{ Pagination: pageReq, } @@ -146,7 +146,7 @@ func CmdShowReportForms() *cobra.Command { panic(err) } - params := &types.QueryReportRequest{ + params := &types.QueryReport{ Prover: argProver, Merkle: merkle, Owner: argOwner, diff --git a/x/storage/client/cli/query_check_price.go b/x/storage/client/cli/query_check_price.go index c8c6b53d1..bbb00135f 100644 --- a/x/storage/client/cli/query_check_price.go +++ b/x/storage/client/cli/query_check_price.go @@ -32,7 +32,7 @@ func CmdCheckPrice() *cobra.Command { return err } - params := &types.QueryPriceCheckRequest{ + params := &types.QueryPriceCheck{ Duration: reqDuration, Bytes: i, } diff --git a/x/storage/client/cli/query_file_upload_check.go b/x/storage/client/cli/query_file_upload_check.go index 9a48210dc..a3f406675 100644 --- a/x/storage/client/cli/query_file_upload_check.go +++ b/x/storage/client/cli/query_file_upload_check.go @@ -27,7 +27,7 @@ func CmdFileUploadCheck() *cobra.Command { return err } - params := &types.QueryFileUploadCheckRequest{ + params := &types.QueryFileUploadCheck{ Address: argAddr, Bytes: reqByte, } diff --git a/x/storage/client/cli/query_find_file.go b/x/storage/client/cli/query_find_file.go index 10180ce96..e6322a6ef 100644 --- a/x/storage/client/cli/query_find_file.go +++ b/x/storage/client/cli/query_find_file.go @@ -32,7 +32,7 @@ func CmdFindFile() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryFindFileRequest{ + params := &types.QueryFindFile{ Merkle: merkle, } diff --git a/x/storage/client/cli/query_freespace.go b/x/storage/client/cli/query_freespace.go index ea5d9d3a2..fc018ee06 100644 --- a/x/storage/client/cli/query_freespace.go +++ b/x/storage/client/cli/query_freespace.go @@ -26,7 +26,7 @@ func CmdFreespace() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryFreeSpaceRequest{ + params := &types.QueryFreeSpace{ Address: reqAddress, } @@ -59,7 +59,7 @@ func CmdFileCount() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryStoreCountRequest{ + params := &types.QueryStoreCount{ Address: reqAddress, } diff --git a/x/storage/client/cli/query_get_client_free_space.go b/x/storage/client/cli/query_get_client_free_space.go index 7448351c6..b2dee5ee4 100644 --- a/x/storage/client/cli/query_get_client_free_space.go +++ b/x/storage/client/cli/query_get_client_free_space.go @@ -26,7 +26,7 @@ func CmdGetClientFreeSpace() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryClientFreeSpaceRequest{ + params := &types.QueryClientFreeSpace{ Address: reqAddress, } diff --git a/x/storage/client/cli/query_get_pay_data.go b/x/storage/client/cli/query_get_pay_data.go index 39aaa5045..732ace05f 100644 --- a/x/storage/client/cli/query_get_pay_data.go +++ b/x/storage/client/cli/query_get_pay_data.go @@ -26,7 +26,7 @@ func CmdGetPayData() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryPayDataRequest{ + params := &types.QueryPayData{ Address: reqAddress, } diff --git a/x/storage/client/cli/query_miners.go b/x/storage/client/cli/query_miners.go index 8691f1e9b..59a2c2c4d 100644 --- a/x/storage/client/cli/query_miners.go +++ b/x/storage/client/cli/query_miners.go @@ -23,7 +23,7 @@ func CmdListProviders() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllProvidersRequest{ + params := &types.QueryAllProviders{ Pagination: pageReq, } @@ -50,7 +50,7 @@ func CmdListActiveProviders() *cobra.Command { clientCtx := client.GetClientContextFromCmd(cmd) queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryActiveProvidersRequest{} + params := &types.QueryActiveProviders{} res, err := queryClient.ActiveProviders(context.Background(), params) if err != nil { return err @@ -78,7 +78,7 @@ func CmdShowProviders() *cobra.Command { argAddress := args[0] - params := &types.QueryProviderRequest{ + params := &types.QueryProvider{ Address: argAddress, } diff --git a/x/storage/client/cli/query_params.go b/x/storage/client/cli/query_params.go index 25aa726db..819858fb0 100644 --- a/x/storage/client/cli/query_params.go +++ b/x/storage/client/cli/query_params.go @@ -19,7 +19,7 @@ func CmdQueryParams() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + res, err := queryClient.Params(context.Background(), &types.QueryParams{}) if err != nil { return err } diff --git a/x/storage/client/cli/query_pay_info.go b/x/storage/client/cli/query_pay_info.go index a3cf663dc..be12517bd 100644 --- a/x/storage/client/cli/query_pay_info.go +++ b/x/storage/client/cli/query_pay_info.go @@ -26,7 +26,7 @@ func CmdPayInfo() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryStoragePaymentInfoRequest{ + params := &types.QueryStoragePaymentInfo{ Address: reqAddress, } diff --git a/x/storage/client/cli/query_payment_info.go b/x/storage/client/cli/query_payment_info.go index 2fc2cdc9f..f8cff5208 100644 --- a/x/storage/client/cli/query_payment_info.go +++ b/x/storage/client/cli/query_payment_info.go @@ -23,7 +23,7 @@ func CmdListStoragePaymentInfo() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllStoragePaymentInfoRequest{ + params := &types.QueryAllStoragePaymentInfo{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowStoragePaymentInfo() *cobra.Command { argAddress := args[0] - params := &types.QueryStoragePaymentInfoRequest{ + params := &types.QueryStoragePaymentInfo{ Address: argAddress, } diff --git a/x/storage/client/cli/query_storage_stats.go b/x/storage/client/cli/query_storage_stats.go index 38c21cd90..f04063f35 100644 --- a/x/storage/client/cli/query_storage_stats.go +++ b/x/storage/client/cli/query_storage_stats.go @@ -18,7 +18,7 @@ func CmdGetStorageStats() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryStorageStatsRequest{} + params := &types.QueryStorageStats{} res, err := queryClient.StorageStats(context.Background(), params) if err != nil { diff --git a/x/storage/client/cli/tx_post_file.go b/x/storage/client/cli/tx_post_file.go index 0dda89d98..627e635e6 100644 --- a/x/storage/client/cli/tx_post_file.go +++ b/x/storage/client/cli/tx_post_file.go @@ -280,7 +280,7 @@ func CmdPostFile() *cobra.Command { panic(err) } cl := types.NewQueryClient(clientCtx) - provReq := types.QueryAllProvidersRequest{ + provReq := types.QueryAllProviders{ Pagination: pageReq, } diff --git a/x/storage/keeper/attestation_test.go b/x/storage/keeper/attestation_test.go index 1482aed78..3198d22bc 100644 --- a/x/storage/keeper/attestation_test.go +++ b/x/storage/keeper/attestation_test.go @@ -22,7 +22,7 @@ func (suite *KeeperTestSuite) TestSetAttestationForm() { suite.storageKeeper.SetAttestationForm(suite.ctx, attestation) - attestationRequest := types.QueryAttestationRequest{ + attestationRequest := types.QueryAttestation{ Prover: "prover", Merkle: []byte("merkle"), Owner: "owner", diff --git a/x/storage/keeper/grpc_query_active_deals.go b/x/storage/keeper/grpc_query_active_deals.go index 5b4764f8d..0242a3c85 100644 --- a/x/storage/keeper/grpc_query_active_deals.go +++ b/x/storage/keeper/grpc_query_active_deals.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { +func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFiles) (*types.QueryAllFilesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -41,7 +41,7 @@ func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*t // OpenFiles returns a paginated list of files with space that providers have yet to fill // // TODO: Create unit-test cases for this -func (k Keeper) OpenFiles(c context.Context, req *types.QueryOpenFilesRequest) (*types.QueryAllFilesResponse, error) { +func (k Keeper) OpenFiles(c context.Context, req *types.QueryOpenFiles) (*types.QueryAllFilesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -77,7 +77,7 @@ func (k Keeper) OpenFiles(c context.Context, req *types.QueryOpenFilesRequest) ( return &types.QueryAllFilesResponse{Files: files, Pagination: &qpr}, nil } -func (k Keeper) File(c context.Context, req *types.QueryFileRequest) (*types.QueryFileResponse, error) { +func (k Keeper) File(c context.Context, req *types.QueryFile) (*types.QueryFileResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -96,7 +96,7 @@ func (k Keeper) File(c context.Context, req *types.QueryFileRequest) (*types.Que return &types.QueryFileResponse{File: val}, nil } -func (k Keeper) Proof(c context.Context, req *types.QueryProofRequest) (*types.QueryProofResponse, error) { +func (k Keeper) Proof(c context.Context, req *types.QueryProof) (*types.QueryProofResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -116,7 +116,7 @@ func (k Keeper) Proof(c context.Context, req *types.QueryProofRequest) (*types.Q return &types.QueryProofResponse{Proof: val}, nil } -func (k Keeper) AllProofs(c context.Context, req *types.QueryProofsByAddressRequest) (*types.QueryProofsByAddressResponse, error) { +func (k Keeper) AllProofs(c context.Context, req *types.QueryProofsByAddress) (*types.QueryProofsByAddressResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_attestation.go b/x/storage/keeper/grpc_query_attestation.go index 9cdffb8e2..52455e387 100644 --- a/x/storage/keeper/grpc_query_attestation.go +++ b/x/storage/keeper/grpc_query_attestation.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllAttestations(c context.Context, req *types.QueryAllAttestationsRequest) (*types.QueryAllAttestationsResponse, error) { +func (k Keeper) AllAttestations(c context.Context, req *types.QueryAllAttestations) (*types.QueryAllAttestationsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllAttestations(c context.Context, req *types.QueryAllAttestatio return &types.QueryAllAttestationsResponse{Attestations: attestations, Pagination: pageRes}, nil } -func (k Keeper) Attestation(c context.Context, req *types.QueryAttestationRequest) (*types.QueryAttestationResponse, error) { +func (k Keeper) Attestation(c context.Context, req *types.QueryAttestation) (*types.QueryAttestationResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_file_upload_check.go b/x/storage/keeper/grpc_query_file_upload_check.go index 06ab09d5a..368b39b5c 100644 --- a/x/storage/keeper/grpc_query_file_upload_check.go +++ b/x/storage/keeper/grpc_query_file_upload_check.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) FileUploadCheck(c context.Context, req *types.QueryFileUploadCheckRequest) (*types.QueryFileUploadCheckResponse, error) { +func (k Keeper) FileUploadCheck(c context.Context, req *types.QueryFileUploadCheck) (*types.QueryFileUploadCheckResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_find_file.go b/x/storage/keeper/grpc_query_find_file.go index 2eb30f620..e979cf173 100644 --- a/x/storage/keeper/grpc_query_find_file.go +++ b/x/storage/keeper/grpc_query_find_file.go @@ -35,7 +35,7 @@ func (k Keeper) ListFiles(ctx sdk.Context, merkle []byte) []string { return providers } -func (k Keeper) FindFile(goCtx context.Context, req *types.QueryFindFileRequest) (*types.QueryFindFileResponse, error) { +func (k Keeper) FindFile(goCtx context.Context, req *types.QueryFindFile) (*types.QueryFindFileResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_freespace.go b/x/storage/keeper/grpc_query_freespace.go index 38b2ba790..e291d2b48 100644 --- a/x/storage/keeper/grpc_query_freespace.go +++ b/x/storage/keeper/grpc_query_freespace.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) FreeSpace(goCtx context.Context, req *types.QueryFreeSpaceRequest) (*types.QueryFreeSpaceResponse, error) { +func (k Keeper) FreeSpace(goCtx context.Context, req *types.QueryFreeSpace) (*types.QueryFreeSpaceResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -36,7 +36,7 @@ func (k Keeper) FreeSpace(goCtx context.Context, req *types.QueryFreeSpaceReques }, nil } -func (k Keeper) StoreCount(goCtx context.Context, req *types.QueryStoreCountRequest) (*types.QueryStoreCountResponse, error) { +func (k Keeper) StoreCount(goCtx context.Context, req *types.QueryStoreCount) (*types.QueryStoreCountResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_get_client_free_space.go b/x/storage/keeper/grpc_query_get_client_free_space.go index c0f250a6d..caf6185f6 100644 --- a/x/storage/keeper/grpc_query_get_client_free_space.go +++ b/x/storage/keeper/grpc_query_get_client_free_space.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) GetClientFreeSpace(goCtx context.Context, req *types.QueryClientFreeSpaceRequest) (*types.QueryClientFreeSpaceResponse, error) { +func (k Keeper) GetClientFreeSpace(goCtx context.Context, req *types.QueryClientFreeSpace) (*types.QueryClientFreeSpaceResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_get_pay_data.go b/x/storage/keeper/grpc_query_get_pay_data.go index 78ceedbe9..14d1c9446 100644 --- a/x/storage/keeper/grpc_query_get_pay_data.go +++ b/x/storage/keeper/grpc_query_get_pay_data.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) GetPayData(goCtx context.Context, req *types.QueryPayDataRequest) (*types.QueryPayDataResponse, error) { +func (k Keeper) GetPayData(goCtx context.Context, req *types.QueryPayData) (*types.QueryPayDataResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_params.go b/x/storage/keeper/grpc_query_params.go index 9e42f2f1b..b9eccad45 100644 --- a/x/storage/keeper/grpc_query_params.go +++ b/x/storage/keeper/grpc_query_params.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(c context.Context, req *types.QueryParams) (*types.QueryParamsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_pay_info.go b/x/storage/keeper/grpc_query_pay_info.go index cb73cf8f3..68cdd755c 100644 --- a/x/storage/keeper/grpc_query_pay_info.go +++ b/x/storage/keeper/grpc_query_pay_info.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) PaymentInfo(goCtx context.Context, req *types.QueryStoragePaymentInfoRequest) (*types.QueryStoragePaymentInfoResponse, error) { +func (k Keeper) PaymentInfo(goCtx context.Context, req *types.QueryStoragePaymentInfo) (*types.QueryStoragePaymentInfoResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_payment_info.go b/x/storage/keeper/grpc_query_payment_info.go index 383f30a7d..e6cb05b01 100644 --- a/x/storage/keeper/grpc_query_payment_info.go +++ b/x/storage/keeper/grpc_query_payment_info.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllStoragePaymentInfo(c context.Context, req *types.QueryAllStoragePaymentInfoRequest) (*types.QueryAllStoragePaymentInfoResponse, error) { +func (k Keeper) AllStoragePaymentInfo(c context.Context, req *types.QueryAllStoragePaymentInfo) (*types.QueryAllStoragePaymentInfoResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllStoragePaymentInfo(c context.Context, req *types.QueryAllStor return &types.QueryAllStoragePaymentInfoResponse{StoragePaymentInfo: storagePaymentInfos, Pagination: pageRes}, nil } -func (k Keeper) StoragePaymentInfo(c context.Context, req *types.QueryStoragePaymentInfoRequest) (*types.QueryStoragePaymentInfoResponse, error) { +func (k Keeper) StoragePaymentInfo(c context.Context, req *types.QueryStoragePaymentInfo) (*types.QueryStoragePaymentInfoResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_price_check.go b/x/storage/keeper/grpc_query_price_check.go index 13d361b22..f52644f9b 100644 --- a/x/storage/keeper/grpc_query_price_check.go +++ b/x/storage/keeper/grpc_query_price_check.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) PriceCheck(c context.Context, req *types.QueryPriceCheckRequest) (*types.QueryPriceCheckResponse, error) { +func (k Keeper) PriceCheck(c context.Context, req *types.QueryPriceCheck) (*types.QueryPriceCheckResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_providers.go b/x/storage/keeper/grpc_query_providers.go index f358a622c..a733d75b1 100644 --- a/x/storage/keeper/grpc_query_providers.go +++ b/x/storage/keeper/grpc_query_providers.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllProviders(c context.Context, req *types.QueryAllProvidersRequest) (*types.QueryAllProvidersResponse, error) { +func (k Keeper) AllProviders(c context.Context, req *types.QueryAllProviders) (*types.QueryAllProvidersResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllProviders(c context.Context, req *types.QueryAllProvidersRequ return &types.QueryAllProvidersResponse{Providers: providerss, Pagination: pageRes}, nil } -func (k Keeper) Provider(c context.Context, req *types.QueryProviderRequest) (*types.QueryProviderResponse, error) { +func (k Keeper) Provider(c context.Context, req *types.QueryProvider) (*types.QueryProviderResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -55,7 +55,7 @@ func (k Keeper) Provider(c context.Context, req *types.QueryProviderRequest) (*t return &types.QueryProviderResponse{Provider: val}, nil } -func (k Keeper) ActiveProviders(c context.Context, req *types.QueryActiveProvidersRequest) (*types.QueryActiveProvidersResponse, error) { +func (k Keeper) ActiveProviders(c context.Context, req *types.QueryActiveProviders) (*types.QueryActiveProvidersResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_report.go b/x/storage/keeper/grpc_query_report.go index 4aee1de87..b7035a8a2 100644 --- a/x/storage/keeper/grpc_query_report.go +++ b/x/storage/keeper/grpc_query_report.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllReports(c context.Context, req *types.QueryAllReportsRequest) (*types.QueryAllReportsResponse, error) { +func (k Keeper) AllReports(c context.Context, req *types.QueryAllReports) (*types.QueryAllReportsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllReports(c context.Context, req *types.QueryAllReportsRequest) return &types.QueryAllReportsResponse{Reports: reports, Pagination: pageRes}, nil } -func (k Keeper) Report(c context.Context, req *types.QueryReportRequest) (*types.QueryReportResponse, error) { +func (k Keeper) Report(c context.Context, req *types.QueryReport) (*types.QueryReportResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/grpc_query_storage_stats.go b/x/storage/keeper/grpc_query_storage_stats.go index 53d01913e..bcbdbcd1d 100644 --- a/x/storage/keeper/grpc_query_storage_stats.go +++ b/x/storage/keeper/grpc_query_storage_stats.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) StorageStats(c context.Context, req *types.QueryStorageStatsRequest) (*types.QueryStorageStatsResponse, error) { +func (k Keeper) StorageStats(c context.Context, req *types.QueryStorageStats) (*types.QueryStorageStatsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 336b32286..bf2c0f558 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -26,7 +26,7 @@ func (suite *KeeperTestSuite) TestSetProviders() { suite.storageKeeper.SetProviders(suite.ctx, provider) suite.Require().NoError(err) - providerRequest := types.QueryProviderRequest{ + providerRequest := types.QueryProvider{ Address: user, } @@ -67,7 +67,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { _, err = msgSrvr.InitProvider(ctx, &initMsg) suite.Require().NoError(err) - providerRequest := types.QueryProviderRequest{ + providerRequest := types.QueryProvider{ Address: user, } diff --git a/x/storage/keeper/report_test.go b/x/storage/keeper/report_test.go index 69b53f4c4..8016c2704 100644 --- a/x/storage/keeper/report_test.go +++ b/x/storage/keeper/report_test.go @@ -22,7 +22,7 @@ func (suite *KeeperTestSuite) TestSetReportForm() { suite.storageKeeper.SetReportForm(suite.ctx, report) - reportRequest := types.QueryReportRequest{ + reportRequest := types.QueryReport{ Prover: "prover", Merkle: []byte("merkle"), Owner: "owner", diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index 90adf6147..f95856c21 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -31,22 +31,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct { +// QueryParams is request type for the Query/Params RPC method. +type QueryParams struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryParams) Reset() { *m = QueryParams{} } +func (m *QueryParams) String() string { return proto.CompactTextString(m) } +func (*QueryParams) ProtoMessage() {} +func (*QueryParams) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{0} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -56,17 +56,17 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParams.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryParams) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryParams) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParams.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryParams proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { @@ -114,25 +114,25 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryProofRequest struct { +type QueryProof struct { ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty"` Merkle []byte `protobuf:"bytes,2,opt,name=merkle,proto3" json:"merkle,omitempty"` Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"` } -func (m *QueryProofRequest) Reset() { *m = QueryProofRequest{} } -func (m *QueryProofRequest) String() string { return proto.CompactTextString(m) } -func (*QueryProofRequest) ProtoMessage() {} -func (*QueryProofRequest) Descriptor() ([]byte, []int) { +func (m *QueryProof) Reset() { *m = QueryProof{} } +func (m *QueryProof) String() string { return proto.CompactTextString(m) } +func (*QueryProof) ProtoMessage() {} +func (*QueryProof) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{2} } -func (m *QueryProofRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryProofRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryProofRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryProof.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -142,40 +142,40 @@ func (m *QueryProofRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *QueryProofRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryProofRequest.Merge(m, src) +func (m *QueryProof) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProof.Merge(m, src) } -func (m *QueryProofRequest) XXX_Size() int { +func (m *QueryProof) XXX_Size() int { return m.Size() } -func (m *QueryProofRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryProofRequest.DiscardUnknown(m) +func (m *QueryProof) XXX_DiscardUnknown() { + xxx_messageInfo_QueryProof.DiscardUnknown(m) } -var xxx_messageInfo_QueryProofRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryProof proto.InternalMessageInfo -func (m *QueryProofRequest) GetProviderAddress() string { +func (m *QueryProof) GetProviderAddress() string { if m != nil { return m.ProviderAddress } return "" } -func (m *QueryProofRequest) GetMerkle() []byte { +func (m *QueryProof) GetMerkle() []byte { if m != nil { return m.Merkle } return nil } -func (m *QueryProofRequest) GetOwner() string { +func (m *QueryProof) GetOwner() string { if m != nil { return m.Owner } return "" } -func (m *QueryProofRequest) GetStart() int64 { +func (m *QueryProof) GetStart() int64 { if m != nil { return m.Start } @@ -226,23 +226,23 @@ func (m *QueryProofResponse) GetProof() FileProof { return FileProof{} } -type QueryProofsByAddressRequest struct { +type QueryProofsByAddress struct { ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryProofsByAddressRequest) Reset() { *m = QueryProofsByAddressRequest{} } -func (m *QueryProofsByAddressRequest) String() string { return proto.CompactTextString(m) } -func (*QueryProofsByAddressRequest) ProtoMessage() {} -func (*QueryProofsByAddressRequest) Descriptor() ([]byte, []int) { +func (m *QueryProofsByAddress) Reset() { *m = QueryProofsByAddress{} } +func (m *QueryProofsByAddress) String() string { return proto.CompactTextString(m) } +func (*QueryProofsByAddress) ProtoMessage() {} +func (*QueryProofsByAddress) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{4} } -func (m *QueryProofsByAddressRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryProofsByAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryProofsByAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryProofsByAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryProofsByAddressRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryProofsByAddress.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -252,26 +252,26 @@ func (m *QueryProofsByAddressRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryProofsByAddressRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryProofsByAddressRequest.Merge(m, src) +func (m *QueryProofsByAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProofsByAddress.Merge(m, src) } -func (m *QueryProofsByAddressRequest) XXX_Size() int { +func (m *QueryProofsByAddress) XXX_Size() int { return m.Size() } -func (m *QueryProofsByAddressRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryProofsByAddressRequest.DiscardUnknown(m) +func (m *QueryProofsByAddress) XXX_DiscardUnknown() { + xxx_messageInfo_QueryProofsByAddress.DiscardUnknown(m) } -var xxx_messageInfo_QueryProofsByAddressRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryProofsByAddress proto.InternalMessageInfo -func (m *QueryProofsByAddressRequest) GetProviderAddress() string { +func (m *QueryProofsByAddress) GetProviderAddress() string { if m != nil { return m.ProviderAddress } return "" } -func (m *QueryProofsByAddressRequest) GetPagination() *query.PageRequest { +func (m *QueryProofsByAddress) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -330,24 +330,24 @@ func (m *QueryProofsByAddressResponse) GetPagination() *query.PageResponse { return nil } -type QueryFileRequest struct { +type QueryFile struct { Merkle []byte `protobuf:"bytes,1,opt,name=merkle,proto3" json:"merkle,omitempty"` Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` Start int64 `protobuf:"varint,3,opt,name=start,proto3" json:"start,omitempty"` } -func (m *QueryFileRequest) Reset() { *m = QueryFileRequest{} } -func (m *QueryFileRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFileRequest) ProtoMessage() {} -func (*QueryFileRequest) Descriptor() ([]byte, []int) { +func (m *QueryFile) Reset() { *m = QueryFile{} } +func (m *QueryFile) String() string { return proto.CompactTextString(m) } +func (*QueryFile) ProtoMessage() {} +func (*QueryFile) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{6} } -func (m *QueryFileRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFileRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFile.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -357,33 +357,33 @@ func (m *QueryFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *QueryFileRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFileRequest.Merge(m, src) +func (m *QueryFile) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFile.Merge(m, src) } -func (m *QueryFileRequest) XXX_Size() int { +func (m *QueryFile) XXX_Size() int { return m.Size() } -func (m *QueryFileRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFileRequest.DiscardUnknown(m) +func (m *QueryFile) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFile.DiscardUnknown(m) } -var xxx_messageInfo_QueryFileRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFile proto.InternalMessageInfo -func (m *QueryFileRequest) GetMerkle() []byte { +func (m *QueryFile) GetMerkle() []byte { if m != nil { return m.Merkle } return nil } -func (m *QueryFileRequest) GetOwner() string { +func (m *QueryFile) GetOwner() string { if m != nil { return m.Owner } return "" } -func (m *QueryFileRequest) GetStart() int64 { +func (m *QueryFile) GetStart() int64 { if m != nil { return m.Start } @@ -434,22 +434,22 @@ func (m *QueryFileResponse) GetFile() UnifiedFile { return UnifiedFile{} } -type QueryAllFilesRequest struct { +type QueryAllFiles struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllFilesRequest) Reset() { *m = QueryAllFilesRequest{} } -func (m *QueryAllFilesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllFilesRequest) ProtoMessage() {} -func (*QueryAllFilesRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllFiles) Reset() { *m = QueryAllFiles{} } +func (m *QueryAllFiles) String() string { return proto.CompactTextString(m) } +func (*QueryAllFiles) ProtoMessage() {} +func (*QueryAllFiles) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{8} } -func (m *QueryAllFilesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllFiles) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllFiles) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllFilesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllFiles.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -459,42 +459,42 @@ func (m *QueryAllFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllFilesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllFilesRequest.Merge(m, src) +func (m *QueryAllFiles) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllFiles.Merge(m, src) } -func (m *QueryAllFilesRequest) XXX_Size() int { +func (m *QueryAllFiles) XXX_Size() int { return m.Size() } -func (m *QueryAllFilesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllFilesRequest.DiscardUnknown(m) +func (m *QueryAllFiles) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllFiles.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllFilesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllFiles proto.InternalMessageInfo -func (m *QueryAllFilesRequest) GetPagination() *query.PageRequest { +func (m *QueryAllFiles) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -type QueryOpenFilesRequest struct { +type QueryOpenFiles struct { ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryOpenFilesRequest) Reset() { *m = QueryOpenFilesRequest{} } -func (m *QueryOpenFilesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryOpenFilesRequest) ProtoMessage() {} -func (*QueryOpenFilesRequest) Descriptor() ([]byte, []int) { +func (m *QueryOpenFiles) Reset() { *m = QueryOpenFiles{} } +func (m *QueryOpenFiles) String() string { return proto.CompactTextString(m) } +func (*QueryOpenFiles) ProtoMessage() {} +func (*QueryOpenFiles) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{9} } -func (m *QueryOpenFilesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryOpenFiles) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryOpenFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryOpenFiles) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryOpenFilesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryOpenFiles.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -504,26 +504,26 @@ func (m *QueryOpenFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryOpenFilesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryOpenFilesRequest.Merge(m, src) +func (m *QueryOpenFiles) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOpenFiles.Merge(m, src) } -func (m *QueryOpenFilesRequest) XXX_Size() int { +func (m *QueryOpenFiles) XXX_Size() int { return m.Size() } -func (m *QueryOpenFilesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryOpenFilesRequest.DiscardUnknown(m) +func (m *QueryOpenFiles) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOpenFiles.DiscardUnknown(m) } -var xxx_messageInfo_QueryOpenFilesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryOpenFiles proto.InternalMessageInfo -func (m *QueryOpenFilesRequest) GetProviderAddress() string { +func (m *QueryOpenFiles) GetProviderAddress() string { if m != nil { return m.ProviderAddress } return "" } -func (m *QueryOpenFilesRequest) GetPagination() *query.PageRequest { +func (m *QueryOpenFiles) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -582,22 +582,22 @@ func (m *QueryAllFilesResponse) GetPagination() *query.PageResponse { return nil } -type QueryProviderRequest struct { +type QueryProvider struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryProviderRequest) Reset() { *m = QueryProviderRequest{} } -func (m *QueryProviderRequest) String() string { return proto.CompactTextString(m) } -func (*QueryProviderRequest) ProtoMessage() {} -func (*QueryProviderRequest) Descriptor() ([]byte, []int) { +func (m *QueryProvider) Reset() { *m = QueryProvider{} } +func (m *QueryProvider) String() string { return proto.CompactTextString(m) } +func (*QueryProvider) ProtoMessage() {} +func (*QueryProvider) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{11} } -func (m *QueryProviderRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryProvider) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryProviderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryProvider) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryProviderRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryProvider.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -607,19 +607,19 @@ func (m *QueryProviderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryProviderRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryProviderRequest.Merge(m, src) +func (m *QueryProvider) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProvider.Merge(m, src) } -func (m *QueryProviderRequest) XXX_Size() int { +func (m *QueryProvider) XXX_Size() int { return m.Size() } -func (m *QueryProviderRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryProviderRequest.DiscardUnknown(m) +func (m *QueryProvider) XXX_DiscardUnknown() { + xxx_messageInfo_QueryProvider.DiscardUnknown(m) } -var xxx_messageInfo_QueryProviderRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryProvider proto.InternalMessageInfo -func (m *QueryProviderRequest) GetAddress() string { +func (m *QueryProvider) GetAddress() string { if m != nil { return m.Address } @@ -670,22 +670,22 @@ func (m *QueryProviderResponse) GetProvider() Providers { return Providers{} } -type QueryAllProvidersRequest struct { +type QueryAllProviders struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllProvidersRequest) Reset() { *m = QueryAllProvidersRequest{} } -func (m *QueryAllProvidersRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllProvidersRequest) ProtoMessage() {} -func (*QueryAllProvidersRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllProviders) Reset() { *m = QueryAllProviders{} } +func (m *QueryAllProviders) String() string { return proto.CompactTextString(m) } +func (*QueryAllProviders) ProtoMessage() {} +func (*QueryAllProviders) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{13} } -func (m *QueryAllProvidersRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllProviders) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllProvidersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllProviders) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllProvidersRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllProviders.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -695,19 +695,19 @@ func (m *QueryAllProvidersRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryAllProvidersRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllProvidersRequest.Merge(m, src) +func (m *QueryAllProviders) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllProviders.Merge(m, src) } -func (m *QueryAllProvidersRequest) XXX_Size() int { +func (m *QueryAllProviders) XXX_Size() int { return m.Size() } -func (m *QueryAllProvidersRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllProvidersRequest.DiscardUnknown(m) +func (m *QueryAllProviders) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllProviders.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllProvidersRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllProviders proto.InternalMessageInfo -func (m *QueryAllProvidersRequest) GetPagination() *query.PageRequest { +func (m *QueryAllProviders) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -766,25 +766,25 @@ func (m *QueryAllProvidersResponse) GetPagination() *query.PageResponse { return nil } -type QueryAttestationRequest struct { +type QueryAttestation struct { Prover string `protobuf:"bytes,1,opt,name=prover,proto3" json:"prover,omitempty"` Merkle []byte `protobuf:"bytes,2,opt,name=merkle,proto3" json:"merkle,omitempty"` Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"` } -func (m *QueryAttestationRequest) Reset() { *m = QueryAttestationRequest{} } -func (m *QueryAttestationRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAttestationRequest) ProtoMessage() {} -func (*QueryAttestationRequest) Descriptor() ([]byte, []int) { +func (m *QueryAttestation) Reset() { *m = QueryAttestation{} } +func (m *QueryAttestation) String() string { return proto.CompactTextString(m) } +func (*QueryAttestation) ProtoMessage() {} +func (*QueryAttestation) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{15} } -func (m *QueryAttestationRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAttestationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAttestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAttestationRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAttestation.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -794,40 +794,40 @@ func (m *QueryAttestationRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryAttestationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAttestationRequest.Merge(m, src) +func (m *QueryAttestation) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAttestation.Merge(m, src) } -func (m *QueryAttestationRequest) XXX_Size() int { +func (m *QueryAttestation) XXX_Size() int { return m.Size() } -func (m *QueryAttestationRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAttestationRequest.DiscardUnknown(m) +func (m *QueryAttestation) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAttestation.DiscardUnknown(m) } -var xxx_messageInfo_QueryAttestationRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAttestation proto.InternalMessageInfo -func (m *QueryAttestationRequest) GetProver() string { +func (m *QueryAttestation) GetProver() string { if m != nil { return m.Prover } return "" } -func (m *QueryAttestationRequest) GetMerkle() []byte { +func (m *QueryAttestation) GetMerkle() []byte { if m != nil { return m.Merkle } return nil } -func (m *QueryAttestationRequest) GetOwner() string { +func (m *QueryAttestation) GetOwner() string { if m != nil { return m.Owner } return "" } -func (m *QueryAttestationRequest) GetStart() int64 { +func (m *QueryAttestation) GetStart() int64 { if m != nil { return m.Start } @@ -878,22 +878,22 @@ func (m *QueryAttestationResponse) GetAttestation() AttestationForm { return AttestationForm{} } -type QueryAllAttestationsRequest struct { +type QueryAllAttestations struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllAttestationsRequest) Reset() { *m = QueryAllAttestationsRequest{} } -func (m *QueryAllAttestationsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllAttestationsRequest) ProtoMessage() {} -func (*QueryAllAttestationsRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllAttestations) Reset() { *m = QueryAllAttestations{} } +func (m *QueryAllAttestations) String() string { return proto.CompactTextString(m) } +func (*QueryAllAttestations) ProtoMessage() {} +func (*QueryAllAttestations) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{17} } -func (m *QueryAllAttestationsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllAttestations) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllAttestationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllAttestations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllAttestationsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllAttestations.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -903,19 +903,19 @@ func (m *QueryAllAttestationsRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryAllAttestationsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllAttestationsRequest.Merge(m, src) +func (m *QueryAllAttestations) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllAttestations.Merge(m, src) } -func (m *QueryAllAttestationsRequest) XXX_Size() int { +func (m *QueryAllAttestations) XXX_Size() int { return m.Size() } -func (m *QueryAllAttestationsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllAttestationsRequest.DiscardUnknown(m) +func (m *QueryAllAttestations) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllAttestations.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllAttestationsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllAttestations proto.InternalMessageInfo -func (m *QueryAllAttestationsRequest) GetPagination() *query.PageRequest { +func (m *QueryAllAttestations) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -974,25 +974,25 @@ func (m *QueryAllAttestationsResponse) GetPagination() *query.PageResponse { return nil } -type QueryReportRequest struct { +type QueryReport struct { Prover string `protobuf:"bytes,1,opt,name=prover,proto3" json:"prover,omitempty"` Merkle []byte `protobuf:"bytes,2,opt,name=merkle,proto3" json:"merkle,omitempty"` Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"` } -func (m *QueryReportRequest) Reset() { *m = QueryReportRequest{} } -func (m *QueryReportRequest) String() string { return proto.CompactTextString(m) } -func (*QueryReportRequest) ProtoMessage() {} -func (*QueryReportRequest) Descriptor() ([]byte, []int) { +func (m *QueryReport) Reset() { *m = QueryReport{} } +func (m *QueryReport) String() string { return proto.CompactTextString(m) } +func (*QueryReport) ProtoMessage() {} +func (*QueryReport) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{19} } -func (m *QueryReportRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryReport) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryReport) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryReportRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryReport.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1002,40 +1002,40 @@ func (m *QueryReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryReportRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryReportRequest.Merge(m, src) +func (m *QueryReport) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryReport.Merge(m, src) } -func (m *QueryReportRequest) XXX_Size() int { +func (m *QueryReport) XXX_Size() int { return m.Size() } -func (m *QueryReportRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryReportRequest.DiscardUnknown(m) +func (m *QueryReport) XXX_DiscardUnknown() { + xxx_messageInfo_QueryReport.DiscardUnknown(m) } -var xxx_messageInfo_QueryReportRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryReport proto.InternalMessageInfo -func (m *QueryReportRequest) GetProver() string { +func (m *QueryReport) GetProver() string { if m != nil { return m.Prover } return "" } -func (m *QueryReportRequest) GetMerkle() []byte { +func (m *QueryReport) GetMerkle() []byte { if m != nil { return m.Merkle } return nil } -func (m *QueryReportRequest) GetOwner() string { +func (m *QueryReport) GetOwner() string { if m != nil { return m.Owner } return "" } -func (m *QueryReportRequest) GetStart() int64 { +func (m *QueryReport) GetStart() int64 { if m != nil { return m.Start } @@ -1086,22 +1086,22 @@ func (m *QueryReportResponse) GetReport() ReportForm { return ReportForm{} } -type QueryAllReportsRequest struct { +type QueryAllReports struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllReportsRequest) Reset() { *m = QueryAllReportsRequest{} } -func (m *QueryAllReportsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllReportsRequest) ProtoMessage() {} -func (*QueryAllReportsRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllReports) Reset() { *m = QueryAllReports{} } +func (m *QueryAllReports) String() string { return proto.CompactTextString(m) } +func (*QueryAllReports) ProtoMessage() {} +func (*QueryAllReports) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{21} } -func (m *QueryAllReportsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllReports) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllReportsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllReports) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllReportsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllReports.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1111,19 +1111,19 @@ func (m *QueryAllReportsRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryAllReportsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllReportsRequest.Merge(m, src) +func (m *QueryAllReports) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllReports.Merge(m, src) } -func (m *QueryAllReportsRequest) XXX_Size() int { +func (m *QueryAllReports) XXX_Size() int { return m.Size() } -func (m *QueryAllReportsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllReportsRequest.DiscardUnknown(m) +func (m *QueryAllReports) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllReports.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllReportsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllReports proto.InternalMessageInfo -func (m *QueryAllReportsRequest) GetPagination() *query.PageRequest { +func (m *QueryAllReports) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -1182,22 +1182,22 @@ func (m *QueryAllReportsResponse) GetPagination() *query.PageResponse { return nil } -type QueryFreeSpaceRequest struct { +type QueryFreeSpace struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryFreeSpaceRequest) Reset() { *m = QueryFreeSpaceRequest{} } -func (m *QueryFreeSpaceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFreeSpaceRequest) ProtoMessage() {} -func (*QueryFreeSpaceRequest) Descriptor() ([]byte, []int) { +func (m *QueryFreeSpace) Reset() { *m = QueryFreeSpace{} } +func (m *QueryFreeSpace) String() string { return proto.CompactTextString(m) } +func (*QueryFreeSpace) ProtoMessage() {} +func (*QueryFreeSpace) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{23} } -func (m *QueryFreeSpaceRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFreeSpace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFreeSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFreeSpace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFreeSpaceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFreeSpace.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1207,41 +1207,41 @@ func (m *QueryFreeSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryFreeSpaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFreeSpaceRequest.Merge(m, src) +func (m *QueryFreeSpace) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFreeSpace.Merge(m, src) } -func (m *QueryFreeSpaceRequest) XXX_Size() int { +func (m *QueryFreeSpace) XXX_Size() int { return m.Size() } -func (m *QueryFreeSpaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFreeSpaceRequest.DiscardUnknown(m) +func (m *QueryFreeSpace) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFreeSpace.DiscardUnknown(m) } -var xxx_messageInfo_QueryFreeSpaceRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFreeSpace proto.InternalMessageInfo -func (m *QueryFreeSpaceRequest) GetAddress() string { +func (m *QueryFreeSpace) GetAddress() string { if m != nil { return m.Address } return "" } -type QueryStoreCountRequest struct { +type QueryStoreCount struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryStoreCountRequest) Reset() { *m = QueryStoreCountRequest{} } -func (m *QueryStoreCountRequest) String() string { return proto.CompactTextString(m) } -func (*QueryStoreCountRequest) ProtoMessage() {} -func (*QueryStoreCountRequest) Descriptor() ([]byte, []int) { +func (m *QueryStoreCount) Reset() { *m = QueryStoreCount{} } +func (m *QueryStoreCount) String() string { return proto.CompactTextString(m) } +func (*QueryStoreCount) ProtoMessage() {} +func (*QueryStoreCount) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{24} } -func (m *QueryStoreCountRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryStoreCount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryStoreCountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryStoreCount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryStoreCountRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryStoreCount.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1251,19 +1251,19 @@ func (m *QueryStoreCountRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryStoreCountRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryStoreCountRequest.Merge(m, src) +func (m *QueryStoreCount) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStoreCount.Merge(m, src) } -func (m *QueryStoreCountRequest) XXX_Size() int { +func (m *QueryStoreCount) XXX_Size() int { return m.Size() } -func (m *QueryStoreCountRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryStoreCountRequest.DiscardUnknown(m) +func (m *QueryStoreCount) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStoreCount.DiscardUnknown(m) } -var xxx_messageInfo_QueryStoreCountRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryStoreCount proto.InternalMessageInfo -func (m *QueryStoreCountRequest) GetAddress() string { +func (m *QueryStoreCount) GetAddress() string { if m != nil { return m.Address } @@ -1358,22 +1358,22 @@ func (m *QueryStoreCountResponse) GetCount() string { return "" } -type QueryFindFileRequest struct { +type QueryFindFile struct { Merkle []byte `protobuf:"bytes,1,opt,name=merkle,proto3" json:"merkle,omitempty"` } -func (m *QueryFindFileRequest) Reset() { *m = QueryFindFileRequest{} } -func (m *QueryFindFileRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFindFileRequest) ProtoMessage() {} -func (*QueryFindFileRequest) Descriptor() ([]byte, []int) { +func (m *QueryFindFile) Reset() { *m = QueryFindFile{} } +func (m *QueryFindFile) String() string { return proto.CompactTextString(m) } +func (*QueryFindFile) ProtoMessage() {} +func (*QueryFindFile) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{27} } -func (m *QueryFindFileRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFindFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFindFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFindFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFindFileRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFindFile.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1383,19 +1383,19 @@ func (m *QueryFindFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryFindFileRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFindFileRequest.Merge(m, src) +func (m *QueryFindFile) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFindFile.Merge(m, src) } -func (m *QueryFindFileRequest) XXX_Size() int { +func (m *QueryFindFile) XXX_Size() int { return m.Size() } -func (m *QueryFindFileRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFindFileRequest.DiscardUnknown(m) +func (m *QueryFindFile) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFindFile.DiscardUnknown(m) } -var xxx_messageInfo_QueryFindFileRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFindFile proto.InternalMessageInfo -func (m *QueryFindFileRequest) GetMerkle() []byte { +func (m *QueryFindFile) GetMerkle() []byte { if m != nil { return m.Merkle } @@ -1446,22 +1446,22 @@ func (m *QueryFindFileResponse) GetProviderIps() string { return "" } -type QueryClientFreeSpaceRequest struct { +type QueryClientFreeSpace struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryClientFreeSpaceRequest) Reset() { *m = QueryClientFreeSpaceRequest{} } -func (m *QueryClientFreeSpaceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryClientFreeSpaceRequest) ProtoMessage() {} -func (*QueryClientFreeSpaceRequest) Descriptor() ([]byte, []int) { +func (m *QueryClientFreeSpace) Reset() { *m = QueryClientFreeSpace{} } +func (m *QueryClientFreeSpace) String() string { return proto.CompactTextString(m) } +func (*QueryClientFreeSpace) ProtoMessage() {} +func (*QueryClientFreeSpace) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{29} } -func (m *QueryClientFreeSpaceRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryClientFreeSpace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryClientFreeSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryClientFreeSpace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryClientFreeSpaceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryClientFreeSpace.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1471,19 +1471,19 @@ func (m *QueryClientFreeSpaceRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryClientFreeSpaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryClientFreeSpaceRequest.Merge(m, src) +func (m *QueryClientFreeSpace) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryClientFreeSpace.Merge(m, src) } -func (m *QueryClientFreeSpaceRequest) XXX_Size() int { +func (m *QueryClientFreeSpace) XXX_Size() int { return m.Size() } -func (m *QueryClientFreeSpaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryClientFreeSpaceRequest.DiscardUnknown(m) +func (m *QueryClientFreeSpace) XXX_DiscardUnknown() { + xxx_messageInfo_QueryClientFreeSpace.DiscardUnknown(m) } -var xxx_messageInfo_QueryClientFreeSpaceRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryClientFreeSpace proto.InternalMessageInfo -func (m *QueryClientFreeSpaceRequest) GetAddress() string { +func (m *QueryClientFreeSpace) GetAddress() string { if m != nil { return m.Address } @@ -1534,22 +1534,22 @@ func (m *QueryClientFreeSpaceResponse) GetBytesFree() int64 { return 0 } -type QueryPayDataRequest struct { +type QueryPayData struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryPayDataRequest) Reset() { *m = QueryPayDataRequest{} } -func (m *QueryPayDataRequest) String() string { return proto.CompactTextString(m) } -func (*QueryPayDataRequest) ProtoMessage() {} -func (*QueryPayDataRequest) Descriptor() ([]byte, []int) { +func (m *QueryPayData) Reset() { *m = QueryPayData{} } +func (m *QueryPayData) String() string { return proto.CompactTextString(m) } +func (*QueryPayData) ProtoMessage() {} +func (*QueryPayData) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{31} } -func (m *QueryPayDataRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPayData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryPayDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPayData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryPayDataRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPayData.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1559,19 +1559,19 @@ func (m *QueryPayDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryPayDataRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPayDataRequest.Merge(m, src) +func (m *QueryPayData) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPayData.Merge(m, src) } -func (m *QueryPayDataRequest) XXX_Size() int { +func (m *QueryPayData) XXX_Size() int { return m.Size() } -func (m *QueryPayDataRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPayDataRequest.DiscardUnknown(m) +func (m *QueryPayData) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPayData.DiscardUnknown(m) } -var xxx_messageInfo_QueryPayDataRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPayData proto.InternalMessageInfo -func (m *QueryPayDataRequest) GetAddress() string { +func (m *QueryPayData) GetAddress() string { if m != nil { return m.Address } @@ -1630,22 +1630,22 @@ func (m *QueryPayDataResponse) GetBytes() int64 { return 0 } -type QueryStoragePaymentInfoRequest struct { +type QueryStoragePaymentInfo struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryStoragePaymentInfoRequest) Reset() { *m = QueryStoragePaymentInfoRequest{} } -func (m *QueryStoragePaymentInfoRequest) String() string { return proto.CompactTextString(m) } -func (*QueryStoragePaymentInfoRequest) ProtoMessage() {} -func (*QueryStoragePaymentInfoRequest) Descriptor() ([]byte, []int) { +func (m *QueryStoragePaymentInfo) Reset() { *m = QueryStoragePaymentInfo{} } +func (m *QueryStoragePaymentInfo) String() string { return proto.CompactTextString(m) } +func (*QueryStoragePaymentInfo) ProtoMessage() {} +func (*QueryStoragePaymentInfo) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{33} } -func (m *QueryStoragePaymentInfoRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryStoragePaymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryStoragePaymentInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryStoragePaymentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryStoragePaymentInfoRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryStoragePaymentInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1655,19 +1655,19 @@ func (m *QueryStoragePaymentInfoRequest) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } -func (m *QueryStoragePaymentInfoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryStoragePaymentInfoRequest.Merge(m, src) +func (m *QueryStoragePaymentInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStoragePaymentInfo.Merge(m, src) } -func (m *QueryStoragePaymentInfoRequest) XXX_Size() int { +func (m *QueryStoragePaymentInfo) XXX_Size() int { return m.Size() } -func (m *QueryStoragePaymentInfoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryStoragePaymentInfoRequest.DiscardUnknown(m) +func (m *QueryStoragePaymentInfo) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStoragePaymentInfo.DiscardUnknown(m) } -var xxx_messageInfo_QueryStoragePaymentInfoRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryStoragePaymentInfo proto.InternalMessageInfo -func (m *QueryStoragePaymentInfoRequest) GetAddress() string { +func (m *QueryStoragePaymentInfo) GetAddress() string { if m != nil { return m.Address } @@ -1718,22 +1718,22 @@ func (m *QueryStoragePaymentInfoResponse) GetStoragePaymentInfo() StoragePayment return StoragePaymentInfo{} } -type QueryAllStoragePaymentInfoRequest struct { +type QueryAllStoragePaymentInfo struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllStoragePaymentInfoRequest) Reset() { *m = QueryAllStoragePaymentInfoRequest{} } -func (m *QueryAllStoragePaymentInfoRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllStoragePaymentInfoRequest) ProtoMessage() {} -func (*QueryAllStoragePaymentInfoRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllStoragePaymentInfo) Reset() { *m = QueryAllStoragePaymentInfo{} } +func (m *QueryAllStoragePaymentInfo) String() string { return proto.CompactTextString(m) } +func (*QueryAllStoragePaymentInfo) ProtoMessage() {} +func (*QueryAllStoragePaymentInfo) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{35} } -func (m *QueryAllStoragePaymentInfoRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllStoragePaymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllStoragePaymentInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllStoragePaymentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllStoragePaymentInfoRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllStoragePaymentInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1743,19 +1743,19 @@ func (m *QueryAllStoragePaymentInfoRequest) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *QueryAllStoragePaymentInfoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllStoragePaymentInfoRequest.Merge(m, src) +func (m *QueryAllStoragePaymentInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllStoragePaymentInfo.Merge(m, src) } -func (m *QueryAllStoragePaymentInfoRequest) XXX_Size() int { +func (m *QueryAllStoragePaymentInfo) XXX_Size() int { return m.Size() } -func (m *QueryAllStoragePaymentInfoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllStoragePaymentInfoRequest.DiscardUnknown(m) +func (m *QueryAllStoragePaymentInfo) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllStoragePaymentInfo.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllStoragePaymentInfoRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllStoragePaymentInfo proto.InternalMessageInfo -func (m *QueryAllStoragePaymentInfoRequest) GetPagination() *query.PageRequest { +func (m *QueryAllStoragePaymentInfo) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -1814,23 +1814,23 @@ func (m *QueryAllStoragePaymentInfoResponse) GetPagination() *query.PageResponse return nil } -type QueryFileUploadCheckRequest struct { +type QueryFileUploadCheck struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Bytes int64 `protobuf:"varint,2,opt,name=bytes,proto3" json:"bytes,omitempty"` } -func (m *QueryFileUploadCheckRequest) Reset() { *m = QueryFileUploadCheckRequest{} } -func (m *QueryFileUploadCheckRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFileUploadCheckRequest) ProtoMessage() {} -func (*QueryFileUploadCheckRequest) Descriptor() ([]byte, []int) { +func (m *QueryFileUploadCheck) Reset() { *m = QueryFileUploadCheck{} } +func (m *QueryFileUploadCheck) String() string { return proto.CompactTextString(m) } +func (*QueryFileUploadCheck) ProtoMessage() {} +func (*QueryFileUploadCheck) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{37} } -func (m *QueryFileUploadCheckRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFileUploadCheck) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFileUploadCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFileUploadCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFileUploadCheckRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFileUploadCheck.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1840,26 +1840,26 @@ func (m *QueryFileUploadCheckRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryFileUploadCheckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFileUploadCheckRequest.Merge(m, src) +func (m *QueryFileUploadCheck) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFileUploadCheck.Merge(m, src) } -func (m *QueryFileUploadCheckRequest) XXX_Size() int { +func (m *QueryFileUploadCheck) XXX_Size() int { return m.Size() } -func (m *QueryFileUploadCheckRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFileUploadCheckRequest.DiscardUnknown(m) +func (m *QueryFileUploadCheck) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFileUploadCheck.DiscardUnknown(m) } -var xxx_messageInfo_QueryFileUploadCheckRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFileUploadCheck proto.InternalMessageInfo -func (m *QueryFileUploadCheckRequest) GetAddress() string { +func (m *QueryFileUploadCheck) GetAddress() string { if m != nil { return m.Address } return "" } -func (m *QueryFileUploadCheckRequest) GetBytes() int64 { +func (m *QueryFileUploadCheck) GetBytes() int64 { if m != nil { return m.Bytes } @@ -1910,23 +1910,23 @@ func (m *QueryFileUploadCheckResponse) GetValid() bool { return false } -type QueryPriceCheckRequest struct { +type QueryPriceCheck struct { Duration string `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"` Bytes int64 `protobuf:"varint,2,opt,name=bytes,proto3" json:"bytes,omitempty"` } -func (m *QueryPriceCheckRequest) Reset() { *m = QueryPriceCheckRequest{} } -func (m *QueryPriceCheckRequest) String() string { return proto.CompactTextString(m) } -func (*QueryPriceCheckRequest) ProtoMessage() {} -func (*QueryPriceCheckRequest) Descriptor() ([]byte, []int) { +func (m *QueryPriceCheck) Reset() { *m = QueryPriceCheck{} } +func (m *QueryPriceCheck) String() string { return proto.CompactTextString(m) } +func (*QueryPriceCheck) ProtoMessage() {} +func (*QueryPriceCheck) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{39} } -func (m *QueryPriceCheckRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPriceCheck) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryPriceCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPriceCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryPriceCheckRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPriceCheck.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1936,26 +1936,26 @@ func (m *QueryPriceCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryPriceCheckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPriceCheckRequest.Merge(m, src) +func (m *QueryPriceCheck) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPriceCheck.Merge(m, src) } -func (m *QueryPriceCheckRequest) XXX_Size() int { +func (m *QueryPriceCheck) XXX_Size() int { return m.Size() } -func (m *QueryPriceCheckRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPriceCheckRequest.DiscardUnknown(m) +func (m *QueryPriceCheck) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPriceCheck.DiscardUnknown(m) } -var xxx_messageInfo_QueryPriceCheckRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPriceCheck proto.InternalMessageInfo -func (m *QueryPriceCheckRequest) GetDuration() string { +func (m *QueryPriceCheck) GetDuration() string { if m != nil { return m.Duration } return "" } -func (m *QueryPriceCheckRequest) GetBytes() int64 { +func (m *QueryPriceCheck) GetBytes() int64 { if m != nil { return m.Bytes } @@ -2006,21 +2006,21 @@ func (m *QueryPriceCheckResponse) GetPrice() int64 { return 0 } -type QueryActiveProvidersRequest struct { +type QueryActiveProviders struct { } -func (m *QueryActiveProvidersRequest) Reset() { *m = QueryActiveProvidersRequest{} } -func (m *QueryActiveProvidersRequest) String() string { return proto.CompactTextString(m) } -func (*QueryActiveProvidersRequest) ProtoMessage() {} -func (*QueryActiveProvidersRequest) Descriptor() ([]byte, []int) { +func (m *QueryActiveProviders) Reset() { *m = QueryActiveProviders{} } +func (m *QueryActiveProviders) String() string { return proto.CompactTextString(m) } +func (*QueryActiveProviders) ProtoMessage() {} +func (*QueryActiveProviders) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{41} } -func (m *QueryActiveProvidersRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryActiveProviders) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryActiveProvidersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryActiveProviders) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryActiveProvidersRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryActiveProviders.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2030,17 +2030,17 @@ func (m *QueryActiveProvidersRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryActiveProvidersRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryActiveProvidersRequest.Merge(m, src) +func (m *QueryActiveProviders) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryActiveProviders.Merge(m, src) } -func (m *QueryActiveProvidersRequest) XXX_Size() int { +func (m *QueryActiveProviders) XXX_Size() int { return m.Size() } -func (m *QueryActiveProvidersRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryActiveProvidersRequest.DiscardUnknown(m) +func (m *QueryActiveProviders) XXX_DiscardUnknown() { + xxx_messageInfo_QueryActiveProviders.DiscardUnknown(m) } -var xxx_messageInfo_QueryActiveProvidersRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryActiveProviders proto.InternalMessageInfo type QueryActiveProvidersResponse struct { Providers []ActiveProviders `protobuf:"bytes,1,rep,name=providers,proto3" json:"providers"` @@ -2086,21 +2086,21 @@ func (m *QueryActiveProvidersResponse) GetProviders() []ActiveProviders { return nil } -type QueryStorageStatsRequest struct { +type QueryStorageStats struct { } -func (m *QueryStorageStatsRequest) Reset() { *m = QueryStorageStatsRequest{} } -func (m *QueryStorageStatsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryStorageStatsRequest) ProtoMessage() {} -func (*QueryStorageStatsRequest) Descriptor() ([]byte, []int) { +func (m *QueryStorageStats) Reset() { *m = QueryStorageStats{} } +func (m *QueryStorageStats) String() string { return proto.CompactTextString(m) } +func (*QueryStorageStats) ProtoMessage() {} +func (*QueryStorageStats) Descriptor() ([]byte, []int) { return fileDescriptor_9fe03bff51a37284, []int{43} } -func (m *QueryStorageStatsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryStorageStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryStorageStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryStorageStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryStorageStatsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryStorageStats.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2110,17 +2110,17 @@ func (m *QueryStorageStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryStorageStatsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryStorageStatsRequest.Merge(m, src) +func (m *QueryStorageStats) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStorageStats.Merge(m, src) } -func (m *QueryStorageStatsRequest) XXX_Size() int { +func (m *QueryStorageStats) XXX_Size() int { return m.Size() } -func (m *QueryStorageStatsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryStorageStatsRequest.DiscardUnknown(m) +func (m *QueryStorageStats) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStorageStats.DiscardUnknown(m) } -var xxx_messageInfo_QueryStorageStatsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryStorageStats proto.InternalMessageInfo type QueryStorageStatsResponse struct { Purchased uint64 `protobuf:"varint,1,opt,name=purchased,proto3" json:"purchased,omitempty"` @@ -2192,50 +2192,50 @@ func (m *QueryStorageStatsResponse) GetUsersByPlan() map[int64]int64 { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.storage.QueryParamsRequest") + proto.RegisterType((*QueryParams)(nil), "canine_chain.storage.QueryParams") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.storage.QueryParamsResponse") - proto.RegisterType((*QueryProofRequest)(nil), "canine_chain.storage.QueryProofRequest") + proto.RegisterType((*QueryProof)(nil), "canine_chain.storage.QueryProof") proto.RegisterType((*QueryProofResponse)(nil), "canine_chain.storage.QueryProofResponse") - proto.RegisterType((*QueryProofsByAddressRequest)(nil), "canine_chain.storage.QueryProofsByAddressRequest") + proto.RegisterType((*QueryProofsByAddress)(nil), "canine_chain.storage.QueryProofsByAddress") proto.RegisterType((*QueryProofsByAddressResponse)(nil), "canine_chain.storage.QueryProofsByAddressResponse") - proto.RegisterType((*QueryFileRequest)(nil), "canine_chain.storage.QueryFileRequest") + proto.RegisterType((*QueryFile)(nil), "canine_chain.storage.QueryFile") proto.RegisterType((*QueryFileResponse)(nil), "canine_chain.storage.QueryFileResponse") - proto.RegisterType((*QueryAllFilesRequest)(nil), "canine_chain.storage.QueryAllFilesRequest") - proto.RegisterType((*QueryOpenFilesRequest)(nil), "canine_chain.storage.QueryOpenFilesRequest") + proto.RegisterType((*QueryAllFiles)(nil), "canine_chain.storage.QueryAllFiles") + proto.RegisterType((*QueryOpenFiles)(nil), "canine_chain.storage.QueryOpenFiles") proto.RegisterType((*QueryAllFilesResponse)(nil), "canine_chain.storage.QueryAllFilesResponse") - proto.RegisterType((*QueryProviderRequest)(nil), "canine_chain.storage.QueryProviderRequest") + proto.RegisterType((*QueryProvider)(nil), "canine_chain.storage.QueryProvider") proto.RegisterType((*QueryProviderResponse)(nil), "canine_chain.storage.QueryProviderResponse") - proto.RegisterType((*QueryAllProvidersRequest)(nil), "canine_chain.storage.QueryAllProvidersRequest") + proto.RegisterType((*QueryAllProviders)(nil), "canine_chain.storage.QueryAllProviders") proto.RegisterType((*QueryAllProvidersResponse)(nil), "canine_chain.storage.QueryAllProvidersResponse") - proto.RegisterType((*QueryAttestationRequest)(nil), "canine_chain.storage.QueryAttestationRequest") + proto.RegisterType((*QueryAttestation)(nil), "canine_chain.storage.QueryAttestation") proto.RegisterType((*QueryAttestationResponse)(nil), "canine_chain.storage.QueryAttestationResponse") - proto.RegisterType((*QueryAllAttestationsRequest)(nil), "canine_chain.storage.QueryAllAttestationsRequest") + proto.RegisterType((*QueryAllAttestations)(nil), "canine_chain.storage.QueryAllAttestations") proto.RegisterType((*QueryAllAttestationsResponse)(nil), "canine_chain.storage.QueryAllAttestationsResponse") - proto.RegisterType((*QueryReportRequest)(nil), "canine_chain.storage.QueryReportRequest") + proto.RegisterType((*QueryReport)(nil), "canine_chain.storage.QueryReport") proto.RegisterType((*QueryReportResponse)(nil), "canine_chain.storage.QueryReportResponse") - proto.RegisterType((*QueryAllReportsRequest)(nil), "canine_chain.storage.QueryAllReportsRequest") + proto.RegisterType((*QueryAllReports)(nil), "canine_chain.storage.QueryAllReports") proto.RegisterType((*QueryAllReportsResponse)(nil), "canine_chain.storage.QueryAllReportsResponse") - proto.RegisterType((*QueryFreeSpaceRequest)(nil), "canine_chain.storage.QueryFreeSpaceRequest") - proto.RegisterType((*QueryStoreCountRequest)(nil), "canine_chain.storage.QueryStoreCountRequest") + proto.RegisterType((*QueryFreeSpace)(nil), "canine_chain.storage.QueryFreeSpace") + proto.RegisterType((*QueryStoreCount)(nil), "canine_chain.storage.QueryStoreCount") proto.RegisterType((*QueryFreeSpaceResponse)(nil), "canine_chain.storage.QueryFreeSpaceResponse") proto.RegisterType((*QueryStoreCountResponse)(nil), "canine_chain.storage.QueryStoreCountResponse") - proto.RegisterType((*QueryFindFileRequest)(nil), "canine_chain.storage.QueryFindFileRequest") + proto.RegisterType((*QueryFindFile)(nil), "canine_chain.storage.QueryFindFile") proto.RegisterType((*QueryFindFileResponse)(nil), "canine_chain.storage.QueryFindFileResponse") - proto.RegisterType((*QueryClientFreeSpaceRequest)(nil), "canine_chain.storage.QueryClientFreeSpaceRequest") + proto.RegisterType((*QueryClientFreeSpace)(nil), "canine_chain.storage.QueryClientFreeSpace") proto.RegisterType((*QueryClientFreeSpaceResponse)(nil), "canine_chain.storage.QueryClientFreeSpaceResponse") - proto.RegisterType((*QueryPayDataRequest)(nil), "canine_chain.storage.QueryPayDataRequest") + proto.RegisterType((*QueryPayData)(nil), "canine_chain.storage.QueryPayData") proto.RegisterType((*QueryPayDataResponse)(nil), "canine_chain.storage.QueryPayDataResponse") - proto.RegisterType((*QueryStoragePaymentInfoRequest)(nil), "canine_chain.storage.QueryStoragePaymentInfoRequest") + proto.RegisterType((*QueryStoragePaymentInfo)(nil), "canine_chain.storage.QueryStoragePaymentInfo") proto.RegisterType((*QueryStoragePaymentInfoResponse)(nil), "canine_chain.storage.QueryStoragePaymentInfoResponse") - proto.RegisterType((*QueryAllStoragePaymentInfoRequest)(nil), "canine_chain.storage.QueryAllStoragePaymentInfoRequest") + proto.RegisterType((*QueryAllStoragePaymentInfo)(nil), "canine_chain.storage.QueryAllStoragePaymentInfo") proto.RegisterType((*QueryAllStoragePaymentInfoResponse)(nil), "canine_chain.storage.QueryAllStoragePaymentInfoResponse") - proto.RegisterType((*QueryFileUploadCheckRequest)(nil), "canine_chain.storage.QueryFileUploadCheckRequest") + proto.RegisterType((*QueryFileUploadCheck)(nil), "canine_chain.storage.QueryFileUploadCheck") proto.RegisterType((*QueryFileUploadCheckResponse)(nil), "canine_chain.storage.QueryFileUploadCheckResponse") - proto.RegisterType((*QueryPriceCheckRequest)(nil), "canine_chain.storage.QueryPriceCheckRequest") + proto.RegisterType((*QueryPriceCheck)(nil), "canine_chain.storage.QueryPriceCheck") proto.RegisterType((*QueryPriceCheckResponse)(nil), "canine_chain.storage.QueryPriceCheckResponse") - proto.RegisterType((*QueryActiveProvidersRequest)(nil), "canine_chain.storage.QueryActiveProvidersRequest") + proto.RegisterType((*QueryActiveProviders)(nil), "canine_chain.storage.QueryActiveProviders") proto.RegisterType((*QueryActiveProvidersResponse)(nil), "canine_chain.storage.QueryActiveProvidersResponse") - proto.RegisterType((*QueryStorageStatsRequest)(nil), "canine_chain.storage.QueryStorageStatsRequest") + proto.RegisterType((*QueryStorageStats)(nil), "canine_chain.storage.QueryStorageStats") proto.RegisterType((*QueryStorageStatsResponse)(nil), "canine_chain.storage.QueryStorageStatsResponse") proto.RegisterMapType((map[int64]int64)(nil), "canine_chain.storage.QueryStorageStatsResponse.UsersByPlanEntry") } @@ -2243,136 +2243,134 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/query.proto", fileDescriptor_9fe03bff51a37284) } var fileDescriptor_9fe03bff51a37284 = []byte{ - // 2051 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcd, 0x73, 0x1c, 0x47, - 0x15, 0x77, 0xeb, 0x2b, 0xda, 0x27, 0x05, 0x9b, 0x46, 0x09, 0x62, 0xb1, 0x65, 0x79, 0xb0, 0x65, - 0x59, 0xb6, 0x66, 0xac, 0x75, 0x8c, 0x8d, 0x1c, 0xbb, 0x62, 0xc9, 0xc8, 0x18, 0xe2, 0x44, 0x5e, - 0x95, 0x73, 0xc8, 0x81, 0x49, 0x6b, 0xb7, 0xb5, 0x1e, 0xb4, 0x9a, 0x99, 0xcc, 0xcc, 0x0a, 0xb6, - 0x54, 0xba, 0x84, 0x5b, 0x2e, 0xa4, 0x8a, 0x03, 0x97, 0x50, 0x21, 0x45, 0x2e, 0x29, 0x0a, 0x42, - 0x71, 0xe2, 0x02, 0x55, 0xdc, 0x72, 0x23, 0x55, 0x5c, 0x28, 0x0e, 0x29, 0xca, 0x86, 0xff, 0x83, - 0xea, 0xee, 0xd7, 0x3b, 0xb3, 0xbb, 0xb3, 0xbd, 0xbb, 0xae, 0x2d, 0x72, 0xd2, 0x4e, 0xcf, 0xfb, - 0xf8, 0xbd, 0x8f, 0x7e, 0xdd, 0xbf, 0x29, 0xc1, 0x62, 0x85, 0xf9, 0x9e, 0xcf, 0xdd, 0xca, 0x13, - 0xe6, 0xf9, 0x4e, 0x9c, 0x04, 0x11, 0xab, 0x71, 0xe7, 0xdd, 0x06, 0x8f, 0x9a, 0x76, 0x18, 0x05, - 0x49, 0x40, 0xe7, 0xb2, 0x12, 0x36, 0x4a, 0x14, 0xe7, 0x6a, 0x41, 0x2d, 0x90, 0x02, 0x8e, 0xf8, - 0xa5, 0x64, 0x8b, 0xa7, 0x6b, 0x41, 0x50, 0xab, 0x73, 0x87, 0x85, 0x9e, 0xc3, 0x7c, 0x3f, 0x48, - 0x58, 0xe2, 0x05, 0x7e, 0x8c, 0x6f, 0x57, 0x2a, 0x41, 0x7c, 0x10, 0xc4, 0xce, 0x2e, 0x8b, 0xd1, - 0x85, 0x73, 0xb8, 0xb6, 0xcb, 0x13, 0xb6, 0xe6, 0x84, 0xac, 0xe6, 0xf9, 0x52, 0x18, 0x65, 0xcf, - 0xe5, 0xe2, 0x0a, 0x59, 0xc4, 0x0e, 0xb4, 0xb9, 0x8b, 0xb9, 0x22, 0xac, 0x92, 0x78, 0x87, 0xdc, - 0xad, 0x72, 0x56, 0xd7, 0x82, 0xe7, 0xf3, 0x6d, 0x45, 0xc1, 0xa1, 0x57, 0xe5, 0x91, 0xd9, 0x5c, - 0xc8, 0x9a, 0x07, 0xdc, 0x4f, 0x5c, 0xcf, 0xdf, 0xc3, 0x20, 0xad, 0x39, 0xa0, 0x8f, 0x04, 0xf8, - 0x6d, 0x09, 0xa6, 0xcc, 0xdf, 0x6d, 0xf0, 0x38, 0xb1, 0x1e, 0xc1, 0x37, 0xda, 0x56, 0xe3, 0x30, - 0xf0, 0x63, 0x4e, 0xd7, 0x61, 0x4a, 0x81, 0x9e, 0x27, 0x8b, 0x64, 0x79, 0xa6, 0x74, 0xda, 0xce, - 0x4b, 0xa7, 0xad, 0xb4, 0x36, 0x26, 0x3e, 0xff, 0xf2, 0xec, 0x89, 0x32, 0x6a, 0x58, 0xef, 0x11, - 0xf8, 0xba, 0xb2, 0x19, 0x05, 0xc1, 0x1e, 0x3a, 0xa2, 0x97, 0xe0, 0x94, 0x86, 0xee, 0xb2, 0x6a, - 0x35, 0xe2, 0xb1, 0xb2, 0x5d, 0x28, 0x9f, 0xd4, 0xeb, 0x77, 0xd5, 0x32, 0x7d, 0x19, 0xa6, 0x0e, - 0x78, 0xb4, 0x5f, 0xe7, 0xf3, 0x63, 0x8b, 0x64, 0x79, 0xb6, 0x8c, 0x4f, 0x74, 0x0e, 0x26, 0x83, - 0x9f, 0xfa, 0x3c, 0x9a, 0x1f, 0x97, 0x7a, 0xea, 0x41, 0xac, 0xc6, 0x09, 0x8b, 0x92, 0xf9, 0x89, - 0x45, 0xb2, 0x3c, 0x5e, 0x56, 0x0f, 0xd6, 0x23, 0x1d, 0xad, 0xc2, 0x80, 0x61, 0xdd, 0x82, 0xc9, - 0x50, 0x2c, 0x60, 0x54, 0x67, 0xf3, 0xa3, 0xda, 0xf2, 0xea, 0x5c, 0xea, 0x61, 0x60, 0x4a, 0xc7, - 0xfa, 0x80, 0xc0, 0xb7, 0x53, 0x9b, 0xf1, 0x46, 0x13, 0xf1, 0x3e, 0x47, 0x84, 0x5b, 0x00, 0x69, - 0xeb, 0xc8, 0x28, 0x67, 0x4a, 0x4b, 0xb6, 0xea, 0x33, 0x5b, 0xf4, 0x99, 0xad, 0x5a, 0x19, 0xfb, - 0xcc, 0xde, 0x66, 0x35, 0x8e, 0x6e, 0xca, 0x19, 0x4d, 0xeb, 0x13, 0x02, 0xa7, 0xf3, 0x21, 0x75, - 0x07, 0x3c, 0x3e, 0x6c, 0xc0, 0xf4, 0x7e, 0x0e, 0xca, 0x8b, 0x7d, 0x51, 0x2a, 0xcf, 0x6d, 0x30, - 0xdf, 0x82, 0x53, 0x12, 0xa5, 0xf0, 0xa3, 0xb3, 0x95, 0x16, 0x99, 0xe4, 0x17, 0x79, 0x2c, 0xb7, - 0xc8, 0xe3, 0xd9, 0x22, 0x6f, 0x63, 0xa3, 0x29, 0xbb, 0xad, 0x90, 0x27, 0xf6, 0x3c, 0x34, 0x3b, - 0x53, 0x3a, 0x97, 0x1f, 0xf1, 0x63, 0xdf, 0xdb, 0xf3, 0x78, 0x55, 0x28, 0x62, 0xcc, 0x52, 0xc9, - 0xfa, 0x31, 0xcc, 0x49, 0x8b, 0x77, 0xeb, 0x75, 0xf1, 0xae, 0x55, 0xdb, 0xf6, 0x82, 0x91, 0xe7, - 0x2e, 0xd8, 0xfb, 0x04, 0x5e, 0x92, 0x0e, 0xde, 0x0c, 0xb9, 0xdf, 0xe6, 0xe1, 0x2b, 0xe8, 0x9e, - 0x8f, 0x34, 0x98, 0x34, 0x5a, 0xcc, 0xe1, 0x6d, 0x98, 0x14, 0xe9, 0x88, 0xb1, 0x6d, 0x06, 0x4e, - 0xa2, 0xd2, 0x1a, 0x5d, 0xe3, 0x5c, 0xc5, 0x72, 0x6c, 0x63, 0x06, 0x74, 0xb2, 0xe6, 0xe1, 0x85, - 0xf6, 0x1c, 0xe9, 0x47, 0xeb, 0x6d, 0x0c, 0x29, 0xd5, 0xc0, 0x90, 0xee, 0xc2, 0xb4, 0xce, 0xa3, - 0x79, 0xf7, 0x6b, 0x4d, 0x3d, 0xd6, 0x5a, 0x6a, 0xd6, 0x2e, 0xcc, 0xeb, 0x74, 0xb5, 0x84, 0x46, - 0xdd, 0x20, 0x9f, 0x12, 0xf8, 0x56, 0x8e, 0x13, 0x0c, 0x62, 0x13, 0x0a, 0xad, 0xf9, 0x6f, 0xde, - 0xd2, 0x9d, 0x51, 0xa4, 0x7a, 0xa3, 0xab, 0x4e, 0x03, 0xbe, 0xa9, 0xa0, 0x26, 0x09, 0x8f, 0xd5, - 0x99, 0x99, 0xd9, 0xdd, 0xc2, 0x21, 0xe6, 0xba, 0x50, 0xc6, 0xa7, 0x91, 0x8c, 0x76, 0x4f, 0x97, - 0x21, 0xeb, 0x16, 0x13, 0xf4, 0x10, 0x66, 0x58, 0xba, 0x8c, 0x75, 0xb8, 0x90, 0x9f, 0xa2, 0x8c, - 0xfe, 0x56, 0x10, 0x1d, 0x60, 0xa2, 0xb2, 0xfa, 0x16, 0xc7, 0x89, 0x7f, 0xb7, 0x5e, 0xcf, 0x48, - 0x8f, 0xbc, 0xe8, 0x7f, 0xd6, 0x63, 0xbc, 0xcb, 0x0f, 0x86, 0xf5, 0x26, 0xcc, 0x66, 0x60, 0xe9, - 0xd2, 0x0f, 0x15, 0x57, 0x9b, 0x81, 0xd1, 0xf5, 0x40, 0x88, 0xe7, 0x6c, 0x99, 0x87, 0x41, 0x94, - 0xfc, 0x3f, 0xca, 0xff, 0x18, 0x6f, 0x2c, 0xda, 0x23, 0xa6, 0xe8, 0x0e, 0x4c, 0x45, 0x72, 0x05, - 0xeb, 0xb0, 0x98, 0x9f, 0x1c, 0xa5, 0x95, 0xc9, 0x0b, 0x6a, 0x59, 0xef, 0xc0, 0xcb, 0xba, 0x04, - 0x4a, 0x66, 0xe4, 0x55, 0xfe, 0x84, 0xe8, 0xfd, 0x92, 0x71, 0x81, 0xe8, 0x5f, 0x83, 0x17, 0x14, - 0x0e, 0x5d, 0xdb, 0x41, 0xe1, 0x6b, 0xb5, 0xd1, 0x55, 0x74, 0x0d, 0x27, 0xe8, 0x56, 0xc4, 0xf9, - 0x4e, 0xc8, 0x2a, 0xbc, 0xff, 0xd0, 0x2d, 0x61, 0xee, 0x76, 0x92, 0x20, 0xe2, 0x9b, 0x41, 0xc3, - 0x4f, 0xfa, 0xeb, 0xd8, 0xa8, 0x93, 0x71, 0x83, 0xb9, 0x10, 0x65, 0x17, 0x0b, 0xa8, 0xa1, 0x1e, - 0x2c, 0x07, 0x93, 0x97, 0xf5, 0x91, 0x2a, 0x54, 0xc4, 0x82, 0x56, 0x90, 0x0f, 0x96, 0x8d, 0x67, - 0xc7, 0x96, 0xe7, 0x57, 0x07, 0xb8, 0x78, 0x58, 0xeb, 0x3a, 0xee, 0x96, 0x3c, 0x9a, 0x3f, 0x07, - 0xb3, 0xad, 0x93, 0xd9, 0x0b, 0x75, 0x20, 0x33, 0x7a, 0xed, 0x41, 0x18, 0x5b, 0x37, 0x70, 0x4e, - 0x6c, 0xd6, 0x3d, 0xee, 0x27, 0x43, 0x64, 0xee, 0x36, 0x6e, 0xfc, 0x2e, 0x45, 0xf4, 0x7d, 0x06, - 0x60, 0xb7, 0x99, 0xf0, 0xd8, 0xdd, 0x8b, 0xb8, 0x02, 0x3c, 0x5e, 0x2e, 0xc8, 0x15, 0x21, 0x6b, - 0x39, 0xad, 0xdb, 0x7b, 0xf3, 0x1e, 0x4b, 0x58, 0x7f, 0x7f, 0x3b, 0xfa, 0x40, 0xd5, 0x0a, 0xe8, - 0xe7, 0x02, 0x7c, 0x2d, 0xf1, 0x0e, 0xb8, 0x1b, 0xf1, 0x03, 0xe6, 0xf9, 0x9e, 0x5f, 0x43, 0x5f, - 0x2f, 0x8a, 0xd5, 0xb2, 0x5e, 0x14, 0x99, 0x96, 0xce, 0x65, 0x7f, 0x8d, 0x97, 0xd5, 0x83, 0xb5, - 0x0e, 0x0b, 0xad, 0xd2, 0xb0, 0x1a, 0xdf, 0x56, 0xdc, 0xe3, 0x81, 0xbf, 0x17, 0xf4, 0x07, 0xf4, - 0x73, 0x02, 0x67, 0x7b, 0x2a, 0x23, 0xb8, 0x77, 0x60, 0x0e, 0xfb, 0xdf, 0xcd, 0xf2, 0x1a, 0xdc, - 0x8a, 0xcb, 0xf9, 0x3b, 0xa5, 0xdb, 0x1e, 0xee, 0x18, 0x1a, 0x77, 0xbd, 0xb1, 0xf6, 0xe1, 0x9c, - 0xde, 0x99, 0xbd, 0x83, 0x18, 0xd5, 0x1c, 0xf8, 0x3b, 0x01, 0xcb, 0xe4, 0xad, 0x6f, 0xd4, 0xe3, - 0xa3, 0x89, 0x7a, 0x74, 0x23, 0xe3, 0x21, 0xb6, 0xbf, 0xd8, 0x36, 0x8f, 0xc3, 0x7a, 0xc0, 0xaa, - 0x9b, 0x4f, 0x78, 0x65, 0xbf, 0x6f, 0xf5, 0x7b, 0xf4, 0xd3, 0x2b, 0xb8, 0x29, 0xba, 0xcc, 0xa5, - 0xfb, 0xfd, 0x90, 0xd5, 0xbd, 0xaa, 0xb4, 0x36, 0x5d, 0x56, 0x0f, 0xd6, 0x0f, 0x71, 0xa0, 0x6c, - 0x47, 0x5e, 0x85, 0xb7, 0xf9, 0x2f, 0xc2, 0x74, 0xb5, 0x11, 0xa5, 0x65, 0x2b, 0x94, 0x5b, 0xcf, - 0x3d, 0x10, 0xe8, 0x61, 0x93, 0xb5, 0x95, 0x3a, 0x0f, 0xc5, 0x2a, 0x6e, 0x10, 0xf5, 0x60, 0x9d, - 0xd1, 0x17, 0x05, 0x49, 0xe3, 0x3b, 0x6f, 0x87, 0x96, 0xa7, 0xcf, 0xf7, 0xce, 0xd7, 0x68, 0xf4, - 0x41, 0xf7, 0xbd, 0xae, 0xd7, 0xe1, 0xde, 0x6e, 0xa1, 0xeb, 0x76, 0x67, 0x15, 0xf1, 0x76, 0x84, - 0x9d, 0xb0, 0x93, 0xb0, 0xd6, 0x49, 0x66, 0xfd, 0x77, 0x0c, 0x2f, 0x97, 0xed, 0x2f, 0x11, 0xc4, - 0x69, 0x28, 0x84, 0x8d, 0xa8, 0xf2, 0x84, 0xc5, 0x5c, 0xa5, 0x76, 0xa2, 0x9c, 0x2e, 0x50, 0x0a, - 0x13, 0x0d, 0xf1, 0x62, 0x4c, 0xbe, 0x90, 0xbf, 0xe9, 0x43, 0x00, 0xf1, 0xd7, 0x95, 0xb9, 0x94, - 0x67, 0xf7, 0xec, 0x86, 0x2d, 0x00, 0xfd, 0xeb, 0xcb, 0xb3, 0x4b, 0x35, 0x2f, 0x79, 0xd2, 0xd8, - 0xb5, 0x2b, 0xc1, 0x81, 0x83, 0x1f, 0x50, 0xd4, 0x9f, 0xd5, 0xb8, 0xba, 0xef, 0x24, 0xcd, 0x90, - 0xc7, 0xf6, 0x3d, 0x5e, 0x29, 0x17, 0x84, 0x85, 0xb2, 0x30, 0x20, 0x06, 0x2d, 0x7e, 0x06, 0x69, - 0xc4, 0x22, 0x11, 0x13, 0xd2, 0xd5, 0x8c, 0x5a, 0x7b, 0x2c, 0x96, 0x68, 0x15, 0x5e, 0x94, 0xef, - 0xdc, 0xdd, 0xa6, 0x1b, 0xd6, 0x99, 0x3f, 0x3f, 0x29, 0x93, 0xf5, 0x5a, 0x7e, 0xb2, 0x7a, 0xc6, - 0x6a, 0x4b, 0x6b, 0x1b, 0xcd, 0xed, 0x3a, 0xf3, 0xbf, 0xef, 0x27, 0x51, 0xb3, 0x3c, 0xd3, 0x48, - 0x57, 0x8a, 0x77, 0xe0, 0x54, 0xa7, 0x00, 0x3d, 0x05, 0xe3, 0xfb, 0xbc, 0x89, 0x55, 0x17, 0x3f, - 0xb1, 0x0d, 0x1b, 0x5c, 0xb7, 0x8e, 0x7c, 0x58, 0x1f, 0xbb, 0x49, 0x4a, 0x9f, 0x9d, 0x81, 0x49, - 0xe9, 0x9b, 0xbe, 0x4f, 0x60, 0x4a, 0x7d, 0x24, 0xa1, 0xcb, 0x06, 0x8c, 0x6d, 0xdf, 0x64, 0x8a, - 0x97, 0x06, 0x90, 0x54, 0x71, 0x58, 0x97, 0xdf, 0xfb, 0xc7, 0x7f, 0x7e, 0x39, 0x76, 0x81, 0x7e, - 0xc7, 0xf9, 0x09, 0xab, 0xec, 0xb3, 0xba, 0xa3, 0x34, 0x57, 0xf3, 0xbe, 0x3f, 0xd1, 0x0f, 0x09, - 0x4c, 0x88, 0x3d, 0x45, 0x97, 0x0c, 0x0e, 0x32, 0x47, 0x65, 0xf1, 0x62, 0x5f, 0x39, 0x84, 0xb1, - 0x29, 0x61, 0xdc, 0xa6, 0xb7, 0x8c, 0x30, 0x24, 0x39, 0x74, 0x8e, 0xd4, 0x79, 0x7b, 0xec, 0x1c, - 0xc9, 0x5b, 0xde, 0xb1, 0x73, 0x24, 0xef, 0x75, 0xc7, 0xf4, 0x17, 0x04, 0xa6, 0x35, 0x13, 0xa5, - 0x2b, 0x06, 0xd7, 0x1d, 0xe4, 0xbc, 0x78, 0x79, 0x20, 0x59, 0x84, 0xba, 0x22, 0xa1, 0x9e, 0xa7, - 0x56, 0x7f, 0xa8, 0xf4, 0x53, 0x02, 0x85, 0x16, 0x51, 0xa7, 0x26, 0x37, 0x9d, 0x74, 0x7e, 0x38, - 0x4c, 0x1b, 0x12, 0xd3, 0xab, 0x74, 0xdd, 0x88, 0x29, 0x08, 0xb9, 0xef, 0x62, 0x0e, 0x3b, 0x3f, - 0x15, 0x1c, 0xd3, 0x3f, 0x11, 0x98, 0x94, 0xdf, 0x70, 0xa8, 0xa9, 0x6a, 0xd9, 0x4f, 0x72, 0xc5, - 0xe5, 0xfe, 0x82, 0x08, 0xf0, 0x2d, 0x09, 0x70, 0x9b, 0xbe, 0x61, 0x6e, 0x33, 0xa1, 0x93, 0x83, - 0xad, 0x77, 0xc9, 0x7f, 0x4d, 0x60, 0x5a, 0xcf, 0x32, 0x63, 0xc9, 0x3b, 0x3e, 0x00, 0x18, 0xd3, - 0xdb, 0x49, 0xfd, 0xad, 0x9b, 0x12, 0x7d, 0x89, 0x5e, 0xed, 0x87, 0x5e, 0x8d, 0x50, 0xe7, 0xa8, - 0x95, 0xd4, 0x8f, 0x08, 0xcc, 0x66, 0x89, 0x38, 0xb5, 0xcd, 0x65, 0xed, 0x1c, 0xfc, 0x45, 0x67, - 0x60, 0x79, 0xc4, 0x6a, 0x4b, 0xac, 0xcb, 0x74, 0x69, 0x30, 0xac, 0xf4, 0x6f, 0x04, 0x66, 0x32, - 0x84, 0x8f, 0xae, 0x9a, 0x1c, 0x76, 0xf1, 0xf4, 0xa2, 0x3d, 0xa8, 0x38, 0xc2, 0xdb, 0x91, 0xf0, - 0x1e, 0xd2, 0x1f, 0x19, 0xe1, 0x65, 0xa9, 0xa6, 0xea, 0x07, 0x59, 0xf4, 0x5e, 0x5d, 0xf0, 0x3b, - 0x02, 0x27, 0x3b, 0x98, 0x2f, 0x5d, 0x33, 0x27, 0x2e, 0x87, 0x8d, 0x17, 0x4b, 0xc3, 0xa8, 0x60, - 0x3c, 0x6b, 0x32, 0x9e, 0xcb, 0xf4, 0xd2, 0xc0, 0xf1, 0xd0, 0xdf, 0x13, 0x98, 0x52, 0x34, 0xcc, - 0x38, 0xd2, 0xdb, 0x08, 0xb1, 0x71, 0xa4, 0xb7, 0x13, 0x59, 0xeb, 0x0d, 0x09, 0xe9, 0x07, 0x74, - 0xcb, 0x08, 0x09, 0x69, 0xdf, 0x00, 0xd9, 0xfd, 0x15, 0x01, 0x48, 0x19, 0x27, 0xbd, 0x62, 0xce, - 0x52, 0x3b, 0xf7, 0x2d, 0xae, 0x0e, 0x28, 0x8d, 0xd8, 0xaf, 0x48, 0xec, 0x4b, 0xf4, 0xfc, 0x20, - 0xd8, 0xe9, 0xc7, 0x04, 0x0a, 0x2d, 0xca, 0x63, 0x1c, 0xaf, 0x9d, 0x8c, 0xaa, 0x78, 0x65, 0x30, - 0x61, 0x84, 0xf5, 0x3d, 0x09, 0xeb, 0x1a, 0x5d, 0x33, 0xcf, 0xfc, 0x88, 0x73, 0x57, 0x92, 0xcd, - 0xcc, 0x04, 0xf8, 0x98, 0x00, 0xa4, 0x94, 0xd3, 0x98, 0xbd, 0x2e, 0xf6, 0x6b, 0xcc, 0x5e, 0x37, - 0x8f, 0xb5, 0xbe, 0x2b, 0x61, 0x5e, 0xa5, 0xb6, 0x11, 0xa6, 0xf8, 0xeb, 0xf9, 0xb5, 0x0c, 0xc6, - 0x0f, 0x09, 0x4c, 0x6b, 0xd6, 0x6a, 0x9c, 0xa2, 0x1d, 0x54, 0xd8, 0x38, 0x45, 0x3b, 0x69, 0xb0, - 0x75, 0x43, 0xa2, 0x5b, 0xa3, 0x4e, 0x9f, 0x83, 0xd3, 0xaf, 0xca, 0x43, 0xaa, 0xd5, 0x90, 0x62, - 0x44, 0xd1, 0xfb, 0x3c, 0xe9, 0xa0, 0xb8, 0xc6, 0x1d, 0x9e, 0xcf, 0xa3, 0x8d, 0x3b, 0xbc, 0x07, - 0x83, 0xb6, 0xee, 0x49, 0xd8, 0x77, 0xe8, 0xab, 0x46, 0xd8, 0x35, 0x9e, 0xb8, 0x15, 0x69, 0xc1, - 0xcd, 0x6d, 0x83, 0xdf, 0x10, 0x80, 0xfb, 0x3c, 0x41, 0xda, 0x4c, 0xcd, 0x37, 0xb4, 0x2c, 0x17, - 0x2f, 0xae, 0x0c, 0x22, 0x8a, 0x58, 0x6f, 0x49, 0xac, 0xd7, 0xe9, 0xb5, 0xbe, 0x58, 0x43, 0xd6, - 0x74, 0xab, 0x2c, 0x61, 0x19, 0x88, 0x7f, 0x25, 0x40, 0xbb, 0xe9, 0x1f, 0x7d, 0xa5, 0xff, 0xd5, - 0xb8, 0x9b, 0xeb, 0x16, 0xaf, 0x0f, 0xa9, 0x35, 0x54, 0x00, 0x59, 0x3a, 0x9b, 0x09, 0xe0, 0x2f, - 0x04, 0x5e, 0xca, 0xa5, 0xc4, 0xf4, 0x86, 0x79, 0x0a, 0xf5, 0x0e, 0xe3, 0xe6, 0xf0, 0x8a, 0x43, - 0x1d, 0x0c, 0xd9, 0x48, 0xe8, 0x1f, 0x09, 0x9c, 0xec, 0xa0, 0xac, 0xc6, 0x26, 0xcf, 0x67, 0xcb, - 0xc6, 0x26, 0xef, 0xc1, 0x88, 0x07, 0x9c, 0x1c, 0x62, 0x5b, 0xba, 0x0d, 0xa9, 0xee, 0x56, 0x24, - 0xbc, 0x3f, 0x10, 0x80, 0x94, 0xe3, 0x1a, 0xa7, 0x5b, 0x17, 0xad, 0x36, 0x4e, 0xb7, 0x6e, 0xe2, - 0x3c, 0x20, 0x47, 0x90, 0x74, 0x5a, 0xa1, 0x73, 0x8e, 0x34, 0x4b, 0x3f, 0x76, 0x8e, 0x24, 0x2f, - 0x3f, 0xa6, 0x9f, 0x89, 0xab, 0x42, 0x3b, 0x05, 0x36, 0x5f, 0x15, 0x72, 0xf9, 0xb8, 0xf9, 0xaa, - 0x90, 0xcf, 0xd1, 0xad, 0xeb, 0x12, 0xbf, 0x43, 0x57, 0xcd, 0x57, 0x05, 0x45, 0x60, 0xd3, 0x0b, - 0xda, 0x6f, 0x09, 0xcc, 0x66, 0x29, 0xa8, 0xf1, 0x0a, 0x99, 0x43, 0xda, 0x8d, 0x57, 0xc8, 0x3c, - 0x6e, 0x6b, 0x95, 0x24, 0xd0, 0x2b, 0x74, 0xa5, 0xef, 0x31, 0xc2, 0x6a, 0xdc, 0x15, 0xf7, 0x9a, - 0x78, 0xe3, 0xf5, 0xcf, 0x9f, 0x2e, 0x90, 0x2f, 0x9e, 0x2e, 0x90, 0x7f, 0x3f, 0x5d, 0x20, 0x1f, - 0x3c, 0x5b, 0x38, 0xf1, 0xc5, 0xb3, 0x85, 0x13, 0xff, 0x7c, 0xb6, 0x70, 0xe2, 0xed, 0x52, 0x86, - 0xc7, 0x2b, 0x7b, 0xaf, 0xb3, 0xdd, 0xb8, 0xdd, 0xe6, 0xcf, 0x5a, 0x56, 0x25, 0xaf, 0xdf, 0x9d, - 0x92, 0xff, 0x71, 0x70, 0xed, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x95, 0xcf, 0xfa, 0xb6, 0xa6, - 0x21, 0x00, 0x00, + // 2019 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6f, 0x5b, 0x49, + 0x15, 0xef, 0xe4, 0x6b, 0xe3, 0xe3, 0x74, 0x5b, 0x66, 0xb3, 0x25, 0x58, 0x21, 0x49, 0xa7, 0xcd, + 0x47, 0xd3, 0xc6, 0xb7, 0x49, 0x29, 0x94, 0x76, 0x5b, 0x6d, 0x92, 0x92, 0x52, 0xb1, 0xdd, 0xa6, + 0x37, 0x2a, 0x88, 0x45, 0xe2, 0x32, 0xb1, 0x27, 0xee, 0x25, 0xce, 0xbd, 0x77, 0xef, 0xbd, 0x2e, + 0x58, 0x51, 0x5e, 0xe8, 0x0b, 0xbc, 0xad, 0x84, 0x8a, 0x60, 0x85, 0x84, 0x84, 0x2a, 0x60, 0xc5, + 0x3b, 0x20, 0xfe, 0x82, 0x7d, 0x63, 0x25, 0x5e, 0x10, 0x0f, 0x15, 0x6a, 0xe1, 0xff, 0x40, 0xf3, + 0x71, 0xc7, 0x63, 0xe7, 0x7a, 0xec, 0x20, 0xa3, 0x7d, 0x8a, 0x67, 0xfc, 0x3b, 0xe7, 0xfc, 0xce, + 0xc7, 0xcc, 0x9c, 0xe3, 0xc0, 0x5c, 0x85, 0x06, 0x7e, 0xc0, 0xbc, 0xca, 0x13, 0xea, 0x07, 0x4e, + 0x92, 0x86, 0x31, 0xad, 0x31, 0xe7, 0xc3, 0x06, 0x8b, 0x9b, 0xe5, 0x28, 0x0e, 0xd3, 0x10, 0x4f, + 0x9a, 0x88, 0xb2, 0x42, 0x94, 0x26, 0x6b, 0x61, 0x2d, 0x14, 0x00, 0x87, 0x7f, 0x92, 0xd8, 0xd2, + 0x74, 0x2d, 0x0c, 0x6b, 0x75, 0xe6, 0xd0, 0xc8, 0x77, 0x68, 0x10, 0x84, 0x29, 0x4d, 0xfd, 0x30, + 0x48, 0xd4, 0xb7, 0xcb, 0x95, 0x30, 0x39, 0x08, 0x13, 0x67, 0x97, 0x26, 0xca, 0x84, 0xf3, 0x74, + 0x75, 0x97, 0xa5, 0x74, 0xd5, 0x89, 0x68, 0xcd, 0x0f, 0x04, 0x58, 0x61, 0xcf, 0xe7, 0xf2, 0x8a, + 0x68, 0x4c, 0x0f, 0x32, 0x75, 0x8b, 0xb9, 0x10, 0x5a, 0x49, 0xfd, 0xa7, 0xcc, 0xab, 0x32, 0x5a, + 0xcf, 0x80, 0x17, 0xf3, 0x75, 0xc5, 0xe1, 0x53, 0xbf, 0xca, 0x62, 0xbb, 0xba, 0x88, 0x36, 0x0f, + 0x58, 0x90, 0x7a, 0x7e, 0xb0, 0xa7, 0x9c, 0x24, 0xa7, 0xa1, 0xf8, 0x88, 0x93, 0xdf, 0x16, 0x64, + 0xc8, 0x23, 0x78, 0xcb, 0x58, 0xba, 0x2c, 0x89, 0xc2, 0x20, 0x61, 0xf8, 0x26, 0x8c, 0x49, 0xb6, + 0x53, 0x68, 0x0e, 0x2d, 0x15, 0xd7, 0xa6, 0xcb, 0x79, 0x71, 0x2c, 0x4b, 0xa9, 0x8d, 0x91, 0x4f, + 0x5f, 0xce, 0x9e, 0x72, 0x95, 0x04, 0x39, 0x04, 0x90, 0x2a, 0xe3, 0x30, 0xdc, 0xc3, 0x97, 0xe0, + 0x6c, 0xc6, 0xd5, 0xa3, 0xd5, 0x6a, 0xcc, 0x12, 0xa9, 0xb3, 0xe0, 0x9e, 0xc9, 0xf6, 0xd7, 0xe5, + 0x36, 0x3e, 0x07, 0x63, 0x07, 0x2c, 0xde, 0xaf, 0xb3, 0xa9, 0xa1, 0x39, 0xb4, 0x34, 0xe1, 0xaa, + 0x15, 0x9e, 0x84, 0xd1, 0xf0, 0x47, 0x01, 0x8b, 0xa7, 0x86, 0x85, 0x9c, 0x5c, 0xf0, 0xdd, 0x24, + 0xa5, 0x71, 0x3a, 0x35, 0x32, 0x87, 0x96, 0x86, 0x5d, 0xb9, 0x20, 0x8f, 0x00, 0xb7, 0x8c, 0x6b, + 0x77, 0x6e, 0xc1, 0x68, 0xc4, 0x37, 0x94, 0x37, 0xb3, 0xf9, 0xde, 0x6c, 0xf9, 0x75, 0x26, 0xe4, + 0x94, 0x43, 0x52, 0x86, 0xfc, 0x0c, 0xc1, 0x64, 0x4b, 0x67, 0xb2, 0xd1, 0xcc, 0xf8, 0x9e, 0xc0, + 0xb5, 0x2d, 0x80, 0x56, 0x91, 0x08, 0xf7, 0x8a, 0x6b, 0x0b, 0x65, 0x59, 0x51, 0x65, 0x5e, 0x51, + 0x65, 0x59, 0xb4, 0xaa, 0xa2, 0xca, 0xdb, 0xb4, 0xc6, 0x5c, 0xf6, 0x61, 0x83, 0x25, 0xa9, 0x6b, + 0x48, 0x92, 0x17, 0x08, 0xa6, 0xf3, 0xb8, 0xe4, 0x79, 0x3a, 0x7c, 0x52, 0x4f, 0xf1, 0xbd, 0x1c, + 0x96, 0x8b, 0x3d, 0x59, 0x4a, 0xcb, 0x6d, 0x34, 0x1f, 0x42, 0x41, 0xb0, 0xe4, 0x76, 0x8c, 0xb4, + 0xa2, 0xfc, 0xb4, 0x0e, 0xe5, 0xa6, 0x75, 0xd8, 0x4c, 0xeb, 0x36, 0x7c, 0x41, 0x2b, 0x34, 0x7c, + 0x1d, 0xd9, 0xf3, 0x95, 0xda, 0xe2, 0xda, 0xf9, 0x7c, 0x57, 0x1f, 0x07, 0xfe, 0x9e, 0xcf, 0xaa, + 0x5c, 0x50, 0x39, 0x2b, 0x84, 0xc8, 0x77, 0xe0, 0xb4, 0xd0, 0xb8, 0x5e, 0xaf, 0xf3, 0xef, 0x3a, + 0x53, 0x84, 0xfe, 0xe7, 0x14, 0x3d, 0x43, 0xf0, 0xa6, 0xd0, 0xfc, 0x30, 0x62, 0x81, 0x54, 0xfd, + 0x39, 0x14, 0xca, 0x6f, 0x10, 0xbc, 0xdd, 0xe6, 0x9f, 0x8e, 0xda, 0x6d, 0x18, 0xe5, 0x01, 0x48, + 0x54, 0x85, 0xf4, 0x1d, 0x36, 0x29, 0x35, 0xb8, 0x1a, 0xb9, 0xa4, 0x12, 0xb0, 0xad, 0x22, 0x80, + 0xa7, 0xe0, 0x8d, 0xf6, 0xe0, 0x64, 0x4b, 0xf2, 0x81, 0xf2, 0x25, 0x83, 0x6a, 0x5f, 0xd6, 0x61, + 0x3c, 0x0b, 0xa0, 0xfd, 0x68, 0x67, 0x92, 0xd9, 0x5d, 0xa5, 0xc5, 0xc8, 0xf7, 0x54, 0x65, 0xad, + 0xd7, 0xeb, 0x1a, 0x34, 0xb0, 0x5a, 0xf8, 0x04, 0xc1, 0x97, 0x8e, 0x69, 0xd7, 0xec, 0x37, 0xa1, + 0xa0, 0xaf, 0x71, 0xfb, 0x79, 0xed, 0xa4, 0xdf, 0x92, 0x1b, 0x5c, 0x3e, 0x02, 0x38, 0x2b, 0xa9, + 0xa6, 0x29, 0x4b, 0xe4, 0xd3, 0xc7, 0x8f, 0x2e, 0xb7, 0xa4, 0xa2, 0x5b, 0x70, 0xd5, 0x6a, 0x20, + 0x37, 0xb5, 0x0f, 0x53, 0x9d, 0xf6, 0x74, 0x64, 0x1e, 0x40, 0x91, 0xb6, 0xb6, 0x55, 0x02, 0xe6, + 0xf3, 0x63, 0x63, 0xc8, 0x6f, 0x85, 0xf1, 0x81, 0x8a, 0x90, 0x29, 0x4f, 0xbe, 0xaf, 0x2e, 0xf0, + 0xf5, 0x7a, 0xdd, 0x40, 0x0f, 0x2e, 0xcd, 0x7f, 0xc9, 0x6e, 0xe5, 0x0e, 0x03, 0xda, 0x9f, 0x87, + 0x30, 0x61, 0xf0, 0xc9, 0x92, 0x7d, 0x22, 0x87, 0xda, 0x14, 0x0c, 0x2e, 0xeb, 0xbe, 0x6a, 0x07, + 0x5c, 0x16, 0x85, 0x71, 0xfa, 0x7f, 0x4d, 0xf8, 0x63, 0xd5, 0x6a, 0x48, 0x53, 0x3a, 0x36, 0x77, + 0x60, 0x2c, 0x16, 0x3b, 0x2a, 0x01, 0x73, 0xf9, 0x51, 0x91, 0x52, 0x46, 0x40, 0x94, 0x14, 0xf9, + 0x2e, 0x9c, 0xc9, 0x62, 0x2f, 0x31, 0x83, 0xcb, 0xeb, 0x0b, 0x04, 0x5f, 0xec, 0xd0, 0xad, 0x69, + 0xbf, 0x0b, 0x6f, 0x48, 0x02, 0x59, 0x36, 0xfb, 0xe5, 0x9d, 0x89, 0x0d, 0x2e, 0x87, 0xcb, 0xea, + 0xc1, 0xd9, 0x8a, 0x19, 0xdb, 0x89, 0x68, 0x85, 0x59, 0xae, 0xd2, 0xcb, 0x2a, 0x5a, 0x3b, 0x69, + 0x18, 0xb3, 0xcd, 0xb0, 0x11, 0xa4, 0x16, 0x70, 0x19, 0xce, 0xb5, 0x2b, 0xd6, 0xde, 0xf3, 0x0c, + 0xf3, 0x0d, 0x25, 0x21, 0x17, 0xc4, 0x51, 0xe1, 0x6a, 0x29, 0x37, 0x05, 0x2a, 0x7c, 0x23, 0x13, + 0x10, 0x0b, 0xb2, 0xa8, 0xde, 0x80, 0x2d, 0x3f, 0xa8, 0xda, 0x7a, 0x05, 0x72, 0x53, 0xbd, 0x00, + 0x19, 0x50, 0xeb, 0x3d, 0x0f, 0x13, 0xfa, 0x69, 0xf5, 0xa3, 0xcc, 0x83, 0x62, 0xb6, 0x77, 0x3f, + 0x4a, 0xc8, 0x55, 0x75, 0xfa, 0x37, 0xeb, 0x3e, 0x0b, 0xd2, 0x7e, 0x82, 0x74, 0x5b, 0x1d, 0xe7, + 0x0e, 0x09, 0x6d, 0xf4, 0xcb, 0x00, 0xbb, 0xcd, 0x94, 0x25, 0xde, 0x5e, 0xcc, 0x24, 0xd3, 0x61, + 0xb7, 0x20, 0x76, 0x38, 0x96, 0x2c, 0xc1, 0x84, 0xea, 0xa9, 0x9b, 0x77, 0x69, 0x4a, 0x2d, 0x86, + 0x76, 0xb2, 0xce, 0x52, 0x22, 0xb5, 0x81, 0x79, 0x78, 0x33, 0xf5, 0x0f, 0x98, 0x17, 0xb3, 0x03, + 0xea, 0x07, 0x7e, 0x50, 0x53, 0x46, 0x4e, 0xf3, 0x5d, 0x37, 0xdb, 0xe4, 0x41, 0x15, 0x56, 0x45, + 0xf1, 0x0c, 0xbb, 0x72, 0x41, 0xae, 0x19, 0x59, 0xa0, 0x35, 0xb6, 0x2d, 0x67, 0x80, 0xfb, 0xc1, + 0x5e, 0x68, 0x61, 0xf2, 0x0c, 0xc1, 0x6c, 0x17, 0x29, 0xcd, 0xea, 0x07, 0x30, 0xa9, 0xaa, 0xda, + 0x33, 0x07, 0x0b, 0x75, 0xc0, 0x96, 0xf2, 0xeb, 0xff, 0xb8, 0x3e, 0x75, 0x0e, 0x70, 0x72, 0xec, + 0x1b, 0x52, 0x85, 0x52, 0x76, 0xde, 0x72, 0xd8, 0x0f, 0xea, 0x58, 0xff, 0x0d, 0x01, 0xe9, 0x6e, + 0xa6, 0x0f, 0x77, 0x87, 0x07, 0xe3, 0xee, 0xe0, 0x6e, 0x80, 0x2d, 0x55, 0x47, 0xfc, 0x68, 0x3c, + 0x8e, 0xea, 0x21, 0xad, 0x6e, 0x3e, 0x61, 0x95, 0xfd, 0xee, 0xf9, 0xee, 0x52, 0x3a, 0x5f, 0x51, + 0x85, 0xdf, 0xa1, 0xc7, 0x3c, 0xc5, 0x4f, 0x69, 0xdd, 0xaf, 0x0a, 0x6d, 0xe3, 0xae, 0x5c, 0x90, + 0x4d, 0x75, 0xa7, 0x6c, 0xc7, 0x7e, 0x85, 0x49, 0xc3, 0x25, 0x18, 0xaf, 0x36, 0xe2, 0x56, 0xa2, + 0x0a, 0xae, 0x5e, 0x77, 0x31, 0x9d, 0xdd, 0x1d, 0x2d, 0x25, 0xa6, 0xd5, 0x88, 0xef, 0xaa, 0x43, + 0x20, 0x17, 0xe4, 0x5c, 0xf6, 0xa8, 0x8b, 0x91, 0x59, 0x77, 0x48, 0xc4, 0xcf, 0xde, 0xe2, 0xf6, + 0x7d, 0xad, 0xed, 0xfe, 0xf1, 0xae, 0xab, 0xdb, 0x43, 0xdc, 0xae, 0xe1, 0x58, 0xef, 0x45, 0xde, + 0x52, 0xbd, 0xa3, 0x4a, 0xfa, 0x4e, 0x4a, 0xd3, 0x84, 0xfc, 0x67, 0x48, 0xf5, 0x7c, 0xe6, 0xae, + 0xb6, 0x3e, 0x0d, 0x85, 0xa8, 0x11, 0x57, 0x9e, 0xd0, 0x84, 0xc9, 0x28, 0x8e, 0xb8, 0xad, 0x0d, + 0x8c, 0x61, 0xa4, 0xc1, 0xbf, 0x18, 0x12, 0x5f, 0x88, 0xcf, 0xf8, 0x01, 0x00, 0xff, 0xeb, 0x89, + 0xe8, 0x89, 0x77, 0x76, 0x62, 0xa3, 0xcc, 0x99, 0xfc, 0xf3, 0xe5, 0xec, 0x42, 0xcd, 0x4f, 0x9f, + 0x34, 0x76, 0xcb, 0x95, 0xf0, 0xc0, 0x51, 0x3f, 0x4f, 0xc8, 0x3f, 0x2b, 0x49, 0x75, 0xdf, 0x49, + 0x9b, 0x11, 0x4b, 0xca, 0x77, 0x59, 0xc5, 0x2d, 0x70, 0x0d, 0x2e, 0x57, 0xc0, 0x2f, 0x4c, 0xf5, + 0x23, 0x43, 0x23, 0xe1, 0x11, 0x18, 0x11, 0xa6, 0x8a, 0x72, 0xef, 0x31, 0xdf, 0xc2, 0x55, 0x38, + 0x2d, 0xbe, 0xf3, 0x76, 0x9b, 0x5e, 0x54, 0xa7, 0xc1, 0xd4, 0xa8, 0x88, 0xd2, 0xbb, 0xf9, 0x51, + 0xea, 0xea, 0x6b, 0x59, 0x68, 0xdb, 0x68, 0x6e, 0xd7, 0x69, 0xf0, 0x8d, 0x20, 0x8d, 0x9b, 0x6e, + 0xb1, 0xd1, 0xda, 0x29, 0xdd, 0x81, 0xb3, 0x9d, 0x00, 0x7c, 0x16, 0x86, 0xf7, 0x59, 0x53, 0xe5, + 0x99, 0x7f, 0x54, 0x15, 0xd7, 0x60, 0x59, 0xb1, 0x88, 0xc5, 0xcd, 0xa1, 0x1b, 0x68, 0xed, 0xf9, + 0x34, 0x8c, 0x0a, 0xdb, 0xf8, 0x19, 0x82, 0x31, 0xf9, 0x4b, 0x04, 0x3e, 0x6f, 0xe1, 0x28, 0x21, + 0xa5, 0x4b, 0x3d, 0x21, 0x99, 0x03, 0xe4, 0xf2, 0x4f, 0xfe, 0xfe, 0xef, 0x9f, 0x0f, 0xcd, 0xe3, + 0x0b, 0xce, 0x0f, 0x69, 0x65, 0x9f, 0xd6, 0x1d, 0x29, 0xb9, 0x92, 0xf7, 0xb3, 0x0e, 0x7e, 0x8e, + 0x60, 0x44, 0xbc, 0x61, 0xb3, 0x16, 0x03, 0x1c, 0x50, 0x5a, 0xec, 0x01, 0xd0, 0xf6, 0x37, 0x85, + 0xfd, 0xdb, 0xf8, 0x96, 0xd5, 0xbe, 0x98, 0xcb, 0x9c, 0x43, 0xf9, 0x52, 0x1e, 0x39, 0x87, 0xa2, + 0x07, 0x3b, 0x72, 0x0e, 0x45, 0xd7, 0x75, 0x84, 0x7f, 0x8a, 0x60, 0x5c, 0x0f, 0xb9, 0x17, 0x2c, + 0xa6, 0x33, 0x50, 0xe9, 0x72, 0x1f, 0x20, 0xcd, 0x71, 0x59, 0x70, 0xbc, 0x88, 0x49, 0x6f, 0x8e, + 0xf8, 0xb7, 0x08, 0x0a, 0xad, 0xa9, 0xf8, 0xa2, 0xc5, 0x8c, 0x46, 0x9d, 0x8c, 0xcc, 0x86, 0x20, + 0xf3, 0x0e, 0xbe, 0x69, 0x25, 0x13, 0x46, 0x2c, 0xf0, 0x54, 0xd4, 0x3a, 0xe7, 0xf2, 0x23, 0xfc, + 0x47, 0x04, 0xa3, 0xf2, 0xa7, 0xab, 0x39, 0x5b, 0xa5, 0x70, 0x44, 0x69, 0xa9, 0x17, 0x42, 0x33, + 0xfb, 0xb6, 0x60, 0xb6, 0x8d, 0xdf, 0xb7, 0x97, 0x12, 0x97, 0xc9, 0x21, 0xd5, 0x3d, 0xbb, 0xbf, + 0x40, 0x30, 0xae, 0x27, 0xe8, 0x0b, 0x76, 0x3a, 0x02, 0x64, 0x0d, 0x68, 0xe7, 0x80, 0x4d, 0x6e, + 0x08, 0xda, 0x6b, 0xf8, 0x6a, 0x2f, 0xda, 0xf2, 0x46, 0x74, 0x0e, 0x75, 0x18, 0x7f, 0x89, 0x60, + 0xa2, 0x6d, 0xa6, 0x5e, 0xb4, 0x27, 0x52, 0x03, 0x4b, 0x4e, 0x9f, 0x40, 0x4d, 0xb2, 0x2c, 0x48, + 0x2e, 0xe1, 0x85, 0xfe, 0x48, 0xe2, 0xbf, 0x22, 0x28, 0x9a, 0x53, 0xee, 0x82, 0xcd, 0x60, 0x0b, + 0x57, 0x2a, 0xf7, 0x87, 0xd3, 0xbc, 0x76, 0x04, 0xaf, 0x07, 0xf8, 0x5b, 0x56, 0x5e, 0xe6, 0x5c, + 0x27, 0x53, 0x2f, 0xf2, 0xdb, 0x2d, 0xe1, 0x2f, 0x10, 0x9c, 0xe9, 0x9c, 0x63, 0x97, 0xed, 0x11, + 0x33, 0xb1, 0xa5, 0xb5, 0xfe, 0xb1, 0xda, 0x91, 0x55, 0xe1, 0xc8, 0x65, 0x7c, 0xa9, 0x6f, 0x47, + 0xf0, 0xef, 0x10, 0x8c, 0xa9, 0x99, 0xd2, 0x76, 0x27, 0x4b, 0x88, 0xf5, 0x4e, 0x6e, 0x1f, 0x17, + 0xc9, 0xfb, 0x82, 0xcb, 0x37, 0xf1, 0x96, 0x95, 0x8b, 0x9a, 0xb1, 0xfa, 0x88, 0xe7, 0x47, 0x08, + 0xc0, 0x18, 0x1d, 0xe7, 0xed, 0xe1, 0x51, 0xb0, 0xd2, 0x4a, 0x5f, 0x30, 0x4d, 0xfa, 0x8a, 0x20, + 0xbd, 0x80, 0x2f, 0xf6, 0x43, 0x1a, 0x7f, 0x8c, 0xa0, 0xd0, 0x1a, 0x53, 0x6c, 0xd7, 0xa4, 0x46, + 0x95, 0xae, 0xf4, 0x83, 0xd2, 0x7c, 0xbe, 0x2e, 0xf8, 0x5c, 0xc3, 0xab, 0xf6, 0x4b, 0x3b, 0x66, + 0xcc, 0x13, 0x93, 0x9d, 0x71, 0xae, 0x3f, 0x46, 0x00, 0xc6, 0xf0, 0x38, 0xdf, 0xa3, 0x29, 0x90, + 0x30, 0x6b, 0xbc, 0x8e, 0x4f, 0x8b, 0xe4, 0xab, 0x82, 0xdf, 0x55, 0x5c, 0xb6, 0xf2, 0xe3, 0x7f, + 0xfd, 0xa0, 0x66, 0x90, 0x7b, 0x8e, 0x60, 0x5c, 0xcf, 0x92, 0x17, 0xac, 0xcf, 0xac, 0x04, 0x59, + 0x6f, 0xc3, 0xce, 0x61, 0x93, 0x7c, 0x4d, 0xd0, 0x5a, 0xc5, 0x4e, 0x8f, 0xb7, 0x2e, 0xa8, 0x8a, + 0xe7, 0x45, 0x17, 0x1d, 0xbf, 0x71, 0xf0, 0x3d, 0x96, 0x76, 0x4e, 0xa0, 0xb6, 0x73, 0xdb, 0x81, + 0xb5, 0x9e, 0xdb, 0x2e, 0x73, 0x2a, 0xb9, 0x2b, 0xf8, 0xde, 0xc1, 0xef, 0x58, 0xf9, 0xd6, 0x58, + 0xea, 0x55, 0x84, 0x06, 0x2f, 0x37, 0xe3, 0xbf, 0x42, 0x00, 0xf7, 0x58, 0x9a, 0x4d, 0xb3, 0xc4, + 0xda, 0x3f, 0x09, 0x4c, 0x69, 0xb9, 0x37, 0x46, 0x93, 0xbc, 0x25, 0x48, 0x5e, 0xc7, 0xd7, 0x7a, + 0x92, 0x8c, 0x68, 0xd3, 0xab, 0xd2, 0x94, 0x1a, 0xdc, 0xfe, 0x8c, 0x00, 0xe7, 0x4c, 0x8a, 0x2b, + 0xbd, 0x5b, 0x55, 0x03, 0x5e, 0xba, 0x7e, 0x22, 0xf8, 0x09, 0x99, 0x9b, 0xb3, 0xa3, 0xc1, 0xfc, + 0x4f, 0x08, 0xde, 0xce, 0x1f, 0x73, 0xaf, 0xda, 0xef, 0x96, 0x1c, 0xfe, 0x37, 0x4e, 0x2a, 0x71, + 0xc2, 0x9b, 0xdd, 0x74, 0x01, 0x7f, 0x82, 0xe0, 0x4c, 0xe7, 0x9c, 0xb9, 0xdc, 0xa3, 0xa3, 0x35, + 0xb0, 0xd6, 0x42, 0xee, 0x32, 0x77, 0xf6, 0x79, 0x1f, 0xf0, 0x33, 0xe7, 0x35, 0x84, 0xb8, 0x57, + 0x11, 0xbc, 0x7e, 0x8f, 0x00, 0x8c, 0xa9, 0x74, 0xde, 0xda, 0xfa, 0x64, 0x30, 0xeb, 0x65, 0x75, + 0x7c, 0x3c, 0xed, 0xb3, 0x4b, 0x17, 0x43, 0xab, 0xa4, 0xe5, 0x1c, 0x66, 0xb3, 0xf0, 0x91, 0x73, + 0x28, 0xa6, 0xdf, 0x23, 0xfc, 0x07, 0xfe, 0xac, 0xb7, 0xcf, 0x9b, 0xf6, 0x67, 0xbd, 0x1d, 0x6b, + 0x7f, 0xd6, 0xf3, 0x27, 0x61, 0x72, 0x5d, 0x10, 0x77, 0xf0, 0x8a, 0xfd, 0x59, 0x97, 0xd3, 0x62, + 0xab, 0x7d, 0xfa, 0x35, 0x82, 0x09, 0x73, 0xde, 0xb3, 0x76, 0x76, 0x26, 0xd0, 0xda, 0xd9, 0xe5, + 0x4d, 0x90, 0x64, 0x4d, 0x30, 0xbc, 0x82, 0x97, 0x7b, 0xbe, 0x03, 0xb4, 0xc6, 0x3c, 0xde, 0x7c, + 0x24, 0x1b, 0xef, 0x7d, 0xfa, 0x6a, 0x06, 0x7d, 0xf6, 0x6a, 0x06, 0xfd, 0xeb, 0xd5, 0x0c, 0xfa, + 0xe8, 0xf5, 0xcc, 0xa9, 0xcf, 0x5e, 0xcf, 0x9c, 0xfa, 0xc7, 0xeb, 0x99, 0x53, 0x1f, 0xac, 0x19, + 0xd3, 0xb2, 0xd4, 0xf7, 0x1e, 0xdd, 0x4d, 0xda, 0x75, 0xfe, 0x58, 0x6b, 0x15, 0xd3, 0xf3, 0xee, + 0x98, 0xf8, 0xaf, 0xf9, 0xb5, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x56, 0x8d, 0xfa, 0x65, 0x6a, + 0x20, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2388,49 +2386,49 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Queries a File by index. - File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) + File(ctx context.Context, in *QueryFile, opts ...grpc.CallOption) (*QueryFileResponse, error) // Queries a list of File items. - AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) + AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a list of File items. - OpenFiles(ctx context.Context, in *QueryOpenFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) + OpenFiles(ctx context.Context, in *QueryOpenFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a list of File items. - Proof(ctx context.Context, in *QueryProofRequest, opts ...grpc.CallOption) (*QueryProofResponse, error) + Proof(ctx context.Context, in *QueryProof, opts ...grpc.CallOption) (*QueryProofResponse, error) // Queries a Providers by index. - Provider(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) + Provider(ctx context.Context, in *QueryProvider, opts ...grpc.CallOption) (*QueryProviderResponse, error) // Queries a list of Providers items. - AllProviders(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) + AllProviders(ctx context.Context, in *QueryAllProviders, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) // Queries a Attestation by index. - Attestation(ctx context.Context, in *QueryAttestationRequest, opts ...grpc.CallOption) (*QueryAttestationResponse, error) + Attestation(ctx context.Context, in *QueryAttestation, opts ...grpc.CallOption) (*QueryAttestationResponse, error) // Queries a list of Attestation items. - AllAttestations(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) + AllAttestations(ctx context.Context, in *QueryAllAttestations, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) // Queries a Report by index. - Report(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) + Report(ctx context.Context, in *QueryReport, opts ...grpc.CallOption) (*QueryReportResponse, error) // Queries a list of Attestation items. - AllReports(ctx context.Context, in *QueryAllReportsRequest, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) - // Queries a list of Freespace items. - FreeSpace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) - // Queries a list of Freespace items. - StoreCount(ctx context.Context, in *QueryStoreCountRequest, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) + AllReports(ctx context.Context, in *QueryAllReports, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) + // Queries a list of FreeSpace items. + FreeSpace(ctx context.Context, in *QueryFreeSpace, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) + // Queries a list of FreeSpace items. + StoreCount(ctx context.Context, in *QueryStoreCount, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. - FindFile(ctx context.Context, in *QueryFindFileRequest, opts ...grpc.CallOption) (*QueryFindFileResponse, error) + FindFile(ctx context.Context, in *QueryFindFile, opts ...grpc.CallOption) (*QueryFindFileResponse, error) // Queries a list of GetClientFreeSpace items. - GetClientFreeSpace(ctx context.Context, in *QueryClientFreeSpaceRequest, opts ...grpc.CallOption) (*QueryClientFreeSpaceResponse, error) + GetClientFreeSpace(ctx context.Context, in *QueryClientFreeSpace, opts ...grpc.CallOption) (*QueryClientFreeSpaceResponse, error) // Queries a list of GetPayData items. - GetPayData(ctx context.Context, in *QueryPayDataRequest, opts ...grpc.CallOption) (*QueryPayDataResponse, error) + GetPayData(ctx context.Context, in *QueryPayData, opts ...grpc.CallOption) (*QueryPayDataResponse, error) // Queries a StoragePaymentInfo by address. - StoragePaymentInfo(ctx context.Context, in *QueryStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryStoragePaymentInfoResponse, error) + StoragePaymentInfo(ctx context.Context, in *QueryStoragePaymentInfo, opts ...grpc.CallOption) (*QueryStoragePaymentInfoResponse, error) // Queries a list of StoragePaymentInfo items. - AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) + AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfo, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) // Queries whether user can upload a file based on size - FileUploadCheck(ctx context.Context, in *QueryFileUploadCheckRequest, opts ...grpc.CallOption) (*QueryFileUploadCheckResponse, error) + FileUploadCheck(ctx context.Context, in *QueryFileUploadCheck, opts ...grpc.CallOption) (*QueryFileUploadCheckResponse, error) // Queries whether user can upload a file based on size - PriceCheck(ctx context.Context, in *QueryPriceCheckRequest, opts ...grpc.CallOption) (*QueryPriceCheckResponse, error) + PriceCheck(ctx context.Context, in *QueryPriceCheck, opts ...grpc.CallOption) (*QueryPriceCheckResponse, error) // Queries whether user can upload a file based on size - ActiveProviders(ctx context.Context, in *QueryActiveProvidersRequest, opts ...grpc.CallOption) (*QueryActiveProvidersResponse, error) + ActiveProviders(ctx context.Context, in *QueryActiveProviders, opts ...grpc.CallOption) (*QueryActiveProvidersResponse, error) // Queries the storage space used and purchased - StorageStats(ctx context.Context, in *QueryStorageStatsRequest, opts ...grpc.CallOption) (*QueryStorageStatsResponse, error) + StorageStats(ctx context.Context, in *QueryStorageStats, opts ...grpc.CallOption) (*QueryStorageStatsResponse, error) } type queryClient struct { @@ -2441,7 +2439,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { +func (c *queryClient) Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Params", in, out, opts...) if err != nil { @@ -2450,7 +2448,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) { +func (c *queryClient) File(ctx context.Context, in *QueryFile, opts ...grpc.CallOption) (*QueryFileResponse, error) { out := new(QueryFileResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/File", in, out, opts...) if err != nil { @@ -2459,7 +2457,7 @@ func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...gr return out, nil } -func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { +func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { out := new(QueryAllFilesResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllFiles", in, out, opts...) if err != nil { @@ -2468,7 +2466,7 @@ func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, op return out, nil } -func (c *queryClient) OpenFiles(ctx context.Context, in *QueryOpenFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { +func (c *queryClient) OpenFiles(ctx context.Context, in *QueryOpenFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { out := new(QueryAllFilesResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/OpenFiles", in, out, opts...) if err != nil { @@ -2477,7 +2475,7 @@ func (c *queryClient) OpenFiles(ctx context.Context, in *QueryOpenFilesRequest, return out, nil } -func (c *queryClient) Proof(ctx context.Context, in *QueryProofRequest, opts ...grpc.CallOption) (*QueryProofResponse, error) { +func (c *queryClient) Proof(ctx context.Context, in *QueryProof, opts ...grpc.CallOption) (*QueryProofResponse, error) { out := new(QueryProofResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Proof", in, out, opts...) if err != nil { @@ -2486,7 +2484,7 @@ func (c *queryClient) Proof(ctx context.Context, in *QueryProofRequest, opts ... return out, nil } -func (c *queryClient) Provider(ctx context.Context, in *QueryProviderRequest, opts ...grpc.CallOption) (*QueryProviderResponse, error) { +func (c *queryClient) Provider(ctx context.Context, in *QueryProvider, opts ...grpc.CallOption) (*QueryProviderResponse, error) { out := new(QueryProviderResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Provider", in, out, opts...) if err != nil { @@ -2495,7 +2493,7 @@ func (c *queryClient) Provider(ctx context.Context, in *QueryProviderRequest, op return out, nil } -func (c *queryClient) AllProviders(ctx context.Context, in *QueryAllProvidersRequest, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) { +func (c *queryClient) AllProviders(ctx context.Context, in *QueryAllProviders, opts ...grpc.CallOption) (*QueryAllProvidersResponse, error) { out := new(QueryAllProvidersResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllProviders", in, out, opts...) if err != nil { @@ -2504,7 +2502,7 @@ func (c *queryClient) AllProviders(ctx context.Context, in *QueryAllProvidersReq return out, nil } -func (c *queryClient) Attestation(ctx context.Context, in *QueryAttestationRequest, opts ...grpc.CallOption) (*QueryAttestationResponse, error) { +func (c *queryClient) Attestation(ctx context.Context, in *QueryAttestation, opts ...grpc.CallOption) (*QueryAttestationResponse, error) { out := new(QueryAttestationResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Attestation", in, out, opts...) if err != nil { @@ -2513,7 +2511,7 @@ func (c *queryClient) Attestation(ctx context.Context, in *QueryAttestationReque return out, nil } -func (c *queryClient) AllAttestations(ctx context.Context, in *QueryAllAttestationsRequest, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) { +func (c *queryClient) AllAttestations(ctx context.Context, in *QueryAllAttestations, opts ...grpc.CallOption) (*QueryAllAttestationsResponse, error) { out := new(QueryAllAttestationsResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllAttestations", in, out, opts...) if err != nil { @@ -2522,7 +2520,7 @@ func (c *queryClient) AllAttestations(ctx context.Context, in *QueryAllAttestati return out, nil } -func (c *queryClient) Report(ctx context.Context, in *QueryReportRequest, opts ...grpc.CallOption) (*QueryReportResponse, error) { +func (c *queryClient) Report(ctx context.Context, in *QueryReport, opts ...grpc.CallOption) (*QueryReportResponse, error) { out := new(QueryReportResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Report", in, out, opts...) if err != nil { @@ -2531,7 +2529,7 @@ func (c *queryClient) Report(ctx context.Context, in *QueryReportRequest, opts . return out, nil } -func (c *queryClient) AllReports(ctx context.Context, in *QueryAllReportsRequest, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) { +func (c *queryClient) AllReports(ctx context.Context, in *QueryAllReports, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) { out := new(QueryAllReportsResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllReports", in, out, opts...) if err != nil { @@ -2540,7 +2538,7 @@ func (c *queryClient) AllReports(ctx context.Context, in *QueryAllReportsRequest return out, nil } -func (c *queryClient) FreeSpace(ctx context.Context, in *QueryFreeSpaceRequest, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) { +func (c *queryClient) FreeSpace(ctx context.Context, in *QueryFreeSpace, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) { out := new(QueryFreeSpaceResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/FreeSpace", in, out, opts...) if err != nil { @@ -2549,7 +2547,7 @@ func (c *queryClient) FreeSpace(ctx context.Context, in *QueryFreeSpaceRequest, return out, nil } -func (c *queryClient) StoreCount(ctx context.Context, in *QueryStoreCountRequest, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) { +func (c *queryClient) StoreCount(ctx context.Context, in *QueryStoreCount, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) { out := new(QueryStoreCountResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/StoreCount", in, out, opts...) if err != nil { @@ -2558,7 +2556,7 @@ func (c *queryClient) StoreCount(ctx context.Context, in *QueryStoreCountRequest return out, nil } -func (c *queryClient) FindFile(ctx context.Context, in *QueryFindFileRequest, opts ...grpc.CallOption) (*QueryFindFileResponse, error) { +func (c *queryClient) FindFile(ctx context.Context, in *QueryFindFile, opts ...grpc.CallOption) (*QueryFindFileResponse, error) { out := new(QueryFindFileResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/FindFile", in, out, opts...) if err != nil { @@ -2567,7 +2565,7 @@ func (c *queryClient) FindFile(ctx context.Context, in *QueryFindFileRequest, op return out, nil } -func (c *queryClient) GetClientFreeSpace(ctx context.Context, in *QueryClientFreeSpaceRequest, opts ...grpc.CallOption) (*QueryClientFreeSpaceResponse, error) { +func (c *queryClient) GetClientFreeSpace(ctx context.Context, in *QueryClientFreeSpace, opts ...grpc.CallOption) (*QueryClientFreeSpaceResponse, error) { out := new(QueryClientFreeSpaceResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/GetClientFreeSpace", in, out, opts...) if err != nil { @@ -2576,7 +2574,7 @@ func (c *queryClient) GetClientFreeSpace(ctx context.Context, in *QueryClientFre return out, nil } -func (c *queryClient) GetPayData(ctx context.Context, in *QueryPayDataRequest, opts ...grpc.CallOption) (*QueryPayDataResponse, error) { +func (c *queryClient) GetPayData(ctx context.Context, in *QueryPayData, opts ...grpc.CallOption) (*QueryPayDataResponse, error) { out := new(QueryPayDataResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/GetPayData", in, out, opts...) if err != nil { @@ -2585,7 +2583,7 @@ func (c *queryClient) GetPayData(ctx context.Context, in *QueryPayDataRequest, o return out, nil } -func (c *queryClient) StoragePaymentInfo(ctx context.Context, in *QueryStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryStoragePaymentInfoResponse, error) { +func (c *queryClient) StoragePaymentInfo(ctx context.Context, in *QueryStoragePaymentInfo, opts ...grpc.CallOption) (*QueryStoragePaymentInfoResponse, error) { out := new(QueryStoragePaymentInfoResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/StoragePaymentInfo", in, out, opts...) if err != nil { @@ -2594,7 +2592,7 @@ func (c *queryClient) StoragePaymentInfo(ctx context.Context, in *QueryStoragePa return out, nil } -func (c *queryClient) AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfoRequest, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) { +func (c *queryClient) AllStoragePaymentInfo(ctx context.Context, in *QueryAllStoragePaymentInfo, opts ...grpc.CallOption) (*QueryAllStoragePaymentInfoResponse, error) { out := new(QueryAllStoragePaymentInfoResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllStoragePaymentInfo", in, out, opts...) if err != nil { @@ -2603,7 +2601,7 @@ func (c *queryClient) AllStoragePaymentInfo(ctx context.Context, in *QueryAllSto return out, nil } -func (c *queryClient) FileUploadCheck(ctx context.Context, in *QueryFileUploadCheckRequest, opts ...grpc.CallOption) (*QueryFileUploadCheckResponse, error) { +func (c *queryClient) FileUploadCheck(ctx context.Context, in *QueryFileUploadCheck, opts ...grpc.CallOption) (*QueryFileUploadCheckResponse, error) { out := new(QueryFileUploadCheckResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/FileUploadCheck", in, out, opts...) if err != nil { @@ -2612,7 +2610,7 @@ func (c *queryClient) FileUploadCheck(ctx context.Context, in *QueryFileUploadCh return out, nil } -func (c *queryClient) PriceCheck(ctx context.Context, in *QueryPriceCheckRequest, opts ...grpc.CallOption) (*QueryPriceCheckResponse, error) { +func (c *queryClient) PriceCheck(ctx context.Context, in *QueryPriceCheck, opts ...grpc.CallOption) (*QueryPriceCheckResponse, error) { out := new(QueryPriceCheckResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/PriceCheck", in, out, opts...) if err != nil { @@ -2621,7 +2619,7 @@ func (c *queryClient) PriceCheck(ctx context.Context, in *QueryPriceCheckRequest return out, nil } -func (c *queryClient) ActiveProviders(ctx context.Context, in *QueryActiveProvidersRequest, opts ...grpc.CallOption) (*QueryActiveProvidersResponse, error) { +func (c *queryClient) ActiveProviders(ctx context.Context, in *QueryActiveProviders, opts ...grpc.CallOption) (*QueryActiveProvidersResponse, error) { out := new(QueryActiveProvidersResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/ActiveProviders", in, out, opts...) if err != nil { @@ -2630,7 +2628,7 @@ func (c *queryClient) ActiveProviders(ctx context.Context, in *QueryActiveProvid return out, nil } -func (c *queryClient) StorageStats(ctx context.Context, in *QueryStorageStatsRequest, opts ...grpc.CallOption) (*QueryStorageStatsResponse, error) { +func (c *queryClient) StorageStats(ctx context.Context, in *QueryStorageStats, opts ...grpc.CallOption) (*QueryStorageStatsResponse, error) { out := new(QueryStorageStatsResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/StorageStats", in, out, opts...) if err != nil { @@ -2642,119 +2640,119 @@ func (c *queryClient) StorageStats(ctx context.Context, in *QueryStorageStatsReq // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + Params(context.Context, *QueryParams) (*QueryParamsResponse, error) // Queries a File by index. - File(context.Context, *QueryFileRequest) (*QueryFileResponse, error) + File(context.Context, *QueryFile) (*QueryFileResponse, error) // Queries a list of File items. - AllFiles(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) + AllFiles(context.Context, *QueryAllFiles) (*QueryAllFilesResponse, error) // Queries a list of File items. - OpenFiles(context.Context, *QueryOpenFilesRequest) (*QueryAllFilesResponse, error) + OpenFiles(context.Context, *QueryOpenFiles) (*QueryAllFilesResponse, error) // Queries a list of File items. - Proof(context.Context, *QueryProofRequest) (*QueryProofResponse, error) + Proof(context.Context, *QueryProof) (*QueryProofResponse, error) // Queries a Providers by index. - Provider(context.Context, *QueryProviderRequest) (*QueryProviderResponse, error) + Provider(context.Context, *QueryProvider) (*QueryProviderResponse, error) // Queries a list of Providers items. - AllProviders(context.Context, *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) + AllProviders(context.Context, *QueryAllProviders) (*QueryAllProvidersResponse, error) // Queries a Attestation by index. - Attestation(context.Context, *QueryAttestationRequest) (*QueryAttestationResponse, error) + Attestation(context.Context, *QueryAttestation) (*QueryAttestationResponse, error) // Queries a list of Attestation items. - AllAttestations(context.Context, *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) + AllAttestations(context.Context, *QueryAllAttestations) (*QueryAllAttestationsResponse, error) // Queries a Report by index. - Report(context.Context, *QueryReportRequest) (*QueryReportResponse, error) + Report(context.Context, *QueryReport) (*QueryReportResponse, error) // Queries a list of Attestation items. - AllReports(context.Context, *QueryAllReportsRequest) (*QueryAllReportsResponse, error) - // Queries a list of Freespace items. - FreeSpace(context.Context, *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) - // Queries a list of Freespace items. - StoreCount(context.Context, *QueryStoreCountRequest) (*QueryStoreCountResponse, error) + AllReports(context.Context, *QueryAllReports) (*QueryAllReportsResponse, error) + // Queries a list of FreeSpace items. + FreeSpace(context.Context, *QueryFreeSpace) (*QueryFreeSpaceResponse, error) + // Queries a list of FreeSpace items. + StoreCount(context.Context, *QueryStoreCount) (*QueryStoreCountResponse, error) // Queries a list of FindFile items. - FindFile(context.Context, *QueryFindFileRequest) (*QueryFindFileResponse, error) + FindFile(context.Context, *QueryFindFile) (*QueryFindFileResponse, error) // Queries a list of GetClientFreeSpace items. - GetClientFreeSpace(context.Context, *QueryClientFreeSpaceRequest) (*QueryClientFreeSpaceResponse, error) + GetClientFreeSpace(context.Context, *QueryClientFreeSpace) (*QueryClientFreeSpaceResponse, error) // Queries a list of GetPayData items. - GetPayData(context.Context, *QueryPayDataRequest) (*QueryPayDataResponse, error) + GetPayData(context.Context, *QueryPayData) (*QueryPayDataResponse, error) // Queries a StoragePaymentInfo by address. - StoragePaymentInfo(context.Context, *QueryStoragePaymentInfoRequest) (*QueryStoragePaymentInfoResponse, error) + StoragePaymentInfo(context.Context, *QueryStoragePaymentInfo) (*QueryStoragePaymentInfoResponse, error) // Queries a list of StoragePaymentInfo items. - AllStoragePaymentInfo(context.Context, *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) + AllStoragePaymentInfo(context.Context, *QueryAllStoragePaymentInfo) (*QueryAllStoragePaymentInfoResponse, error) // Queries whether user can upload a file based on size - FileUploadCheck(context.Context, *QueryFileUploadCheckRequest) (*QueryFileUploadCheckResponse, error) + FileUploadCheck(context.Context, *QueryFileUploadCheck) (*QueryFileUploadCheckResponse, error) // Queries whether user can upload a file based on size - PriceCheck(context.Context, *QueryPriceCheckRequest) (*QueryPriceCheckResponse, error) + PriceCheck(context.Context, *QueryPriceCheck) (*QueryPriceCheckResponse, error) // Queries whether user can upload a file based on size - ActiveProviders(context.Context, *QueryActiveProvidersRequest) (*QueryActiveProvidersResponse, error) + ActiveProviders(context.Context, *QueryActiveProviders) (*QueryActiveProvidersResponse, error) // Queries the storage space used and purchased - StorageStats(context.Context, *QueryStorageStatsRequest) (*QueryStorageStatsResponse, error) + StorageStats(context.Context, *QueryStorageStats) (*QueryStorageStatsResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFileRequest) (*QueryFileResponse, error) { +func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFile) (*QueryFileResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method File not implemented") } -func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { +func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFiles) (*QueryAllFilesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllFiles not implemented") } -func (*UnimplementedQueryServer) OpenFiles(ctx context.Context, req *QueryOpenFilesRequest) (*QueryAllFilesResponse, error) { +func (*UnimplementedQueryServer) OpenFiles(ctx context.Context, req *QueryOpenFiles) (*QueryAllFilesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method OpenFiles not implemented") } -func (*UnimplementedQueryServer) Proof(ctx context.Context, req *QueryProofRequest) (*QueryProofResponse, error) { +func (*UnimplementedQueryServer) Proof(ctx context.Context, req *QueryProof) (*QueryProofResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proof not implemented") } -func (*UnimplementedQueryServer) Provider(ctx context.Context, req *QueryProviderRequest) (*QueryProviderResponse, error) { +func (*UnimplementedQueryServer) Provider(ctx context.Context, req *QueryProvider) (*QueryProviderResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Provider not implemented") } -func (*UnimplementedQueryServer) AllProviders(ctx context.Context, req *QueryAllProvidersRequest) (*QueryAllProvidersResponse, error) { +func (*UnimplementedQueryServer) AllProviders(ctx context.Context, req *QueryAllProviders) (*QueryAllProvidersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllProviders not implemented") } -func (*UnimplementedQueryServer) Attestation(ctx context.Context, req *QueryAttestationRequest) (*QueryAttestationResponse, error) { +func (*UnimplementedQueryServer) Attestation(ctx context.Context, req *QueryAttestation) (*QueryAttestationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Attestation not implemented") } -func (*UnimplementedQueryServer) AllAttestations(ctx context.Context, req *QueryAllAttestationsRequest) (*QueryAllAttestationsResponse, error) { +func (*UnimplementedQueryServer) AllAttestations(ctx context.Context, req *QueryAllAttestations) (*QueryAllAttestationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllAttestations not implemented") } -func (*UnimplementedQueryServer) Report(ctx context.Context, req *QueryReportRequest) (*QueryReportResponse, error) { +func (*UnimplementedQueryServer) Report(ctx context.Context, req *QueryReport) (*QueryReportResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Report not implemented") } -func (*UnimplementedQueryServer) AllReports(ctx context.Context, req *QueryAllReportsRequest) (*QueryAllReportsResponse, error) { +func (*UnimplementedQueryServer) AllReports(ctx context.Context, req *QueryAllReports) (*QueryAllReportsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllReports not implemented") } -func (*UnimplementedQueryServer) FreeSpace(ctx context.Context, req *QueryFreeSpaceRequest) (*QueryFreeSpaceResponse, error) { +func (*UnimplementedQueryServer) FreeSpace(ctx context.Context, req *QueryFreeSpace) (*QueryFreeSpaceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FreeSpace not implemented") } -func (*UnimplementedQueryServer) StoreCount(ctx context.Context, req *QueryStoreCountRequest) (*QueryStoreCountResponse, error) { +func (*UnimplementedQueryServer) StoreCount(ctx context.Context, req *QueryStoreCount) (*QueryStoreCountResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StoreCount not implemented") } -func (*UnimplementedQueryServer) FindFile(ctx context.Context, req *QueryFindFileRequest) (*QueryFindFileResponse, error) { +func (*UnimplementedQueryServer) FindFile(ctx context.Context, req *QueryFindFile) (*QueryFindFileResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FindFile not implemented") } -func (*UnimplementedQueryServer) GetClientFreeSpace(ctx context.Context, req *QueryClientFreeSpaceRequest) (*QueryClientFreeSpaceResponse, error) { +func (*UnimplementedQueryServer) GetClientFreeSpace(ctx context.Context, req *QueryClientFreeSpace) (*QueryClientFreeSpaceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetClientFreeSpace not implemented") } -func (*UnimplementedQueryServer) GetPayData(ctx context.Context, req *QueryPayDataRequest) (*QueryPayDataResponse, error) { +func (*UnimplementedQueryServer) GetPayData(ctx context.Context, req *QueryPayData) (*QueryPayDataResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPayData not implemented") } -func (*UnimplementedQueryServer) StoragePaymentInfo(ctx context.Context, req *QueryStoragePaymentInfoRequest) (*QueryStoragePaymentInfoResponse, error) { +func (*UnimplementedQueryServer) StoragePaymentInfo(ctx context.Context, req *QueryStoragePaymentInfo) (*QueryStoragePaymentInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StoragePaymentInfo not implemented") } -func (*UnimplementedQueryServer) AllStoragePaymentInfo(ctx context.Context, req *QueryAllStoragePaymentInfoRequest) (*QueryAllStoragePaymentInfoResponse, error) { +func (*UnimplementedQueryServer) AllStoragePaymentInfo(ctx context.Context, req *QueryAllStoragePaymentInfo) (*QueryAllStoragePaymentInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllStoragePaymentInfo not implemented") } -func (*UnimplementedQueryServer) FileUploadCheck(ctx context.Context, req *QueryFileUploadCheckRequest) (*QueryFileUploadCheckResponse, error) { +func (*UnimplementedQueryServer) FileUploadCheck(ctx context.Context, req *QueryFileUploadCheck) (*QueryFileUploadCheckResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FileUploadCheck not implemented") } -func (*UnimplementedQueryServer) PriceCheck(ctx context.Context, req *QueryPriceCheckRequest) (*QueryPriceCheckResponse, error) { +func (*UnimplementedQueryServer) PriceCheck(ctx context.Context, req *QueryPriceCheck) (*QueryPriceCheckResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PriceCheck not implemented") } -func (*UnimplementedQueryServer) ActiveProviders(ctx context.Context, req *QueryActiveProvidersRequest) (*QueryActiveProvidersResponse, error) { +func (*UnimplementedQueryServer) ActiveProviders(ctx context.Context, req *QueryActiveProviders) (*QueryActiveProvidersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ActiveProviders not implemented") } -func (*UnimplementedQueryServer) StorageStats(ctx context.Context, req *QueryStorageStatsRequest) (*QueryStorageStatsResponse, error) { +func (*UnimplementedQueryServer) StorageStats(ctx context.Context, req *QueryStorageStats) (*QueryStorageStatsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StorageStats not implemented") } @@ -2763,7 +2761,7 @@ func RegisterQueryServer(s grpc1.Server, srv QueryServer) { } func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) + in := new(QueryParams) if err := dec(in); err != nil { return nil, err } @@ -2775,13 +2773,13 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.storage.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParams)) } return interceptor(ctx, in, info, handler) } func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFileRequest) + in := new(QueryFile) if err := dec(in); err != nil { return nil, err } @@ -2793,13 +2791,13 @@ func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interfac FullMethod: "/canine_chain.storage.Query/File", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).File(ctx, req.(*QueryFileRequest)) + return srv.(QueryServer).File(ctx, req.(*QueryFile)) } return interceptor(ctx, in, info, handler) } func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllFilesRequest) + in := new(QueryAllFiles) if err := dec(in); err != nil { return nil, err } @@ -2811,13 +2809,13 @@ func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.storage.Query/AllFiles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFilesRequest)) + return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFiles)) } return interceptor(ctx, in, info, handler) } func _Query_OpenFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryOpenFilesRequest) + in := new(QueryOpenFiles) if err := dec(in); err != nil { return nil, err } @@ -2829,13 +2827,13 @@ func _Query_OpenFiles_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/canine_chain.storage.Query/OpenFiles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).OpenFiles(ctx, req.(*QueryOpenFilesRequest)) + return srv.(QueryServer).OpenFiles(ctx, req.(*QueryOpenFiles)) } return interceptor(ctx, in, info, handler) } func _Query_Proof_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryProofRequest) + in := new(QueryProof) if err := dec(in); err != nil { return nil, err } @@ -2847,13 +2845,13 @@ func _Query_Proof_Handler(srv interface{}, ctx context.Context, dec func(interfa FullMethod: "/canine_chain.storage.Query/Proof", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Proof(ctx, req.(*QueryProofRequest)) + return srv.(QueryServer).Proof(ctx, req.(*QueryProof)) } return interceptor(ctx, in, info, handler) } func _Query_Provider_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryProviderRequest) + in := new(QueryProvider) if err := dec(in); err != nil { return nil, err } @@ -2865,13 +2863,13 @@ func _Query_Provider_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.storage.Query/Provider", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Provider(ctx, req.(*QueryProviderRequest)) + return srv.(QueryServer).Provider(ctx, req.(*QueryProvider)) } return interceptor(ctx, in, info, handler) } func _Query_AllProviders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllProvidersRequest) + in := new(QueryAllProviders) if err := dec(in); err != nil { return nil, err } @@ -2883,13 +2881,13 @@ func _Query_AllProviders_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: "/canine_chain.storage.Query/AllProviders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllProviders(ctx, req.(*QueryAllProvidersRequest)) + return srv.(QueryServer).AllProviders(ctx, req.(*QueryAllProviders)) } return interceptor(ctx, in, info, handler) } func _Query_Attestation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAttestationRequest) + in := new(QueryAttestation) if err := dec(in); err != nil { return nil, err } @@ -2901,13 +2899,13 @@ func _Query_Attestation_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: "/canine_chain.storage.Query/Attestation", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Attestation(ctx, req.(*QueryAttestationRequest)) + return srv.(QueryServer).Attestation(ctx, req.(*QueryAttestation)) } return interceptor(ctx, in, info, handler) } func _Query_AllAttestations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllAttestationsRequest) + in := new(QueryAllAttestations) if err := dec(in); err != nil { return nil, err } @@ -2919,13 +2917,13 @@ func _Query_AllAttestations_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/canine_chain.storage.Query/AllAttestations", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllAttestations(ctx, req.(*QueryAllAttestationsRequest)) + return srv.(QueryServer).AllAttestations(ctx, req.(*QueryAllAttestations)) } return interceptor(ctx, in, info, handler) } func _Query_Report_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryReportRequest) + in := new(QueryReport) if err := dec(in); err != nil { return nil, err } @@ -2937,13 +2935,13 @@ func _Query_Report_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.storage.Query/Report", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Report(ctx, req.(*QueryReportRequest)) + return srv.(QueryServer).Report(ctx, req.(*QueryReport)) } return interceptor(ctx, in, info, handler) } func _Query_AllReports_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllReportsRequest) + in := new(QueryAllReports) if err := dec(in); err != nil { return nil, err } @@ -2955,13 +2953,13 @@ func _Query_AllReports_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.storage.Query/AllReports", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllReports(ctx, req.(*QueryAllReportsRequest)) + return srv.(QueryServer).AllReports(ctx, req.(*QueryAllReports)) } return interceptor(ctx, in, info, handler) } func _Query_FreeSpace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFreeSpaceRequest) + in := new(QueryFreeSpace) if err := dec(in); err != nil { return nil, err } @@ -2973,13 +2971,13 @@ func _Query_FreeSpace_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/canine_chain.storage.Query/FreeSpace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).FreeSpace(ctx, req.(*QueryFreeSpaceRequest)) + return srv.(QueryServer).FreeSpace(ctx, req.(*QueryFreeSpace)) } return interceptor(ctx, in, info, handler) } func _Query_StoreCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryStoreCountRequest) + in := new(QueryStoreCount) if err := dec(in); err != nil { return nil, err } @@ -2991,13 +2989,13 @@ func _Query_StoreCount_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.storage.Query/StoreCount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).StoreCount(ctx, req.(*QueryStoreCountRequest)) + return srv.(QueryServer).StoreCount(ctx, req.(*QueryStoreCount)) } return interceptor(ctx, in, info, handler) } func _Query_FindFile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFindFileRequest) + in := new(QueryFindFile) if err := dec(in); err != nil { return nil, err } @@ -3009,13 +3007,13 @@ func _Query_FindFile_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.storage.Query/FindFile", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).FindFile(ctx, req.(*QueryFindFileRequest)) + return srv.(QueryServer).FindFile(ctx, req.(*QueryFindFile)) } return interceptor(ctx, in, info, handler) } func _Query_GetClientFreeSpace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryClientFreeSpaceRequest) + in := new(QueryClientFreeSpace) if err := dec(in); err != nil { return nil, err } @@ -3027,13 +3025,13 @@ func _Query_GetClientFreeSpace_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/canine_chain.storage.Query/GetClientFreeSpace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetClientFreeSpace(ctx, req.(*QueryClientFreeSpaceRequest)) + return srv.(QueryServer).GetClientFreeSpace(ctx, req.(*QueryClientFreeSpace)) } return interceptor(ctx, in, info, handler) } func _Query_GetPayData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPayDataRequest) + in := new(QueryPayData) if err := dec(in); err != nil { return nil, err } @@ -3045,13 +3043,13 @@ func _Query_GetPayData_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.storage.Query/GetPayData", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).GetPayData(ctx, req.(*QueryPayDataRequest)) + return srv.(QueryServer).GetPayData(ctx, req.(*QueryPayData)) } return interceptor(ctx, in, info, handler) } func _Query_StoragePaymentInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryStoragePaymentInfoRequest) + in := new(QueryStoragePaymentInfo) if err := dec(in); err != nil { return nil, err } @@ -3063,13 +3061,13 @@ func _Query_StoragePaymentInfo_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/canine_chain.storage.Query/StoragePaymentInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).StoragePaymentInfo(ctx, req.(*QueryStoragePaymentInfoRequest)) + return srv.(QueryServer).StoragePaymentInfo(ctx, req.(*QueryStoragePaymentInfo)) } return interceptor(ctx, in, info, handler) } func _Query_AllStoragePaymentInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllStoragePaymentInfoRequest) + in := new(QueryAllStoragePaymentInfo) if err := dec(in); err != nil { return nil, err } @@ -3081,13 +3079,13 @@ func _Query_AllStoragePaymentInfo_Handler(srv interface{}, ctx context.Context, FullMethod: "/canine_chain.storage.Query/AllStoragePaymentInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllStoragePaymentInfo(ctx, req.(*QueryAllStoragePaymentInfoRequest)) + return srv.(QueryServer).AllStoragePaymentInfo(ctx, req.(*QueryAllStoragePaymentInfo)) } return interceptor(ctx, in, info, handler) } func _Query_FileUploadCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFileUploadCheckRequest) + in := new(QueryFileUploadCheck) if err := dec(in); err != nil { return nil, err } @@ -3099,13 +3097,13 @@ func _Query_FileUploadCheck_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/canine_chain.storage.Query/FileUploadCheck", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).FileUploadCheck(ctx, req.(*QueryFileUploadCheckRequest)) + return srv.(QueryServer).FileUploadCheck(ctx, req.(*QueryFileUploadCheck)) } return interceptor(ctx, in, info, handler) } func _Query_PriceCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPriceCheckRequest) + in := new(QueryPriceCheck) if err := dec(in); err != nil { return nil, err } @@ -3117,13 +3115,13 @@ func _Query_PriceCheck_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.storage.Query/PriceCheck", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PriceCheck(ctx, req.(*QueryPriceCheckRequest)) + return srv.(QueryServer).PriceCheck(ctx, req.(*QueryPriceCheck)) } return interceptor(ctx, in, info, handler) } func _Query_ActiveProviders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryActiveProvidersRequest) + in := new(QueryActiveProviders) if err := dec(in); err != nil { return nil, err } @@ -3135,13 +3133,13 @@ func _Query_ActiveProviders_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/canine_chain.storage.Query/ActiveProviders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ActiveProviders(ctx, req.(*QueryActiveProvidersRequest)) + return srv.(QueryServer).ActiveProviders(ctx, req.(*QueryActiveProviders)) } return interceptor(ctx, in, info, handler) } func _Query_StorageStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryStorageStatsRequest) + in := new(QueryStorageStats) if err := dec(in); err != nil { return nil, err } @@ -3153,7 +3151,7 @@ func _Query_StorageStats_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: "/canine_chain.storage.Query/StorageStats", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).StorageStats(ctx, req.(*QueryStorageStatsRequest)) + return srv.(QueryServer).StorageStats(ctx, req.(*QueryStorageStats)) } return interceptor(ctx, in, info, handler) } @@ -3255,7 +3253,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Metadata: "canine_chain/storage/query.proto", } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3265,12 +3263,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3311,7 +3309,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryProofRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryProof) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3321,12 +3319,12 @@ func (m *QueryProofRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryProofRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryProof) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryProofRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3393,7 +3391,7 @@ func (m *QueryProofResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryProofsByAddressRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryProofsByAddress) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3403,12 +3401,12 @@ func (m *QueryProofsByAddressRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryProofsByAddressRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryProofsByAddress) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryProofsByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryProofsByAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3484,7 +3482,7 @@ func (m *QueryProofsByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryFileRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFile) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3494,12 +3492,12 @@ func (m *QueryFileRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFileRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFile) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFile) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3559,7 +3557,7 @@ func (m *QueryFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllFilesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllFiles) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3569,12 +3567,12 @@ func (m *QueryAllFilesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllFilesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllFiles) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllFilesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllFiles) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3594,7 +3592,7 @@ func (m *QueryAllFilesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryOpenFilesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryOpenFiles) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3604,12 +3602,12 @@ func (m *QueryOpenFilesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryOpenFilesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOpenFiles) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryOpenFilesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOpenFiles) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3685,7 +3683,7 @@ func (m *QueryAllFilesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryProviderRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryProvider) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3695,12 +3693,12 @@ func (m *QueryProviderRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryProviderRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryProvider) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryProviderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryProvider) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3748,7 +3746,7 @@ func (m *QueryProviderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllProvidersRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllProviders) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3758,12 +3756,12 @@ func (m *QueryAllProvidersRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllProvidersRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllProviders) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllProvidersRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllProviders) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3832,7 +3830,7 @@ func (m *QueryAllProvidersResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } -func (m *QueryAttestationRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAttestation) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3842,12 +3840,12 @@ func (m *QueryAttestationRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAttestationRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAttestation) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAttestationRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAttestation) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3914,7 +3912,7 @@ func (m *QueryAttestationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryAllAttestationsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllAttestations) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3924,12 +3922,12 @@ func (m *QueryAllAttestationsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllAttestationsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllAttestations) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllAttestationsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllAttestations) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3998,7 +3996,7 @@ func (m *QueryAllAttestationsResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryReportRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryReport) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4008,12 +4006,12 @@ func (m *QueryReportRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryReportRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryReport) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryReportRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryReport) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4080,7 +4078,7 @@ func (m *QueryReportResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllReportsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllReports) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4090,12 +4088,12 @@ func (m *QueryAllReportsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllReportsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllReports) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllReportsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllReports) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4164,7 +4162,7 @@ func (m *QueryAllReportsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryFreeSpaceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFreeSpace) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4174,12 +4172,12 @@ func (m *QueryFreeSpaceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFreeSpaceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFreeSpace) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFreeSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFreeSpace) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4194,7 +4192,7 @@ func (m *QueryFreeSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryStoreCountRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryStoreCount) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4204,12 +4202,12 @@ func (m *QueryStoreCountRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryStoreCountRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryStoreCount) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryStoreCountRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryStoreCount) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4284,7 +4282,7 @@ func (m *QueryStoreCountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryFindFileRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFindFile) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4294,12 +4292,12 @@ func (m *QueryFindFileRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFindFileRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFindFile) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFindFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFindFile) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4344,7 +4342,7 @@ func (m *QueryFindFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryClientFreeSpaceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryClientFreeSpace) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4354,12 +4352,12 @@ func (m *QueryClientFreeSpaceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryClientFreeSpaceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryClientFreeSpace) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryClientFreeSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryClientFreeSpace) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4402,7 +4400,7 @@ func (m *QueryClientFreeSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryPayDataRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPayData) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4412,12 +4410,12 @@ func (m *QueryPayDataRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPayDataRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPayData) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPayDataRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPayData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4465,7 +4463,7 @@ func (m *QueryPayDataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryStoragePaymentInfoRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryStoragePaymentInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4475,12 +4473,12 @@ func (m *QueryStoragePaymentInfoRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryStoragePaymentInfoRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryStoragePaymentInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryStoragePaymentInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryStoragePaymentInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4528,7 +4526,7 @@ func (m *QueryStoragePaymentInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int return len(dAtA) - i, nil } -func (m *QueryAllStoragePaymentInfoRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllStoragePaymentInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4538,12 +4536,12 @@ func (m *QueryAllStoragePaymentInfoRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllStoragePaymentInfoRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllStoragePaymentInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllStoragePaymentInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllStoragePaymentInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4612,7 +4610,7 @@ func (m *QueryAllStoragePaymentInfoResponse) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } -func (m *QueryFileUploadCheckRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFileUploadCheck) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4622,12 +4620,12 @@ func (m *QueryFileUploadCheckRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFileUploadCheckRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFileUploadCheck) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFileUploadCheckRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFileUploadCheck) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4680,7 +4678,7 @@ func (m *QueryFileUploadCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryPriceCheckRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPriceCheck) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4690,12 +4688,12 @@ func (m *QueryPriceCheckRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPriceCheckRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPriceCheck) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPriceCheckRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPriceCheck) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4743,7 +4741,7 @@ func (m *QueryPriceCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryActiveProvidersRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryActiveProviders) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4753,12 +4751,12 @@ func (m *QueryActiveProvidersRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryActiveProvidersRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryActiveProviders) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryActiveProvidersRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryActiveProviders) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4803,7 +4801,7 @@ func (m *QueryActiveProvidersResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryStorageStatsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryStorageStats) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4813,12 +4811,12 @@ func (m *QueryStorageStatsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryStorageStatsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryStorageStats) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryStorageStatsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryStorageStats) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4900,7 +4898,7 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryParams) Size() (n int) { if m == nil { return 0 } @@ -4920,7 +4918,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryProofRequest) Size() (n int) { +func (m *QueryProof) Size() (n int) { if m == nil { return 0 } @@ -4955,7 +4953,7 @@ func (m *QueryProofResponse) Size() (n int) { return n } -func (m *QueryProofsByAddressRequest) Size() (n int) { +func (m *QueryProofsByAddress) Size() (n int) { if m == nil { return 0 } @@ -4991,7 +4989,7 @@ func (m *QueryProofsByAddressResponse) Size() (n int) { return n } -func (m *QueryFileRequest) Size() (n int) { +func (m *QueryFile) Size() (n int) { if m == nil { return 0 } @@ -5022,7 +5020,7 @@ func (m *QueryFileResponse) Size() (n int) { return n } -func (m *QueryAllFilesRequest) Size() (n int) { +func (m *QueryAllFiles) Size() (n int) { if m == nil { return 0 } @@ -5035,7 +5033,7 @@ func (m *QueryAllFilesRequest) Size() (n int) { return n } -func (m *QueryOpenFilesRequest) Size() (n int) { +func (m *QueryOpenFiles) Size() (n int) { if m == nil { return 0 } @@ -5071,7 +5069,7 @@ func (m *QueryAllFilesResponse) Size() (n int) { return n } -func (m *QueryProviderRequest) Size() (n int) { +func (m *QueryProvider) Size() (n int) { if m == nil { return 0 } @@ -5095,7 +5093,7 @@ func (m *QueryProviderResponse) Size() (n int) { return n } -func (m *QueryAllProvidersRequest) Size() (n int) { +func (m *QueryAllProviders) Size() (n int) { if m == nil { return 0 } @@ -5127,7 +5125,7 @@ func (m *QueryAllProvidersResponse) Size() (n int) { return n } -func (m *QueryAttestationRequest) Size() (n int) { +func (m *QueryAttestation) Size() (n int) { if m == nil { return 0 } @@ -5162,7 +5160,7 @@ func (m *QueryAttestationResponse) Size() (n int) { return n } -func (m *QueryAllAttestationsRequest) Size() (n int) { +func (m *QueryAllAttestations) Size() (n int) { if m == nil { return 0 } @@ -5194,7 +5192,7 @@ func (m *QueryAllAttestationsResponse) Size() (n int) { return n } -func (m *QueryReportRequest) Size() (n int) { +func (m *QueryReport) Size() (n int) { if m == nil { return 0 } @@ -5229,7 +5227,7 @@ func (m *QueryReportResponse) Size() (n int) { return n } -func (m *QueryAllReportsRequest) Size() (n int) { +func (m *QueryAllReports) Size() (n int) { if m == nil { return 0 } @@ -5261,7 +5259,7 @@ func (m *QueryAllReportsResponse) Size() (n int) { return n } -func (m *QueryFreeSpaceRequest) Size() (n int) { +func (m *QueryFreeSpace) Size() (n int) { if m == nil { return 0 } @@ -5274,7 +5272,7 @@ func (m *QueryFreeSpaceRequest) Size() (n int) { return n } -func (m *QueryStoreCountRequest) Size() (n int) { +func (m *QueryStoreCount) Size() (n int) { if m == nil { return 0 } @@ -5313,7 +5311,7 @@ func (m *QueryStoreCountResponse) Size() (n int) { return n } -func (m *QueryFindFileRequest) Size() (n int) { +func (m *QueryFindFile) Size() (n int) { if m == nil { return 0 } @@ -5339,7 +5337,7 @@ func (m *QueryFindFileResponse) Size() (n int) { return n } -func (m *QueryClientFreeSpaceRequest) Size() (n int) { +func (m *QueryClientFreeSpace) Size() (n int) { if m == nil { return 0 } @@ -5364,7 +5362,7 @@ func (m *QueryClientFreeSpaceResponse) Size() (n int) { return n } -func (m *QueryPayDataRequest) Size() (n int) { +func (m *QueryPayData) Size() (n int) { if m == nil { return 0 } @@ -5392,7 +5390,7 @@ func (m *QueryPayDataResponse) Size() (n int) { return n } -func (m *QueryStoragePaymentInfoRequest) Size() (n int) { +func (m *QueryStoragePaymentInfo) Size() (n int) { if m == nil { return 0 } @@ -5416,7 +5414,7 @@ func (m *QueryStoragePaymentInfoResponse) Size() (n int) { return n } -func (m *QueryAllStoragePaymentInfoRequest) Size() (n int) { +func (m *QueryAllStoragePaymentInfo) Size() (n int) { if m == nil { return 0 } @@ -5448,7 +5446,7 @@ func (m *QueryAllStoragePaymentInfoResponse) Size() (n int) { return n } -func (m *QueryFileUploadCheckRequest) Size() (n int) { +func (m *QueryFileUploadCheck) Size() (n int) { if m == nil { return 0 } @@ -5476,7 +5474,7 @@ func (m *QueryFileUploadCheckResponse) Size() (n int) { return n } -func (m *QueryPriceCheckRequest) Size() (n int) { +func (m *QueryPriceCheck) Size() (n int) { if m == nil { return 0 } @@ -5504,7 +5502,7 @@ func (m *QueryPriceCheckResponse) Size() (n int) { return n } -func (m *QueryActiveProvidersRequest) Size() (n int) { +func (m *QueryActiveProviders) Size() (n int) { if m == nil { return 0 } @@ -5528,7 +5526,7 @@ func (m *QueryActiveProvidersResponse) Size() (n int) { return n } -func (m *QueryStorageStatsRequest) Size() (n int) { +func (m *QueryStorageStats) Size() (n int) { if m == nil { return 0 } @@ -5571,7 +5569,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5594,10 +5592,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5704,7 +5702,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryProofRequest) Unmarshal(dAtA []byte) error { +func (m *QueryProof) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5727,10 +5725,10 @@ func (m *QueryProofRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryProofRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryProof: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryProofRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryProof: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5954,7 +5952,7 @@ func (m *QueryProofResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryProofsByAddressRequest) Unmarshal(dAtA []byte) error { +func (m *QueryProofsByAddress) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5977,10 +5975,10 @@ func (m *QueryProofsByAddressRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryProofsByAddressRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryProofsByAddress: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryProofsByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryProofsByAddress: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6192,7 +6190,7 @@ func (m *QueryProofsByAddressResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFileRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFile) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6215,10 +6213,10 @@ func (m *QueryFileRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFileRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFile: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFileRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFile: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6410,7 +6408,7 @@ func (m *QueryFileResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllFilesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllFiles) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6433,10 +6431,10 @@ func (m *QueryAllFilesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllFilesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllFiles: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllFilesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllFiles: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6496,7 +6494,7 @@ func (m *QueryAllFilesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryOpenFilesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryOpenFiles) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6519,10 +6517,10 @@ func (m *QueryOpenFilesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryOpenFilesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOpenFiles: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOpenFilesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOpenFiles: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6734,7 +6732,7 @@ func (m *QueryAllFilesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryProviderRequest) Unmarshal(dAtA []byte) error { +func (m *QueryProvider) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6757,10 +6755,10 @@ func (m *QueryProviderRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryProviderRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryProvider: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryProviderRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryProvider: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6899,7 +6897,7 @@ func (m *QueryProviderResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllProvidersRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllProviders) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6922,10 +6920,10 @@ func (m *QueryAllProvidersRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllProvidersRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllProviders: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllProvidersRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllProviders: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7105,7 +7103,7 @@ func (m *QueryAllProvidersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAttestationRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAttestation) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7128,10 +7126,10 @@ func (m *QueryAttestationRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAttestationRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAttestation: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAttestationRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAttestation: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7355,7 +7353,7 @@ func (m *QueryAttestationResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllAttestationsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllAttestations) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7378,10 +7376,10 @@ func (m *QueryAllAttestationsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllAttestationsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllAttestations: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllAttestationsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllAttestations: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7561,7 +7559,7 @@ func (m *QueryAllAttestationsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryReportRequest) Unmarshal(dAtA []byte) error { +func (m *QueryReport) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7584,10 +7582,10 @@ func (m *QueryReportRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryReportRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryReport: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryReportRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryReport: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7811,7 +7809,7 @@ func (m *QueryReportResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllReportsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllReports) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7834,10 +7832,10 @@ func (m *QueryAllReportsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllReportsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllReports: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllReportsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllReports: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8017,7 +8015,7 @@ func (m *QueryAllReportsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFreeSpaceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFreeSpace) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8040,10 +8038,10 @@ func (m *QueryFreeSpaceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFreeSpaceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFreeSpace: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFreeSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFreeSpace: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8099,7 +8097,7 @@ func (m *QueryFreeSpaceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryStoreCountRequest) Unmarshal(dAtA []byte) error { +func (m *QueryStoreCount) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8122,10 +8120,10 @@ func (m *QueryStoreCountRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryStoreCountRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryStoreCount: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryStoreCountRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryStoreCount: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8345,7 +8343,7 @@ func (m *QueryStoreCountResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFindFileRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFindFile) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8368,10 +8366,10 @@ func (m *QueryFindFileRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFindFileRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFindFile: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFindFileRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFindFile: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8511,7 +8509,7 @@ func (m *QueryFindFileResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryClientFreeSpaceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryClientFreeSpace) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8534,10 +8532,10 @@ func (m *QueryClientFreeSpaceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryClientFreeSpaceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryClientFreeSpace: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryClientFreeSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryClientFreeSpace: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8662,7 +8660,7 @@ func (m *QueryClientFreeSpaceResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPayDataRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPayData) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8685,10 +8683,10 @@ func (m *QueryPayDataRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPayDataRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPayData: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPayDataRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPayData: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8832,7 +8830,7 @@ func (m *QueryPayDataResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryStoragePaymentInfoRequest) Unmarshal(dAtA []byte) error { +func (m *QueryStoragePaymentInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8855,10 +8853,10 @@ func (m *QueryStoragePaymentInfoRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryStoragePaymentInfoRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryStoragePaymentInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryStoragePaymentInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryStoragePaymentInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8997,7 +8995,7 @@ func (m *QueryStoragePaymentInfoResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllStoragePaymentInfoRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllStoragePaymentInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9020,10 +9018,10 @@ func (m *QueryAllStoragePaymentInfoRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllStoragePaymentInfoRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllStoragePaymentInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllStoragePaymentInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllStoragePaymentInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -9203,7 +9201,7 @@ func (m *QueryAllStoragePaymentInfoResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFileUploadCheckRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFileUploadCheck) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9226,10 +9224,10 @@ func (m *QueryFileUploadCheckRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFileUploadCheckRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFileUploadCheck: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFileUploadCheckRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFileUploadCheck: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -9374,7 +9372,7 @@ func (m *QueryFileUploadCheckResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPriceCheckRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPriceCheck) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9397,10 +9395,10 @@ func (m *QueryPriceCheckRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPriceCheckRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPriceCheck: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPriceCheckRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPriceCheck: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -9544,7 +9542,7 @@ func (m *QueryPriceCheckResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryActiveProvidersRequest) Unmarshal(dAtA []byte) error { +func (m *QueryActiveProviders) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9567,10 +9565,10 @@ func (m *QueryActiveProvidersRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryActiveProvidersRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryActiveProviders: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryActiveProvidersRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryActiveProviders: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -9678,7 +9676,7 @@ func (m *QueryActiveProvidersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryStorageStatsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryStorageStats) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9701,10 +9699,10 @@ func (m *QueryStorageStatsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryStorageStatsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryStorageStats: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryStorageStatsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryStorageStats: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: diff --git a/x/storage/types/query.pb.gw.go b/x/storage/types/query.pb.gw.go index 31bdcf58a..eaf2bbe48 100644 --- a/x/storage/types/query.pb.gw.go +++ b/x/storage/types/query.pb.gw.go @@ -34,7 +34,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -43,7 +43,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -52,7 +52,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileRequest + var protoReq QueryFile var metadata runtime.ServerMetadata var ( @@ -101,7 +101,7 @@ func request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, clie } func local_request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileRequest + var protoReq QueryFile var metadata runtime.ServerMetadata var ( @@ -154,7 +154,7 @@ var ( ) func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFilesRequest + var protoReq QueryAllFiles var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -170,7 +170,7 @@ func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFilesRequest + var protoReq QueryAllFiles var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -190,7 +190,7 @@ var ( ) func request_Query_OpenFiles_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryOpenFilesRequest + var protoReq QueryOpenFiles var metadata runtime.ServerMetadata var ( @@ -224,7 +224,7 @@ func request_Query_OpenFiles_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_OpenFiles_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryOpenFilesRequest + var protoReq QueryOpenFiles var metadata runtime.ServerMetadata var ( @@ -258,7 +258,7 @@ func local_request_Query_OpenFiles_0(ctx context.Context, marshaler runtime.Mars } func request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryProofRequest + var protoReq QueryProof var metadata runtime.ServerMetadata var ( @@ -318,7 +318,7 @@ func request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshaler, cli } func local_request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryProofRequest + var protoReq QueryProof var metadata runtime.ServerMetadata var ( @@ -378,7 +378,7 @@ func local_request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshale } func request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryProviderRequest + var protoReq QueryProvider var metadata runtime.ServerMetadata var ( @@ -405,7 +405,7 @@ func request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryProviderRequest + var protoReq QueryProvider var metadata runtime.ServerMetadata var ( @@ -436,7 +436,7 @@ var ( ) func request_Query_AllProviders_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllProvidersRequest + var protoReq QueryAllProviders var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -452,7 +452,7 @@ func request_Query_AllProviders_0(ctx context.Context, marshaler runtime.Marshal } func local_request_Query_AllProviders_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllProvidersRequest + var protoReq QueryAllProviders var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -468,7 +468,7 @@ func local_request_Query_AllProviders_0(ctx context.Context, marshaler runtime.M } func request_Query_Attestation_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAttestationRequest + var protoReq QueryAttestation var metadata runtime.ServerMetadata var ( @@ -528,7 +528,7 @@ func request_Query_Attestation_0(ctx context.Context, marshaler runtime.Marshale } func local_request_Query_Attestation_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAttestationRequest + var protoReq QueryAttestation var metadata runtime.ServerMetadata var ( @@ -592,7 +592,7 @@ var ( ) func request_Query_AllAttestations_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllAttestationsRequest + var protoReq QueryAllAttestations var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -608,7 +608,7 @@ func request_Query_AllAttestations_0(ctx context.Context, marshaler runtime.Mars } func local_request_Query_AllAttestations_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllAttestationsRequest + var protoReq QueryAllAttestations var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -624,7 +624,7 @@ func local_request_Query_AllAttestations_0(ctx context.Context, marshaler runtim } func request_Query_Report_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryReportRequest + var protoReq QueryReport var metadata runtime.ServerMetadata var ( @@ -684,7 +684,7 @@ func request_Query_Report_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Report_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryReportRequest + var protoReq QueryReport var metadata runtime.ServerMetadata var ( @@ -748,7 +748,7 @@ var ( ) func request_Query_AllReports_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllReportsRequest + var protoReq QueryAllReports var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -764,7 +764,7 @@ func request_Query_AllReports_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_AllReports_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllReportsRequest + var protoReq QueryAllReports var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -780,7 +780,7 @@ func local_request_Query_AllReports_0(ctx context.Context, marshaler runtime.Mar } func request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFreeSpaceRequest + var protoReq QueryFreeSpace var metadata runtime.ServerMetadata var ( @@ -807,7 +807,7 @@ func request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFreeSpaceRequest + var protoReq QueryFreeSpace var metadata runtime.ServerMetadata var ( @@ -834,7 +834,7 @@ func local_request_Query_FreeSpace_0(ctx context.Context, marshaler runtime.Mars } func request_Query_StoreCount_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStoreCountRequest + var protoReq QueryStoreCount var metadata runtime.ServerMetadata var ( @@ -861,7 +861,7 @@ func request_Query_StoreCount_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_StoreCount_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStoreCountRequest + var protoReq QueryStoreCount var metadata runtime.ServerMetadata var ( @@ -888,7 +888,7 @@ func local_request_Query_StoreCount_0(ctx context.Context, marshaler runtime.Mar } func request_Query_FindFile_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFindFileRequest + var protoReq QueryFindFile var metadata runtime.ServerMetadata var ( @@ -915,7 +915,7 @@ func request_Query_FindFile_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_FindFile_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFindFileRequest + var protoReq QueryFindFile var metadata runtime.ServerMetadata var ( @@ -942,7 +942,7 @@ func local_request_Query_FindFile_0(ctx context.Context, marshaler runtime.Marsh } func request_Query_GetClientFreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryClientFreeSpaceRequest + var protoReq QueryClientFreeSpace var metadata runtime.ServerMetadata var ( @@ -969,7 +969,7 @@ func request_Query_GetClientFreeSpace_0(ctx context.Context, marshaler runtime.M } func local_request_Query_GetClientFreeSpace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryClientFreeSpaceRequest + var protoReq QueryClientFreeSpace var metadata runtime.ServerMetadata var ( @@ -996,7 +996,7 @@ func local_request_Query_GetClientFreeSpace_0(ctx context.Context, marshaler run } func request_Query_GetPayData_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPayDataRequest + var protoReq QueryPayData var metadata runtime.ServerMetadata var ( @@ -1023,7 +1023,7 @@ func request_Query_GetPayData_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_GetPayData_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPayDataRequest + var protoReq QueryPayData var metadata runtime.ServerMetadata var ( @@ -1050,7 +1050,7 @@ func local_request_Query_GetPayData_0(ctx context.Context, marshaler runtime.Mar } func request_Query_StoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStoragePaymentInfoRequest + var protoReq QueryStoragePaymentInfo var metadata runtime.ServerMetadata var ( @@ -1077,7 +1077,7 @@ func request_Query_StoragePaymentInfo_0(ctx context.Context, marshaler runtime.M } func local_request_Query_StoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStoragePaymentInfoRequest + var protoReq QueryStoragePaymentInfo var metadata runtime.ServerMetadata var ( @@ -1108,7 +1108,7 @@ var ( ) func request_Query_AllStoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllStoragePaymentInfoRequest + var protoReq QueryAllStoragePaymentInfo var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -1124,7 +1124,7 @@ func request_Query_AllStoragePaymentInfo_0(ctx context.Context, marshaler runtim } func local_request_Query_AllStoragePaymentInfo_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllStoragePaymentInfoRequest + var protoReq QueryAllStoragePaymentInfo var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -1144,7 +1144,7 @@ var ( ) func request_Query_FileUploadCheck_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileUploadCheckRequest + var protoReq QueryFileUploadCheck var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -1160,7 +1160,7 @@ func request_Query_FileUploadCheck_0(ctx context.Context, marshaler runtime.Mars } func local_request_Query_FileUploadCheck_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileUploadCheckRequest + var protoReq QueryFileUploadCheck var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -1176,7 +1176,7 @@ func local_request_Query_FileUploadCheck_0(ctx context.Context, marshaler runtim } func request_Query_PriceCheck_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPriceCheckRequest + var protoReq QueryPriceCheck var metadata runtime.ServerMetadata var ( @@ -1214,7 +1214,7 @@ func request_Query_PriceCheck_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_PriceCheck_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPriceCheckRequest + var protoReq QueryPriceCheck var metadata runtime.ServerMetadata var ( @@ -1252,7 +1252,7 @@ func local_request_Query_PriceCheck_0(ctx context.Context, marshaler runtime.Mar } func request_Query_ActiveProviders_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryActiveProvidersRequest + var protoReq QueryActiveProviders var metadata runtime.ServerMetadata msg, err := client.ActiveProviders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -1261,7 +1261,7 @@ func request_Query_ActiveProviders_0(ctx context.Context, marshaler runtime.Mars } func local_request_Query_ActiveProviders_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryActiveProvidersRequest + var protoReq QueryActiveProviders var metadata runtime.ServerMetadata msg, err := server.ActiveProviders(ctx, &protoReq) @@ -1270,7 +1270,7 @@ func local_request_Query_ActiveProviders_0(ctx context.Context, marshaler runtim } func request_Query_StorageStats_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStorageStatsRequest + var protoReq QueryStorageStats var metadata runtime.ServerMetadata msg, err := client.StorageStats(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -1279,7 +1279,7 @@ func request_Query_StorageStats_0(ctx context.Context, marshaler runtime.Marshal } func local_request_Query_StorageStats_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryStorageStatsRequest + var protoReq QueryStorageStats var metadata runtime.ServerMetadata msg, err := server.StorageStats(ctx, &protoReq) From c2ce238a47f57244c8324480eb9efd50de2fc61a Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 23:11:53 -0500 Subject: [PATCH 05/14] rns module query refactor --- proto/canine_chain/rns/query.proto | 42 +- x/oracle/client/cli/query_params.go | 2 +- x/rns/client/cli/query_bids.go | 4 +- x/rns/client/cli/query_forsale.go | 4 +- x/rns/client/cli/query_init.go | 4 +- x/rns/client/cli/query_list_owned_names.go | 2 +- x/rns/client/cli/query_names.go | 4 +- x/rns/client/cli/query_params.go | 2 +- x/rns/keeper/bidding_test.go | 6 +- x/rns/keeper/grpc_query_bids.go | 4 +- x/rns/keeper/grpc_query_forsale.go | 4 +- x/rns/keeper/grpc_query_init.go | 4 +- x/rns/keeper/grpc_query_list_owned_names.go | 2 +- x/rns/keeper/grpc_query_names.go | 4 +- x/rns/keeper/grpc_query_params.go | 2 +- x/rns/keeper/keeper_test.go | 12 +- x/rns/keeper/register_test.go | 2 +- x/rns/keeper/transfer_test.go | 2 +- x/rns/simulation/add_record.go | 2 +- x/rns/simulation/cancel_bid.go | 2 +- x/rns/simulation/list.go | 2 +- x/rns/simulation/transfer.go | 2 +- x/rns/types/query.pb.go | 706 ++++++++++---------- x/rns/types/query.pb.gw.go | 40 +- 24 files changed, 429 insertions(+), 431 deletions(-) diff --git a/proto/canine_chain/rns/query.proto b/proto/canine_chain/rns/query.proto index fc2562ddb..e13eed523 100644 --- a/proto/canine_chain/rns/query.proto +++ b/proto/canine_chain/rns/query.proto @@ -16,62 +16,62 @@ option go_package = "github.com/jackalLabs/canine-chain/x/rns/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params(QueryParams) returns (QueryParamsResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/params"; } // Queries a Name by index. - rpc Name(QueryNameRequest) returns (QueryNameResponse) { + rpc Name(QueryName) returns (QueryNameResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/names/{index}"; } // Queries a list of Names. - rpc AllNames(QueryAllNamesRequest) returns (QueryAllNamesResponse) { + rpc AllNames(QueryAllNames) returns (QueryAllNamesResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/names"; } // Queries a Bid by index. - rpc Bid(QueryBidRequest) returns (QueryBidResponse) { + rpc Bid(QueryBid) returns (QueryBidResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/bids/{index}"; } // Queries a list of Bids. - rpc AllBids(QueryAllBidsRequest) returns (QueryAllBidsResponse) { + rpc AllBids(QueryAllBids) returns (QueryAllBidsResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/bids"; } // Queries a Listing by index. - rpc ForSale(QueryForSaleRequest) returns (QueryForSaleResponse) { + rpc ForSale(QueryForSale) returns (QueryForSaleResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/for_sale/{name}"; } // Queries all Listings. - rpc AllForSale(QueryAllForSaleRequest) returns (QueryAllForSaleResponse) { + rpc AllForSale(QueryAllForSale) returns (QueryAllForSaleResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/for_sale"; } // Queries a Init by index. - rpc Init(QueryInitRequest) returns (QueryInitResponse) { + rpc Init(QueryInit) returns (QueryInitResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/init/{address}"; } // Queries a list of Init items. - rpc AllInits(QueryAllInitsRequest) returns (QueryAllInitsResponse) { + rpc AllInits(QueryAllInits) returns (QueryAllInitsResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/init"; } // Queries a list of ListOwnedNames items. - rpc ListOwnedNames(QueryListOwnedNamesRequest) + rpc ListOwnedNames(QueryListOwnedNames) returns (QueryListOwnedNamesResponse) { option (google.api.http).get = "/jackal/canine-chain/rns/list_owned_names/{address}"; } } -// QueryParamsRequest is request type for the Query/Params RPC method. -message QueryParamsRequest {} +// QueryParams is request type for the Query/Params RPC method. +message QueryParams {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { @@ -79,11 +79,11 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryNameRequest { string index = 1; } +message QueryName { string index = 1; } message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllNamesRequest { +message QueryAllNames { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -92,11 +92,11 @@ message QueryAllNamesResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryBidRequest { string index = 1; } +message QueryBid { string index = 1; } message QueryBidResponse { Bids bids = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllBidsRequest { +message QueryAllBids { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -105,13 +105,13 @@ message QueryAllBidsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryForSaleRequest { string name = 1; } +message QueryForSale { string name = 1; } message QueryForSaleResponse { Forsale for_sale = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllForSaleRequest { +message QueryAllForSale { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -120,11 +120,11 @@ message QueryAllForSaleResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryInitRequest { string address = 1; } +message QueryInit { string address = 1; } message QueryInitResponse { bool init = 1; } -message QueryAllInitsRequest { +message QueryAllInits { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -133,7 +133,7 @@ message QueryAllInitsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryListOwnedNamesRequest { +message QueryListOwnedNames { string address = 1; cosmos.base.query.v1beta1.PageRequest pagination = 2; } diff --git a/x/oracle/client/cli/query_params.go b/x/oracle/client/cli/query_params.go index 022fe8ee4..a40118908 100644 --- a/x/oracle/client/cli/query_params.go +++ b/x/oracle/client/cli/query_params.go @@ -19,7 +19,7 @@ func CmdQueryParams() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + res, err := queryClient.Params(context.Background(), &types.QueryParams{}) if err != nil { return err } diff --git a/x/rns/client/cli/query_bids.go b/x/rns/client/cli/query_bids.go index a3b8a061a..03cffa827 100644 --- a/x/rns/client/cli/query_bids.go +++ b/x/rns/client/cli/query_bids.go @@ -23,7 +23,7 @@ func CmdListBids() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllBidsRequest{ + params := &types.QueryAllBids{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowBids() *cobra.Command { argIndex := args[0] - params := &types.QueryBidRequest{ + params := &types.QueryBid{ Index: argIndex, } diff --git a/x/rns/client/cli/query_forsale.go b/x/rns/client/cli/query_forsale.go index 067b00c98..be3a73597 100644 --- a/x/rns/client/cli/query_forsale.go +++ b/x/rns/client/cli/query_forsale.go @@ -23,7 +23,7 @@ func CmdListForsale() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllForSaleRequest{ + params := &types.QueryAllForSale{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowForsale() *cobra.Command { argName := args[0] - params := &types.QueryForSaleRequest{ + params := &types.QueryForSale{ Name: argName, } diff --git a/x/rns/client/cli/query_init.go b/x/rns/client/cli/query_init.go index 2b00bc385..ec3de609c 100644 --- a/x/rns/client/cli/query_init.go +++ b/x/rns/client/cli/query_init.go @@ -23,7 +23,7 @@ func CmdListInit() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllInitsRequest{ + params := &types.QueryAllInits{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowInit() *cobra.Command { argAddress := args[0] - params := &types.QueryInitRequest{ + params := &types.QueryInit{ Address: argAddress, } diff --git a/x/rns/client/cli/query_list_owned_names.go b/x/rns/client/cli/query_list_owned_names.go index c943abe87..8801c2c00 100644 --- a/x/rns/client/cli/query_list_owned_names.go +++ b/x/rns/client/cli/query_list_owned_names.go @@ -26,7 +26,7 @@ func CmdListOwnedNames() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryListOwnedNamesRequest{ + params := &types.QueryListOwnedNames{ Address: reqAddress, } diff --git a/x/rns/client/cli/query_names.go b/x/rns/client/cli/query_names.go index 7a10e59e0..ce0c6c036 100644 --- a/x/rns/client/cli/query_names.go +++ b/x/rns/client/cli/query_names.go @@ -23,7 +23,7 @@ func CmdListNames() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllNamesRequest{ + params := &types.QueryAllNames{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowNames() *cobra.Command { argIndex := args[0] - params := &types.QueryNameRequest{ + params := &types.QueryName{ Index: argIndex, } diff --git a/x/rns/client/cli/query_params.go b/x/rns/client/cli/query_params.go index 022fe8ee4..a40118908 100644 --- a/x/rns/client/cli/query_params.go +++ b/x/rns/client/cli/query_params.go @@ -19,7 +19,7 @@ func CmdQueryParams() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + res, err := queryClient.Params(context.Background(), &types.QueryParams{}) if err != nil { return err } diff --git a/x/rns/keeper/bidding_test.go b/x/rns/keeper/bidding_test.go index a0867224d..aa6954aba 100644 --- a/x/rns/keeper/bidding_test.go +++ b/x/rns/keeper/bidding_test.go @@ -64,7 +64,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptBid() { suite.Require().Equal(ramt.Int64(), bidder) // cost them the amount they bid suite.Require().Equal(eamt.Int64(), biddee) // cost them the amount they bid - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: TestName, } @@ -96,7 +96,7 @@ func (suite *KeeperTestSuite) TestMsgMakeBid() { err = suite.rnsKeeper.AddBid(suite.ctx, address.String(), TestName, "1000ujkl") suite.Require().NoError(err) - bidReq := types.QueryBidRequest{ + bidReq := types.QueryBid{ Index: fmt.Sprintf("%s%s", address.String(), TestName), } @@ -134,7 +134,7 @@ func (suite *KeeperTestSuite) TestMsgCancelBid() { err = suite.rnsKeeper.AddBid(suite.ctx, address.String(), TestName, "1000ujkl") suite.Require().NoError(err) - bidReq := types.QueryBidRequest{ + bidReq := types.QueryBid{ Index: fmt.Sprintf("%s%s", address.String(), TestName), } diff --git a/x/rns/keeper/grpc_query_bids.go b/x/rns/keeper/grpc_query_bids.go index 8615ab09e..dc7d67210 100644 --- a/x/rns/keeper/grpc_query_bids.go +++ b/x/rns/keeper/grpc_query_bids.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllBids(c context.Context, req *types.QueryAllBidsRequest) (*types.QueryAllBidsResponse, error) { +func (k Keeper) AllBids(c context.Context, req *types.QueryAllBids) (*types.QueryAllBidsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllBids(c context.Context, req *types.QueryAllBidsRequest) (*typ return &types.QueryAllBidsResponse{Bids: bidss, Pagination: pageRes}, nil } -func (k Keeper) Bid(c context.Context, req *types.QueryBidRequest) (*types.QueryBidResponse, error) { +func (k Keeper) Bid(c context.Context, req *types.QueryBid) (*types.QueryBidResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_forsale.go b/x/rns/keeper/grpc_query_forsale.go index ab094f4db..17be1337e 100644 --- a/x/rns/keeper/grpc_query_forsale.go +++ b/x/rns/keeper/grpc_query_forsale.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllForSale(c context.Context, req *types.QueryAllForSaleRequest) (*types.QueryAllForSaleResponse, error) { +func (k Keeper) AllForSale(c context.Context, req *types.QueryAllForSale) (*types.QueryAllForSaleResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllForSale(c context.Context, req *types.QueryAllForSaleRequest) return &types.QueryAllForSaleResponse{ForSale: forsales, Pagination: pageRes}, nil } -func (k Keeper) ForSale(c context.Context, req *types.QueryForSaleRequest) (*types.QueryForSaleResponse, error) { +func (k Keeper) ForSale(c context.Context, req *types.QueryForSale) (*types.QueryForSaleResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_init.go b/x/rns/keeper/grpc_query_init.go index b9c4b80da..d14465ee4 100644 --- a/x/rns/keeper/grpc_query_init.go +++ b/x/rns/keeper/grpc_query_init.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllInits(c context.Context, req *types.QueryAllInitsRequest) (*types.QueryAllInitsResponse, error) { +func (k Keeper) AllInits(c context.Context, req *types.QueryAllInits) (*types.QueryAllInitsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllInits(c context.Context, req *types.QueryAllInitsRequest) (*t return &types.QueryAllInitsResponse{Init: inits, Pagination: pageRes}, nil } -func (k Keeper) Init(c context.Context, req *types.QueryInitRequest) (*types.QueryInitResponse, error) { +func (k Keeper) Init(c context.Context, req *types.QueryInit) (*types.QueryInitResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_list_owned_names.go b/x/rns/keeper/grpc_query_list_owned_names.go index 901fff853..58fcc9c20 100644 --- a/x/rns/keeper/grpc_query_list_owned_names.go +++ b/x/rns/keeper/grpc_query_list_owned_names.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) ListOwnedNames(goCtx context.Context, req *types.QueryListOwnedNamesRequest) (*types.QueryListOwnedNamesResponse, error) { +func (k Keeper) ListOwnedNames(goCtx context.Context, req *types.QueryListOwnedNames) (*types.QueryListOwnedNamesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_names.go b/x/rns/keeper/grpc_query_names.go index 140e4a7ac..5bf7c449d 100644 --- a/x/rns/keeper/grpc_query_names.go +++ b/x/rns/keeper/grpc_query_names.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllNames(c context.Context, req *types.QueryAllNamesRequest) (*types.QueryAllNamesResponse, error) { +func (k Keeper) AllNames(c context.Context, req *types.QueryAllNames) (*types.QueryAllNamesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllNames(c context.Context, req *types.QueryAllNamesRequest) (*t return &types.QueryAllNamesResponse{Name: namess, Pagination: pageRes}, nil } -func (k Keeper) Name(c context.Context, req *types.QueryNameRequest) (*types.QueryNameResponse, error) { +func (k Keeper) Name(c context.Context, req *types.QueryName) (*types.QueryNameResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/grpc_query_params.go b/x/rns/keeper/grpc_query_params.go index a1dd8fcae..4e56ce912 100644 --- a/x/rns/keeper/grpc_query_params.go +++ b/x/rns/keeper/grpc_query_params.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(c context.Context, req *types.QueryParams) (*types.QueryParamsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/rns/keeper/keeper_test.go b/x/rns/keeper/keeper_test.go index f7c869567..412c2105c 100644 --- a/x/rns/keeper/keeper_test.go +++ b/x/rns/keeper/keeper_test.go @@ -106,7 +106,7 @@ func (suite *KeeperTestSuite) TestMakeBid() { suite.rnsKeeper.SetBids(suite.ctx, bid) - bidReq := types.QueryBidRequest{ + bidReq := types.QueryBid{ Index: fmt.Sprintf("%s%s", address.String(), name), } @@ -137,7 +137,7 @@ func (suite *KeeperTestSuite) TestUpdateName() { suite.rnsKeeper.SetNames(suite.ctx, name) - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: "validname.jkl", } @@ -176,7 +176,7 @@ func (suite *KeeperTestSuite) TestRemoveName() { suite.rnsKeeper.SetNames(suite.ctx, name) - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: "validname.jkl", } @@ -212,7 +212,7 @@ func (suite *KeeperTestSuite) TestSetName() { suite.rnsKeeper.SetNames(suite.ctx, name) - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: "validname.jkl", } @@ -230,7 +230,7 @@ func (suite *KeeperTestSuite) TestSetName() { } suite.rnsKeeper.SetNames(suite.ctx, badname) - nameReq = types.QueryNameRequest{ + nameReq = types.QueryName{ Index: "badname.jkl", } _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) @@ -239,7 +239,7 @@ func (suite *KeeperTestSuite) TestSetName() { func (suite *KeeperTestSuite) TestGRPCParams() { suite.SetupSuite() - params, err := suite.queryClient.Params(gocontext.Background(), &types.QueryParamsRequest{}) + params, err := suite.queryClient.Params(gocontext.Background(), &types.QueryParams{}) suite.Require().NoError(err) suite.Require().Equal(params.Params, suite.rnsKeeper.GetParams(suite.ctx)) } diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go index 4af635fa9..e8b9f0988 100644 --- a/x/rns/keeper/register_test.go +++ b/x/rns/keeper/register_test.go @@ -38,7 +38,7 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", 2) suite.Require().NoError(err) - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: name, } diff --git a/x/rns/keeper/transfer_test.go b/x/rns/keeper/transfer_test.go index 7fec90775..88a1feb5e 100644 --- a/x/rns/keeper/transfer_test.go +++ b/x/rns/keeper/transfer_test.go @@ -33,7 +33,7 @@ func (suite *KeeperTestSuite) TestMsgTransfer() { err = suite.rnsKeeper.RegisterName(suite.ctx, address.String(), name, "{}", 2) suite.Require().NoError(err) - nameReq := types.QueryNameRequest{ + nameReq := types.QueryName{ Index: name, } diff --git a/x/rns/simulation/add_record.go b/x/rns/simulation/add_record.go index 233faafc7..82966f7e3 100644 --- a/x/rns/simulation/add_record.go +++ b/x/rns/simulation/add_record.go @@ -33,7 +33,7 @@ func SimulateMsgAddRecord( for { // finding all registered domain names wctx := sdk.WrapSDKContext(ctx) - nReq := &types.QueryListOwnedNamesRequest{ + nReq := &types.QueryListOwnedNames{ Address: simAccount.Address.String(), } // requesting the domain names diff --git a/x/rns/simulation/cancel_bid.go b/x/rns/simulation/cancel_bid.go index 4fcf3475d..9feb350c2 100644 --- a/x/rns/simulation/cancel_bid.go +++ b/x/rns/simulation/cancel_bid.go @@ -20,7 +20,7 @@ func SimulateMsgCancelBid( return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { // choosing a random account with a bid open - nreq := &types.QueryAllBidsRequest{} + nreq := &types.QueryAllBids{} wctx := sdk.WrapSDKContext(ctx) allBidsResp, err := k.AllBids(wctx, nreq) if err != nil { diff --git a/x/rns/simulation/list.go b/x/rns/simulation/list.go index a495d2ff4..5724fa37d 100644 --- a/x/rns/simulation/list.go +++ b/x/rns/simulation/list.go @@ -32,7 +32,7 @@ func SimulateMsgList( for { // finding all registered domain names wctx := sdk.WrapSDKContext(ctx) - nReq := &types.QueryListOwnedNamesRequest{ + nReq := &types.QueryListOwnedNames{ Address: simAccount.Address.String(), } // requesting the domain names diff --git a/x/rns/simulation/transfer.go b/x/rns/simulation/transfer.go index 5e537999f..d7a58a3e1 100644 --- a/x/rns/simulation/transfer.go +++ b/x/rns/simulation/transfer.go @@ -36,7 +36,7 @@ func SimulateMsgTransfer( for { // finding all registered domain names wctx := sdk.WrapSDKContext(ctx) - nReq := &types.QueryListOwnedNamesRequest{ + nReq := &types.QueryListOwnedNames{ Address: simAccount.Address.String(), } // requesting the domain names diff --git a/x/rns/types/query.pb.go b/x/rns/types/query.pb.go index 0ec3ece9d..a9b3763ed 100644 --- a/x/rns/types/query.pb.go +++ b/x/rns/types/query.pb.go @@ -30,22 +30,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct { +// QueryParams is request type for the Query/Params RPC method. +type QueryParams struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryParams) Reset() { *m = QueryParams{} } +func (m *QueryParams) String() string { return proto.CompactTextString(m) } +func (*QueryParams) ProtoMessage() {} +func (*QueryParams) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{0} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -55,17 +55,17 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParams.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryParams) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryParams) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParams.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryParams proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { @@ -113,22 +113,22 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryNameRequest struct { +type QueryName struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` } -func (m *QueryNameRequest) Reset() { *m = QueryNameRequest{} } -func (m *QueryNameRequest) String() string { return proto.CompactTextString(m) } -func (*QueryNameRequest) ProtoMessage() {} -func (*QueryNameRequest) Descriptor() ([]byte, []int) { +func (m *QueryName) Reset() { *m = QueryName{} } +func (m *QueryName) String() string { return proto.CompactTextString(m) } +func (*QueryName) ProtoMessage() {} +func (*QueryName) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{2} } -func (m *QueryNameRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryName) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryNameRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryNameRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryName.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -138,19 +138,19 @@ func (m *QueryNameRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *QueryNameRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryNameRequest.Merge(m, src) +func (m *QueryName) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryName.Merge(m, src) } -func (m *QueryNameRequest) XXX_Size() int { +func (m *QueryName) XXX_Size() int { return m.Size() } -func (m *QueryNameRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryNameRequest.DiscardUnknown(m) +func (m *QueryName) XXX_DiscardUnknown() { + xxx_messageInfo_QueryName.DiscardUnknown(m) } -var xxx_messageInfo_QueryNameRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryName proto.InternalMessageInfo -func (m *QueryNameRequest) GetIndex() string { +func (m *QueryName) GetIndex() string { if m != nil { return m.Index } @@ -201,22 +201,22 @@ func (m *QueryNameResponse) GetName() Names { return Names{} } -type QueryAllNamesRequest struct { +type QueryAllNames struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllNamesRequest) Reset() { *m = QueryAllNamesRequest{} } -func (m *QueryAllNamesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllNamesRequest) ProtoMessage() {} -func (*QueryAllNamesRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllNames) Reset() { *m = QueryAllNames{} } +func (m *QueryAllNames) String() string { return proto.CompactTextString(m) } +func (*QueryAllNames) ProtoMessage() {} +func (*QueryAllNames) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{4} } -func (m *QueryAllNamesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllNames) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllNamesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllNames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllNamesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllNames.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -226,19 +226,19 @@ func (m *QueryAllNamesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllNamesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllNamesRequest.Merge(m, src) +func (m *QueryAllNames) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllNames.Merge(m, src) } -func (m *QueryAllNamesRequest) XXX_Size() int { +func (m *QueryAllNames) XXX_Size() int { return m.Size() } -func (m *QueryAllNamesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllNamesRequest.DiscardUnknown(m) +func (m *QueryAllNames) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllNames.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllNamesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllNames proto.InternalMessageInfo -func (m *QueryAllNamesRequest) GetPagination() *query.PageRequest { +func (m *QueryAllNames) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -297,22 +297,22 @@ func (m *QueryAllNamesResponse) GetPagination() *query.PageResponse { return nil } -type QueryBidRequest struct { +type QueryBid struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` } -func (m *QueryBidRequest) Reset() { *m = QueryBidRequest{} } -func (m *QueryBidRequest) String() string { return proto.CompactTextString(m) } -func (*QueryBidRequest) ProtoMessage() {} -func (*QueryBidRequest) Descriptor() ([]byte, []int) { +func (m *QueryBid) Reset() { *m = QueryBid{} } +func (m *QueryBid) String() string { return proto.CompactTextString(m) } +func (*QueryBid) ProtoMessage() {} +func (*QueryBid) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{6} } -func (m *QueryBidRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryBid) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryBidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryBid) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryBidRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryBid.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -322,19 +322,19 @@ func (m *QueryBidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *QueryBidRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryBidRequest.Merge(m, src) +func (m *QueryBid) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryBid.Merge(m, src) } -func (m *QueryBidRequest) XXX_Size() int { +func (m *QueryBid) XXX_Size() int { return m.Size() } -func (m *QueryBidRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryBidRequest.DiscardUnknown(m) +func (m *QueryBid) XXX_DiscardUnknown() { + xxx_messageInfo_QueryBid.DiscardUnknown(m) } -var xxx_messageInfo_QueryBidRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryBid proto.InternalMessageInfo -func (m *QueryBidRequest) GetIndex() string { +func (m *QueryBid) GetIndex() string { if m != nil { return m.Index } @@ -385,22 +385,22 @@ func (m *QueryBidResponse) GetBids() Bids { return Bids{} } -type QueryAllBidsRequest struct { +type QueryAllBids struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllBidsRequest) Reset() { *m = QueryAllBidsRequest{} } -func (m *QueryAllBidsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllBidsRequest) ProtoMessage() {} -func (*QueryAllBidsRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllBids) Reset() { *m = QueryAllBids{} } +func (m *QueryAllBids) String() string { return proto.CompactTextString(m) } +func (*QueryAllBids) ProtoMessage() {} +func (*QueryAllBids) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{8} } -func (m *QueryAllBidsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllBids) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllBidsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllBids) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllBidsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllBids.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -410,19 +410,19 @@ func (m *QueryAllBidsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryAllBidsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllBidsRequest.Merge(m, src) +func (m *QueryAllBids) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllBids.Merge(m, src) } -func (m *QueryAllBidsRequest) XXX_Size() int { +func (m *QueryAllBids) XXX_Size() int { return m.Size() } -func (m *QueryAllBidsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllBidsRequest.DiscardUnknown(m) +func (m *QueryAllBids) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllBids.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllBidsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllBids proto.InternalMessageInfo -func (m *QueryAllBidsRequest) GetPagination() *query.PageRequest { +func (m *QueryAllBids) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -481,22 +481,22 @@ func (m *QueryAllBidsResponse) GetPagination() *query.PageResponse { return nil } -type QueryForSaleRequest struct { +type QueryForSale struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } -func (m *QueryForSaleRequest) Reset() { *m = QueryForSaleRequest{} } -func (m *QueryForSaleRequest) String() string { return proto.CompactTextString(m) } -func (*QueryForSaleRequest) ProtoMessage() {} -func (*QueryForSaleRequest) Descriptor() ([]byte, []int) { +func (m *QueryForSale) Reset() { *m = QueryForSale{} } +func (m *QueryForSale) String() string { return proto.CompactTextString(m) } +func (*QueryForSale) ProtoMessage() {} +func (*QueryForSale) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{10} } -func (m *QueryForSaleRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryForSale) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryForSale) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryForSaleRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryForSale.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -506,19 +506,19 @@ func (m *QueryForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryForSaleRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryForSaleRequest.Merge(m, src) +func (m *QueryForSale) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryForSale.Merge(m, src) } -func (m *QueryForSaleRequest) XXX_Size() int { +func (m *QueryForSale) XXX_Size() int { return m.Size() } -func (m *QueryForSaleRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryForSaleRequest.DiscardUnknown(m) +func (m *QueryForSale) XXX_DiscardUnknown() { + xxx_messageInfo_QueryForSale.DiscardUnknown(m) } -var xxx_messageInfo_QueryForSaleRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryForSale proto.InternalMessageInfo -func (m *QueryForSaleRequest) GetName() string { +func (m *QueryForSale) GetName() string { if m != nil { return m.Name } @@ -569,22 +569,22 @@ func (m *QueryForSaleResponse) GetForSale() Forsale { return Forsale{} } -type QueryAllForSaleRequest struct { +type QueryAllForSale struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllForSaleRequest) Reset() { *m = QueryAllForSaleRequest{} } -func (m *QueryAllForSaleRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllForSaleRequest) ProtoMessage() {} -func (*QueryAllForSaleRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllForSale) Reset() { *m = QueryAllForSale{} } +func (m *QueryAllForSale) String() string { return proto.CompactTextString(m) } +func (*QueryAllForSale) ProtoMessage() {} +func (*QueryAllForSale) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{12} } -func (m *QueryAllForSaleRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllForSale) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllForSale) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllForSaleRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllForSale.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -594,19 +594,19 @@ func (m *QueryAllForSaleRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryAllForSaleRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllForSaleRequest.Merge(m, src) +func (m *QueryAllForSale) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllForSale.Merge(m, src) } -func (m *QueryAllForSaleRequest) XXX_Size() int { +func (m *QueryAllForSale) XXX_Size() int { return m.Size() } -func (m *QueryAllForSaleRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllForSaleRequest.DiscardUnknown(m) +func (m *QueryAllForSale) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllForSale.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllForSaleRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllForSale proto.InternalMessageInfo -func (m *QueryAllForSaleRequest) GetPagination() *query.PageRequest { +func (m *QueryAllForSale) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -665,22 +665,22 @@ func (m *QueryAllForSaleResponse) GetPagination() *query.PageResponse { return nil } -type QueryInitRequest struct { +type QueryInit struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryInitRequest) Reset() { *m = QueryInitRequest{} } -func (m *QueryInitRequest) String() string { return proto.CompactTextString(m) } -func (*QueryInitRequest) ProtoMessage() {} -func (*QueryInitRequest) Descriptor() ([]byte, []int) { +func (m *QueryInit) Reset() { *m = QueryInit{} } +func (m *QueryInit) String() string { return proto.CompactTextString(m) } +func (*QueryInit) ProtoMessage() {} +func (*QueryInit) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{14} } -func (m *QueryInitRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryInit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryInitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryInit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryInitRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryInit.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -690,19 +690,19 @@ func (m *QueryInitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *QueryInitRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryInitRequest.Merge(m, src) +func (m *QueryInit) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryInit.Merge(m, src) } -func (m *QueryInitRequest) XXX_Size() int { +func (m *QueryInit) XXX_Size() int { return m.Size() } -func (m *QueryInitRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryInitRequest.DiscardUnknown(m) +func (m *QueryInit) XXX_DiscardUnknown() { + xxx_messageInfo_QueryInit.DiscardUnknown(m) } -var xxx_messageInfo_QueryInitRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryInit proto.InternalMessageInfo -func (m *QueryInitRequest) GetAddress() string { +func (m *QueryInit) GetAddress() string { if m != nil { return m.Address } @@ -753,22 +753,22 @@ func (m *QueryInitResponse) GetInit() bool { return false } -type QueryAllInitsRequest struct { +type QueryAllInits struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllInitsRequest) Reset() { *m = QueryAllInitsRequest{} } -func (m *QueryAllInitsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllInitsRequest) ProtoMessage() {} -func (*QueryAllInitsRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllInits) Reset() { *m = QueryAllInits{} } +func (m *QueryAllInits) String() string { return proto.CompactTextString(m) } +func (*QueryAllInits) ProtoMessage() {} +func (*QueryAllInits) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{16} } -func (m *QueryAllInitsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllInits) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllInitsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllInits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllInitsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllInits.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -778,19 +778,19 @@ func (m *QueryAllInitsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllInitsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllInitsRequest.Merge(m, src) +func (m *QueryAllInits) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllInits.Merge(m, src) } -func (m *QueryAllInitsRequest) XXX_Size() int { +func (m *QueryAllInits) XXX_Size() int { return m.Size() } -func (m *QueryAllInitsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllInitsRequest.DiscardUnknown(m) +func (m *QueryAllInits) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllInits.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllInitsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllInits proto.InternalMessageInfo -func (m *QueryAllInitsRequest) GetPagination() *query.PageRequest { +func (m *QueryAllInits) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -849,23 +849,23 @@ func (m *QueryAllInitsResponse) GetPagination() *query.PageResponse { return nil } -type QueryListOwnedNamesRequest struct { +type QueryListOwnedNames struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryListOwnedNamesRequest) Reset() { *m = QueryListOwnedNamesRequest{} } -func (m *QueryListOwnedNamesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryListOwnedNamesRequest) ProtoMessage() {} -func (*QueryListOwnedNamesRequest) Descriptor() ([]byte, []int) { +func (m *QueryListOwnedNames) Reset() { *m = QueryListOwnedNames{} } +func (m *QueryListOwnedNames) String() string { return proto.CompactTextString(m) } +func (*QueryListOwnedNames) ProtoMessage() {} +func (*QueryListOwnedNames) Descriptor() ([]byte, []int) { return fileDescriptor_8561b6b36d651aba, []int{18} } -func (m *QueryListOwnedNamesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryListOwnedNames) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryListOwnedNamesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryListOwnedNames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryListOwnedNamesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryListOwnedNames.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -875,26 +875,26 @@ func (m *QueryListOwnedNamesRequest) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } -func (m *QueryListOwnedNamesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryListOwnedNamesRequest.Merge(m, src) +func (m *QueryListOwnedNames) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryListOwnedNames.Merge(m, src) } -func (m *QueryListOwnedNamesRequest) XXX_Size() int { +func (m *QueryListOwnedNames) XXX_Size() int { return m.Size() } -func (m *QueryListOwnedNamesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryListOwnedNamesRequest.DiscardUnknown(m) +func (m *QueryListOwnedNames) XXX_DiscardUnknown() { + xxx_messageInfo_QueryListOwnedNames.DiscardUnknown(m) } -var xxx_messageInfo_QueryListOwnedNamesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryListOwnedNames proto.InternalMessageInfo -func (m *QueryListOwnedNamesRequest) GetAddress() string { +func (m *QueryListOwnedNames) GetAddress() string { if m != nil { return m.Address } return "" } -func (m *QueryListOwnedNamesRequest) GetPagination() *query.PageRequest { +func (m *QueryListOwnedNames) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -954,94 +954,92 @@ func (m *QueryListOwnedNamesResponse) GetPagination() *query.PageResponse { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.rns.QueryParamsRequest") + proto.RegisterType((*QueryParams)(nil), "canine_chain.rns.QueryParams") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.rns.QueryParamsResponse") - proto.RegisterType((*QueryNameRequest)(nil), "canine_chain.rns.QueryNameRequest") + proto.RegisterType((*QueryName)(nil), "canine_chain.rns.QueryName") proto.RegisterType((*QueryNameResponse)(nil), "canine_chain.rns.QueryNameResponse") - proto.RegisterType((*QueryAllNamesRequest)(nil), "canine_chain.rns.QueryAllNamesRequest") + proto.RegisterType((*QueryAllNames)(nil), "canine_chain.rns.QueryAllNames") proto.RegisterType((*QueryAllNamesResponse)(nil), "canine_chain.rns.QueryAllNamesResponse") - proto.RegisterType((*QueryBidRequest)(nil), "canine_chain.rns.QueryBidRequest") + proto.RegisterType((*QueryBid)(nil), "canine_chain.rns.QueryBid") proto.RegisterType((*QueryBidResponse)(nil), "canine_chain.rns.QueryBidResponse") - proto.RegisterType((*QueryAllBidsRequest)(nil), "canine_chain.rns.QueryAllBidsRequest") + proto.RegisterType((*QueryAllBids)(nil), "canine_chain.rns.QueryAllBids") proto.RegisterType((*QueryAllBidsResponse)(nil), "canine_chain.rns.QueryAllBidsResponse") - proto.RegisterType((*QueryForSaleRequest)(nil), "canine_chain.rns.QueryForSaleRequest") + proto.RegisterType((*QueryForSale)(nil), "canine_chain.rns.QueryForSale") proto.RegisterType((*QueryForSaleResponse)(nil), "canine_chain.rns.QueryForSaleResponse") - proto.RegisterType((*QueryAllForSaleRequest)(nil), "canine_chain.rns.QueryAllForSaleRequest") + proto.RegisterType((*QueryAllForSale)(nil), "canine_chain.rns.QueryAllForSale") proto.RegisterType((*QueryAllForSaleResponse)(nil), "canine_chain.rns.QueryAllForSaleResponse") - proto.RegisterType((*QueryInitRequest)(nil), "canine_chain.rns.QueryInitRequest") + proto.RegisterType((*QueryInit)(nil), "canine_chain.rns.QueryInit") proto.RegisterType((*QueryInitResponse)(nil), "canine_chain.rns.QueryInitResponse") - proto.RegisterType((*QueryAllInitsRequest)(nil), "canine_chain.rns.QueryAllInitsRequest") + proto.RegisterType((*QueryAllInits)(nil), "canine_chain.rns.QueryAllInits") proto.RegisterType((*QueryAllInitsResponse)(nil), "canine_chain.rns.QueryAllInitsResponse") - proto.RegisterType((*QueryListOwnedNamesRequest)(nil), "canine_chain.rns.QueryListOwnedNamesRequest") + proto.RegisterType((*QueryListOwnedNames)(nil), "canine_chain.rns.QueryListOwnedNames") proto.RegisterType((*QueryListOwnedNamesResponse)(nil), "canine_chain.rns.QueryListOwnedNamesResponse") } func init() { proto.RegisterFile("canine_chain/rns/query.proto", fileDescriptor_8561b6b36d651aba) } var fileDescriptor_8561b6b36d651aba = []byte{ - // 980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x97, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0xb3, 0x89, 0xf3, 0xa3, 0x0f, 0x09, 0xca, 0x10, 0xda, 0xb0, 0x6d, 0x37, 0xcd, 0x96, - 0xd8, 0x4e, 0xd5, 0xec, 0x36, 0x8d, 0xe0, 0x00, 0xa7, 0x5a, 0x28, 0x80, 0x54, 0xa0, 0x98, 0x1b, - 0x12, 0x84, 0xb1, 0x77, 0xe3, 0x0c, 0xac, 0x77, 0xdc, 0x9d, 0x0d, 0x6d, 0x15, 0xa5, 0x45, 0xe5, - 0x86, 0x38, 0x00, 0x3d, 0x22, 0xf1, 0x07, 0xf0, 0x97, 0xf4, 0x58, 0x89, 0x0b, 0x17, 0x10, 0x4a, - 0xf8, 0x43, 0xd0, 0xcc, 0xbc, 0x8d, 0xf7, 0x47, 0xc6, 0x36, 0x95, 0x6f, 0x76, 0xe6, 0x3b, 0xef, - 0xfb, 0x99, 0x37, 0x6f, 0xde, 0x8b, 0xe1, 0x72, 0x97, 0xc6, 0x2c, 0x0e, 0x77, 0xbb, 0xfb, 0x94, - 0xc5, 0x7e, 0x12, 0x0b, 0xff, 0xde, 0x41, 0x98, 0x3c, 0xf4, 0x06, 0x09, 0x4f, 0x39, 0x39, 0x9f, - 0x5f, 0xf5, 0x92, 0x58, 0xd8, 0xcb, 0x3d, 0xde, 0xe3, 0x6a, 0xd1, 0x97, 0x9f, 0xb4, 0xce, 0xbe, - 0xdc, 0xe3, 0xbc, 0x17, 0x85, 0x3e, 0x1d, 0x30, 0x9f, 0xc6, 0x31, 0x4f, 0x69, 0xca, 0x78, 0x2c, - 0x70, 0xf5, 0x7a, 0x97, 0x8b, 0x3e, 0x17, 0x7e, 0x87, 0x8a, 0x50, 0x87, 0xf7, 0xbf, 0xdd, 0xea, - 0x84, 0x29, 0xdd, 0xf2, 0x07, 0xb4, 0xc7, 0x62, 0x25, 0x46, 0xed, 0x95, 0x0a, 0xcf, 0x80, 0x26, - 0xb4, 0x9f, 0x85, 0xaa, 0xe2, 0xde, 0xdf, 0xe7, 0xcc, 0xbc, 0x1a, 0xd3, 0x7e, 0x98, 0xad, 0x5e, - 0xaa, 0xac, 0x76, 0x58, 0x90, 0x2d, 0x3a, 0x95, 0xc5, 0x3d, 0x9e, 0x08, 0x1a, 0x85, 0xc6, 0xcd, - 0x2c, 0x66, 0xa9, 0x5e, 0x74, 0x97, 0x81, 0x7c, 0x2a, 0x8f, 0x75, 0x57, 0xa1, 0xb6, 0xc3, 0x7b, - 0x07, 0xa1, 0x48, 0xdd, 0x8f, 0xe0, 0xb5, 0xc2, 0x5f, 0xc5, 0x80, 0xc7, 0x22, 0x24, 0x6f, 0xc3, - 0x82, 0x3e, 0xd2, 0x8a, 0x75, 0xd5, 0x6a, 0xbe, 0x74, 0x6b, 0xc5, 0x2b, 0x27, 0xd9, 0xd3, 0x3b, - 0x5a, 0xb5, 0x67, 0x7f, 0xaf, 0xce, 0xb4, 0x51, 0xed, 0x36, 0xe1, 0xbc, 0x0a, 0xf7, 0x31, 0xed, - 0x87, 0x68, 0x41, 0x96, 0x61, 0x9e, 0xc5, 0x41, 0xf8, 0x40, 0x85, 0x3a, 0xd7, 0xd6, 0x5f, 0xdc, - 0x1d, 0x78, 0x35, 0xa7, 0x44, 0xdb, 0x2d, 0xa8, 0xc9, 0x64, 0xa0, 0xe9, 0xc5, 0xaa, 0xa9, 0x54, - 0x67, 0x9e, 0x4a, 0xea, 0x7e, 0x09, 0xcb, 0x2a, 0xce, 0xed, 0x28, 0x52, 0x8b, 0x99, 0xeb, 0x0e, - 0xc0, 0xf0, 0xde, 0x30, 0x60, 0xdd, 0xd3, 0x97, 0xec, 0xc9, 0x4b, 0xf6, 0x74, 0x0d, 0xe1, 0x25, - 0x7b, 0x77, 0x69, 0x2f, 0x23, 0x6e, 0xe7, 0x76, 0xba, 0x4f, 0x2d, 0x78, 0xbd, 0x64, 0x50, 0x81, - 0x9d, 0x9b, 0x10, 0x96, 0xbc, 0x5f, 0x80, 0x9a, 0x55, 0x50, 0x8d, 0xb1, 0x50, 0xda, 0xaf, 0x40, - 0xd5, 0x80, 0x57, 0x14, 0x54, 0x8b, 0x05, 0xa3, 0xd3, 0xfc, 0x1e, 0x5e, 0x88, 0x12, 0x22, 0xf8, - 0x4d, 0xa8, 0xc9, 0xa2, 0xc2, 0xa4, 0x5c, 0xa8, 0x82, 0xb7, 0x58, 0x70, 0xca, 0x2d, 0x95, 0xee, - 0x17, 0x58, 0x25, 0xb7, 0xa3, 0x48, 0xae, 0x4d, 0x3b, 0xc7, 0x3f, 0x5b, 0xc3, 0x4b, 0xd4, 0xf1, - 0x2b, 0xa4, 0x73, 0x93, 0x91, 0x4e, 0x2f, 0xc3, 0x1b, 0x78, 0xe4, 0x1d, 0x9e, 0x7c, 0x46, 0xa3, - 0xd3, 0x62, 0x26, 0xb9, 0x0a, 0x3d, 0x87, 0x25, 0xd8, 0x46, 0xfa, 0x53, 0x29, 0xd2, 0xbf, 0x03, - 0x4b, 0x7b, 0x3c, 0xd9, 0x95, 0x0f, 0x14, 0x93, 0xf3, 0x46, 0xf5, 0x04, 0x3b, 0xfa, 0x05, 0xe3, - 0x21, 0x16, 0xf7, 0x74, 0x0c, 0xf7, 0x2b, 0xb8, 0x90, 0x65, 0xa4, 0x44, 0x30, 0xad, 0xa4, 0xff, - 0x66, 0xc1, 0xc5, 0x8a, 0xc5, 0x99, 0xe4, 0x73, 0xff, 0x87, 0x7c, 0x7a, 0x37, 0x70, 0x03, 0x4b, - 0xf7, 0xc3, 0x98, 0xa5, 0xd9, 0xe1, 0x57, 0x60, 0x91, 0x06, 0x41, 0x12, 0x0a, 0x81, 0x37, 0x90, - 0x7d, 0x75, 0x1b, 0xd8, 0x4f, 0xb4, 0x1a, 0xcf, 0x41, 0xa0, 0x26, 0x3b, 0xa0, 0xd2, 0x2e, 0xb5, - 0xd5, 0xe7, 0x7c, 0xc3, 0x90, 0xda, 0xa9, 0x17, 0xf3, 0x2f, 0xb9, 0x86, 0x81, 0x06, 0xc3, 0x6a, - 0x46, 0x1a, 0x43, 0x35, 0x4b, 0x79, 0x56, 0xcd, 0x52, 0x39, 0xbd, 0x5c, 0x3e, 0x02, 0x5b, 0x31, - 0xdd, 0x61, 0x22, 0xfd, 0xe4, 0x7e, 0x1c, 0x06, 0x85, 0x5e, 0x69, 0xcc, 0x6a, 0x29, 0x29, 0xb3, - 0x2f, 0x9c, 0x94, 0x5f, 0x2d, 0xb8, 0x74, 0x26, 0x00, 0xa6, 0x66, 0x1b, 0xe6, 0xd5, 0x14, 0x9c, - 0xac, 0x99, 0x6a, 0xed, 0xd4, 0xb2, 0x73, 0xeb, 0x2f, 0x80, 0x79, 0x45, 0x47, 0x1e, 0xc1, 0x82, - 0x9e, 0x6b, 0xe4, 0xcd, 0x2a, 0x42, 0x75, 0x7c, 0xda, 0xeb, 0x63, 0x54, 0xda, 0xcc, 0x6d, 0x3c, - 0xf9, 0xe3, 0xdf, 0xa7, 0xb3, 0x6b, 0x64, 0xd5, 0xff, 0x9a, 0x76, 0xbf, 0xa1, 0x91, 0xaf, 0x77, - 0x6d, 0x96, 0xff, 0x81, 0x20, 0x8f, 0xa1, 0x26, 0x0f, 0x4a, 0x5c, 0x43, 0xdc, 0xdc, 0x5c, 0xb5, - 0xaf, 0x8d, 0xd4, 0xa0, 0xb3, 0xa7, 0x9c, 0x9b, 0xa4, 0x6e, 0x74, 0x56, 0xb9, 0xf4, 0x0f, 0xd5, - 0xb8, 0x38, 0x22, 0xdf, 0x5b, 0xb0, 0x94, 0x4d, 0x3a, 0x52, 0x37, 0x38, 0x94, 0x66, 0xad, 0xdd, - 0x18, 0xab, 0x43, 0x9a, 0xba, 0xa2, 0xb9, 0x4a, 0x9c, 0xd1, 0x34, 0xe4, 0x10, 0xe6, 0x5a, 0x2c, - 0x20, 0x6b, 0x86, 0xb8, 0xc3, 0xa9, 0x67, 0xbb, 0xa3, 0x24, 0xe8, 0xba, 0xa9, 0x5c, 0x1b, 0x64, - 0xdd, 0xe8, 0x2a, 0x47, 0xc7, 0x69, 0x0a, 0x1e, 0xc3, 0x22, 0xce, 0x21, 0xb2, 0x6e, 0x3e, 0x58, - 0x6e, 0x0e, 0xda, 0xf5, 0x71, 0x32, 0x04, 0x59, 0x57, 0x20, 0xab, 0xe4, 0xca, 0x48, 0x10, 0xf2, - 0x83, 0x05, 0x8b, 0xd8, 0x91, 0x8d, 0x04, 0xc5, 0xa1, 0x60, 0x24, 0x28, 0x35, 0x76, 0xf7, 0xa6, - 0x22, 0xb8, 0x4e, 0x9a, 0x46, 0x82, 0xac, 0xef, 0xfb, 0x87, 0xf2, 0x2a, 0x8e, 0xc8, 0x8f, 0x16, - 0xc0, 0x70, 0x42, 0x90, 0xa6, 0xf9, 0xa8, 0x25, 0xa4, 0x8d, 0x09, 0x94, 0x48, 0xb5, 0xa1, 0xa8, - 0xae, 0x91, 0xb5, 0xb1, 0x54, 0xe4, 0x3b, 0x0b, 0x6a, 0xb2, 0x4d, 0x1a, 0x5f, 0x48, 0x6e, 0x5a, - 0x18, 0x5f, 0x48, 0x7e, 0x46, 0xb8, 0xbe, 0x32, 0xdf, 0x20, 0x0d, 0xa3, 0xb9, 0x6c, 0xc5, 0xfe, - 0x21, 0xb6, 0xc4, 0x23, 0xf2, 0x44, 0x3f, 0x11, 0xd5, 0xdb, 0x47, 0x3d, 0x91, 0xfc, 0x74, 0x19, - 0xf5, 0x44, 0x0a, 0x43, 0x62, 0x82, 0x1a, 0x51, 0x93, 0xe1, 0x77, 0x0b, 0x5e, 0x2e, 0xf6, 0x52, - 0x72, 0xc3, 0x60, 0x71, 0x66, 0xcf, 0xb7, 0x37, 0x27, 0x54, 0x23, 0xd6, 0xbb, 0x0a, 0xeb, 0x2d, - 0xb2, 0x6d, 0xc4, 0x8a, 0x98, 0x48, 0x77, 0xb9, 0xdc, 0xb9, 0x8b, 0x2d, 0x25, 0xcb, 0x58, 0xeb, - 0x83, 0x67, 0xc7, 0x8e, 0xf5, 0xfc, 0xd8, 0xb1, 0xfe, 0x39, 0x76, 0xac, 0x9f, 0x4e, 0x9c, 0x99, - 0xe7, 0x27, 0xce, 0xcc, 0x9f, 0x27, 0xce, 0xcc, 0xe7, 0x5e, 0x8f, 0xa5, 0xfb, 0x07, 0x1d, 0xaf, - 0xcb, 0xfb, 0x18, 0xf8, 0x0e, 0xed, 0x88, 0x62, 0xf0, 0x07, 0x2a, 0x7c, 0xfa, 0x70, 0x10, 0x8a, - 0xce, 0x82, 0xfa, 0x2d, 0xb3, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xf2, 0x24, 0x56, - 0x12, 0x0e, 0x00, 0x00, + // 951 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x4f, 0x24, 0x45, + 0x18, 0xa5, 0x61, 0xf8, 0xf5, 0xad, 0xab, 0x6b, 0x89, 0x2e, 0x36, 0x4b, 0x03, 0xbd, 0x81, 0x81, + 0x4d, 0xe8, 0x5e, 0x96, 0xe8, 0x41, 0x4f, 0x4e, 0x0c, 0x6a, 0xb2, 0xea, 0x3a, 0x26, 0x1a, 0xbd, + 0x90, 0x9a, 0x99, 0x62, 0x28, 0x9d, 0xe9, 0x9a, 0xed, 0x6a, 0x04, 0x82, 0x5c, 0x34, 0xde, 0xd5, + 0xf5, 0x66, 0xe2, 0xc5, 0x7f, 0x66, 0x8f, 0x9b, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, 0x98, 0xfa, + 0xaa, 0xaa, 0xed, 0x99, 0xa6, 0x86, 0x71, 0x33, 0x37, 0x3a, 0xef, 0xf5, 0xf7, 0x5e, 0xbd, 0xfe, + 0xe6, 0x55, 0x80, 0x3b, 0x4d, 0x9a, 0xf0, 0x84, 0xed, 0x37, 0x0f, 0x29, 0x4f, 0xe2, 0x34, 0x91, + 0xf1, 0xe3, 0x23, 0x96, 0x9e, 0x46, 0xbd, 0x54, 0x64, 0x82, 0xdc, 0x2a, 0xa2, 0x51, 0x9a, 0x48, + 0x7f, 0xa1, 0x2d, 0xda, 0x02, 0xc1, 0x58, 0xfd, 0xa5, 0x79, 0xfe, 0x9d, 0xb6, 0x10, 0xed, 0x0e, + 0x8b, 0x69, 0x8f, 0xc7, 0x34, 0x49, 0x44, 0x46, 0x33, 0x2e, 0x12, 0x69, 0xd0, 0x7b, 0x4d, 0x21, + 0xbb, 0x42, 0xc6, 0x0d, 0x2a, 0x99, 0x1e, 0x1f, 0x7f, 0xb3, 0xd3, 0x60, 0x19, 0xdd, 0x89, 0x7b, + 0xb4, 0xcd, 0x13, 0x24, 0x1b, 0xee, 0x72, 0xc9, 0x4f, 0x8f, 0xa6, 0xb4, 0x6b, 0x47, 0x95, 0xed, + 0x1e, 0x1f, 0x0a, 0xee, 0x46, 0x13, 0xda, 0x65, 0x16, 0x5d, 0x2a, 0xa1, 0x0d, 0xde, 0xb2, 0x60, + 0x50, 0x02, 0x0f, 0x44, 0x2a, 0x69, 0x87, 0x39, 0x5f, 0xe6, 0x09, 0xcf, 0x34, 0x18, 0xde, 0x84, + 0x1b, 0x9f, 0xa8, 0x63, 0x3d, 0x42, 0xab, 0xe1, 0x87, 0xf0, 0x4a, 0xe1, 0xb1, 0xce, 0x64, 0x4f, + 0x24, 0x92, 0x91, 0x37, 0x61, 0x46, 0x9f, 0x65, 0xd1, 0x5b, 0xf5, 0x36, 0x6f, 0x3c, 0x58, 0x8c, + 0x06, 0xd3, 0x8d, 0xf4, 0x1b, 0xb5, 0xca, 0xd3, 0xbf, 0x56, 0x26, 0xea, 0x86, 0x1d, 0xae, 0xc1, + 0x3c, 0x8e, 0xfb, 0x88, 0x76, 0x19, 0x59, 0x80, 0x69, 0x9e, 0xb4, 0xd8, 0x09, 0xce, 0x98, 0xaf, + 0xeb, 0x87, 0x70, 0x0f, 0x5e, 0xce, 0x29, 0xb9, 0xde, 0x0e, 0x54, 0xd4, 0xf1, 0x8d, 0xda, 0xed, + 0xb2, 0x9a, 0x62, 0x5b, 0x31, 0xa4, 0x86, 0x9f, 0xc3, 0x4d, 0x9c, 0xf3, 0x4e, 0xa7, 0x83, 0x20, + 0xd9, 0x03, 0xf8, 0xef, 0x13, 0x99, 0x49, 0x1b, 0x91, 0xfe, 0x9e, 0x91, 0xfa, 0x9e, 0x91, 0x5e, + 0x17, 0xf3, 0x3d, 0xa3, 0x47, 0xb4, 0xcd, 0xea, 0xec, 0xf1, 0x11, 0x93, 0x59, 0xbd, 0xf0, 0x66, + 0xf8, 0xc4, 0x83, 0x57, 0xfb, 0x26, 0x5f, 0xe1, 0x72, 0x6a, 0x44, 0x97, 0xe4, 0xbd, 0x3e, 0x53, + 0x93, 0x68, 0xaa, 0x7a, 0xad, 0x29, 0xad, 0xd7, 0xe7, 0x6a, 0x15, 0xe6, 0xd0, 0x54, 0x8d, 0xb7, + 0x1c, 0xc1, 0xbe, 0x0b, 0xb7, 0x2c, 0x23, 0x77, 0x7c, 0x1f, 0x2a, 0x6a, 0x71, 0x4c, 0x1a, 0xaf, + 0x95, 0x1d, 0xd7, 0x78, 0x2b, 0x37, 0xac, 0x98, 0xe1, 0x67, 0xf0, 0x82, 0x3d, 0xbc, 0xc2, 0xc6, + 0x96, 0xea, 0x4f, 0x1e, 0x2c, 0x14, 0x07, 0x5f, 0x61, 0x71, 0x6a, 0x34, 0x8b, 0xe3, 0xcb, 0x34, + 0x34, 0x67, 0xdd, 0x13, 0xe9, 0xa7, 0xb4, 0xc3, 0x08, 0x29, 0x6c, 0xe1, 0xbc, 0x59, 0xb3, 0xba, + 0xb1, 0x6d, 0x38, 0xb9, 0xed, 0xb7, 0x60, 0xee, 0x40, 0xa4, 0xfb, 0xea, 0x67, 0x67, 0x52, 0x79, + 0xbd, 0x6c, 0x7d, 0x4f, 0xff, 0x2e, 0x8d, 0xfb, 0xd9, 0x03, 0x3d, 0x23, 0xfc, 0x02, 0x5e, 0xb2, + 0x51, 0x58, 0xe9, 0x71, 0xc5, 0xfc, 0x9b, 0x07, 0xb7, 0x07, 0x66, 0x3b, 0x2c, 0x4f, 0xfd, 0x1f, + 0xcb, 0xe3, 0xcb, 0x7c, 0xdd, 0x34, 0xc4, 0x07, 0x09, 0xcf, 0xc8, 0x22, 0xcc, 0xd2, 0x56, 0x2b, + 0x65, 0x52, 0x9a, 0xcc, 0xed, 0x63, 0x58, 0x35, 0x2d, 0xa1, 0x68, 0xf9, 0x01, 0x08, 0x54, 0x54, + 0x93, 0x21, 0x77, 0xae, 0x8e, 0x7f, 0x17, 0x6b, 0x40, 0x71, 0xc7, 0xb7, 0xb0, 0x3f, 0x17, 0x6a, + 0x00, 0x27, 0x17, 0x37, 0xd6, 0xd8, 0x70, 0x6c, 0xac, 0xa2, 0xdb, 0x8d, 0x55, 0xcc, 0xf1, 0xa5, + 0x77, 0x6c, 0xea, 0xfa, 0x21, 0x97, 0xd9, 0xc7, 0xc7, 0x09, 0x6b, 0xe9, 0xea, 0x73, 0xe6, 0x38, + 0x90, 0xc6, 0xe4, 0x73, 0xa7, 0xf1, 0xab, 0x07, 0x4b, 0x57, 0x28, 0xe7, 0x99, 0xec, 0xc2, 0x34, + 0xde, 0x5f, 0xa3, 0x75, 0xa3, 0xe6, 0x8e, 0x2d, 0x96, 0x07, 0xbf, 0x00, 0x4c, 0xa3, 0x3b, 0x72, + 0x0c, 0x33, 0xfa, 0x62, 0x22, 0xcb, 0x65, 0x0b, 0x85, 0x9b, 0xce, 0x5f, 0x1f, 0x0a, 0x5b, 0x95, + 0xb0, 0xfa, 0xdd, 0x1f, 0xff, 0x3c, 0x99, 0x5c, 0x23, 0x2b, 0xf1, 0x57, 0xb4, 0xf9, 0x35, 0xed, + 0xc4, 0xfa, 0xad, 0xed, 0xc1, 0x3b, 0x9f, 0x9c, 0x40, 0x05, 0x2f, 0xbd, 0x25, 0xc7, 0x5c, 0x05, + 0xfa, 0x77, 0x87, 0x80, 0xb9, 0x64, 0x84, 0x92, 0x9b, 0x64, 0xc3, 0x29, 0x89, 0xe9, 0xc5, 0x67, + 0x58, 0xfb, 0xe7, 0xe4, 0x5b, 0x98, 0xcb, 0xef, 0xc0, 0x15, 0x87, 0x80, 0x25, 0xf8, 0xd5, 0x6b, + 0x08, 0xb9, 0x8b, 0x0d, 0x74, 0xb1, 0x4a, 0x82, 0xe1, 0x2e, 0x48, 0x06, 0x53, 0xea, 0x4a, 0xf2, + 0x1d, 0x73, 0x6b, 0xbc, 0xe5, 0x87, 0x6e, 0x2c, 0x97, 0xdb, 0x46, 0xb9, 0x2a, 0x59, 0x77, 0xca, + 0xa9, 0xea, 0xcf, 0xcf, 0x7c, 0x02, 0xb3, 0xf6, 0x82, 0x0a, 0xdc, 0x27, 0x52, 0xb8, 0xbf, 0x31, + 0x1c, 0xcf, 0x1d, 0xac, 0xa3, 0x83, 0x15, 0xb2, 0x3c, 0xd4, 0x01, 0xf9, 0xde, 0x83, 0x59, 0x5b, + 0xda, 0x2e, 0x69, 0x83, 0x3b, 0xa5, 0x07, 0x8a, 0x39, 0xbc, 0x8f, 0xd2, 0xf7, 0xc8, 0xa6, 0x53, + 0xda, 0xf6, 0x76, 0x7c, 0xa6, 0x52, 0x3f, 0x27, 0x3f, 0x78, 0x00, 0x85, 0xdb, 0x63, 0xcd, 0x7d, + 0x46, 0xeb, 0x65, 0xeb, 0x5a, 0x4a, 0x6e, 0x67, 0x0b, 0xed, 0xdc, 0x25, 0x6b, 0xd7, 0xda, 0x21, + 0xa7, 0x50, 0xc1, 0x22, 0x77, 0x6d, 0xbd, 0x02, 0x9d, 0x5b, 0x5f, 0xec, 0xf6, 0x30, 0x46, 0xd1, + 0x2d, 0x52, 0x75, 0x8a, 0xaa, 0x26, 0x8d, 0xcf, 0x4c, 0xb1, 0x9d, 0x93, 0x33, 0x5c, 0x7b, 0xdd, + 0xf9, 0x43, 0xd6, 0x1e, 0x09, 0xc3, 0xd6, 0xbe, 0xaf, 0xdb, 0x47, 0xd8, 0x02, 0x2c, 0xf4, 0xdf, + 0x3d, 0x78, 0x71, 0xa0, 0x83, 0x5d, 0x85, 0xd2, 0x4f, 0xf3, 0xb7, 0x47, 0xa2, 0xe5, 0x7e, 0xde, + 0x46, 0x3f, 0x6f, 0x90, 0x5d, 0xa7, 0x9f, 0x0e, 0x97, 0xd9, 0xbe, 0x50, 0x6f, 0xee, 0x9b, 0x5e, + 0xb0, 0x11, 0xd5, 0xde, 0x7f, 0x7a, 0x11, 0x78, 0xcf, 0x2e, 0x02, 0xef, 0xef, 0x8b, 0xc0, 0xfb, + 0xf1, 0x32, 0x98, 0x78, 0x76, 0x19, 0x4c, 0xfc, 0x79, 0x19, 0x4c, 0x7c, 0x19, 0xb5, 0x79, 0x76, + 0x78, 0xd4, 0x88, 0x9a, 0xa2, 0x6b, 0x06, 0x3f, 0xa4, 0x0d, 0xd9, 0x3f, 0xfc, 0x04, 0xc7, 0x67, + 0xa7, 0x3d, 0x26, 0x1b, 0x33, 0xf8, 0xcf, 0xc3, 0xee, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5f, + 0x1a, 0x6c, 0x79, 0x83, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1057,25 +1055,25 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Queries a Name by index. - Name(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) + Name(ctx context.Context, in *QueryName, opts ...grpc.CallOption) (*QueryNameResponse, error) // Queries a list of Names. - AllNames(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) + AllNames(ctx context.Context, in *QueryAllNames, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) // Queries a Bid by index. - Bid(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) + Bid(ctx context.Context, in *QueryBid, opts ...grpc.CallOption) (*QueryBidResponse, error) // Queries a list of Bids. - AllBids(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) + AllBids(ctx context.Context, in *QueryAllBids, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) // Queries a Listing by index. - ForSale(ctx context.Context, in *QueryForSaleRequest, opts ...grpc.CallOption) (*QueryForSaleResponse, error) + ForSale(ctx context.Context, in *QueryForSale, opts ...grpc.CallOption) (*QueryForSaleResponse, error) // Queries all Listings. - AllForSale(ctx context.Context, in *QueryAllForSaleRequest, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) + AllForSale(ctx context.Context, in *QueryAllForSale, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) // Queries a Init by index. - Init(ctx context.Context, in *QueryInitRequest, opts ...grpc.CallOption) (*QueryInitResponse, error) + Init(ctx context.Context, in *QueryInit, opts ...grpc.CallOption) (*QueryInitResponse, error) // Queries a list of Init items. - AllInits(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) + AllInits(ctx context.Context, in *QueryAllInits, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) // Queries a list of ListOwnedNames items. - ListOwnedNames(ctx context.Context, in *QueryListOwnedNamesRequest, opts ...grpc.CallOption) (*QueryListOwnedNamesResponse, error) + ListOwnedNames(ctx context.Context, in *QueryListOwnedNames, opts ...grpc.CallOption) (*QueryListOwnedNamesResponse, error) } type queryClient struct { @@ -1086,7 +1084,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { +func (c *queryClient) Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Params", in, out, opts...) if err != nil { @@ -1095,7 +1093,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) Name(ctx context.Context, in *QueryNameRequest, opts ...grpc.CallOption) (*QueryNameResponse, error) { +func (c *queryClient) Name(ctx context.Context, in *QueryName, opts ...grpc.CallOption) (*QueryNameResponse, error) { out := new(QueryNameResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Name", in, out, opts...) if err != nil { @@ -1104,7 +1102,7 @@ func (c *queryClient) Name(ctx context.Context, in *QueryNameRequest, opts ...gr return out, nil } -func (c *queryClient) AllNames(ctx context.Context, in *QueryAllNamesRequest, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) { +func (c *queryClient) AllNames(ctx context.Context, in *QueryAllNames, opts ...grpc.CallOption) (*QueryAllNamesResponse, error) { out := new(QueryAllNamesResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllNames", in, out, opts...) if err != nil { @@ -1113,7 +1111,7 @@ func (c *queryClient) AllNames(ctx context.Context, in *QueryAllNamesRequest, op return out, nil } -func (c *queryClient) Bid(ctx context.Context, in *QueryBidRequest, opts ...grpc.CallOption) (*QueryBidResponse, error) { +func (c *queryClient) Bid(ctx context.Context, in *QueryBid, opts ...grpc.CallOption) (*QueryBidResponse, error) { out := new(QueryBidResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Bid", in, out, opts...) if err != nil { @@ -1122,7 +1120,7 @@ func (c *queryClient) Bid(ctx context.Context, in *QueryBidRequest, opts ...grpc return out, nil } -func (c *queryClient) AllBids(ctx context.Context, in *QueryAllBidsRequest, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) { +func (c *queryClient) AllBids(ctx context.Context, in *QueryAllBids, opts ...grpc.CallOption) (*QueryAllBidsResponse, error) { out := new(QueryAllBidsResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllBids", in, out, opts...) if err != nil { @@ -1131,7 +1129,7 @@ func (c *queryClient) AllBids(ctx context.Context, in *QueryAllBidsRequest, opts return out, nil } -func (c *queryClient) ForSale(ctx context.Context, in *QueryForSaleRequest, opts ...grpc.CallOption) (*QueryForSaleResponse, error) { +func (c *queryClient) ForSale(ctx context.Context, in *QueryForSale, opts ...grpc.CallOption) (*QueryForSaleResponse, error) { out := new(QueryForSaleResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ForSale", in, out, opts...) if err != nil { @@ -1140,7 +1138,7 @@ func (c *queryClient) ForSale(ctx context.Context, in *QueryForSaleRequest, opts return out, nil } -func (c *queryClient) AllForSale(ctx context.Context, in *QueryAllForSaleRequest, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) { +func (c *queryClient) AllForSale(ctx context.Context, in *QueryAllForSale, opts ...grpc.CallOption) (*QueryAllForSaleResponse, error) { out := new(QueryAllForSaleResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllForSale", in, out, opts...) if err != nil { @@ -1149,7 +1147,7 @@ func (c *queryClient) AllForSale(ctx context.Context, in *QueryAllForSaleRequest return out, nil } -func (c *queryClient) Init(ctx context.Context, in *QueryInitRequest, opts ...grpc.CallOption) (*QueryInitResponse, error) { +func (c *queryClient) Init(ctx context.Context, in *QueryInit, opts ...grpc.CallOption) (*QueryInitResponse, error) { out := new(QueryInitResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/Init", in, out, opts...) if err != nil { @@ -1158,7 +1156,7 @@ func (c *queryClient) Init(ctx context.Context, in *QueryInitRequest, opts ...gr return out, nil } -func (c *queryClient) AllInits(ctx context.Context, in *QueryAllInitsRequest, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) { +func (c *queryClient) AllInits(ctx context.Context, in *QueryAllInits, opts ...grpc.CallOption) (*QueryAllInitsResponse, error) { out := new(QueryAllInitsResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/AllInits", in, out, opts...) if err != nil { @@ -1167,7 +1165,7 @@ func (c *queryClient) AllInits(ctx context.Context, in *QueryAllInitsRequest, op return out, nil } -func (c *queryClient) ListOwnedNames(ctx context.Context, in *QueryListOwnedNamesRequest, opts ...grpc.CallOption) (*QueryListOwnedNamesResponse, error) { +func (c *queryClient) ListOwnedNames(ctx context.Context, in *QueryListOwnedNames, opts ...grpc.CallOption) (*QueryListOwnedNamesResponse, error) { out := new(QueryListOwnedNamesResponse) err := c.cc.Invoke(ctx, "/canine_chain.rns.Query/ListOwnedNames", in, out, opts...) if err != nil { @@ -1179,59 +1177,59 @@ func (c *queryClient) ListOwnedNames(ctx context.Context, in *QueryListOwnedName // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + Params(context.Context, *QueryParams) (*QueryParamsResponse, error) // Queries a Name by index. - Name(context.Context, *QueryNameRequest) (*QueryNameResponse, error) + Name(context.Context, *QueryName) (*QueryNameResponse, error) // Queries a list of Names. - AllNames(context.Context, *QueryAllNamesRequest) (*QueryAllNamesResponse, error) + AllNames(context.Context, *QueryAllNames) (*QueryAllNamesResponse, error) // Queries a Bid by index. - Bid(context.Context, *QueryBidRequest) (*QueryBidResponse, error) + Bid(context.Context, *QueryBid) (*QueryBidResponse, error) // Queries a list of Bids. - AllBids(context.Context, *QueryAllBidsRequest) (*QueryAllBidsResponse, error) + AllBids(context.Context, *QueryAllBids) (*QueryAllBidsResponse, error) // Queries a Listing by index. - ForSale(context.Context, *QueryForSaleRequest) (*QueryForSaleResponse, error) + ForSale(context.Context, *QueryForSale) (*QueryForSaleResponse, error) // Queries all Listings. - AllForSale(context.Context, *QueryAllForSaleRequest) (*QueryAllForSaleResponse, error) + AllForSale(context.Context, *QueryAllForSale) (*QueryAllForSaleResponse, error) // Queries a Init by index. - Init(context.Context, *QueryInitRequest) (*QueryInitResponse, error) + Init(context.Context, *QueryInit) (*QueryInitResponse, error) // Queries a list of Init items. - AllInits(context.Context, *QueryAllInitsRequest) (*QueryAllInitsResponse, error) + AllInits(context.Context, *QueryAllInits) (*QueryAllInitsResponse, error) // Queries a list of ListOwnedNames items. - ListOwnedNames(context.Context, *QueryListOwnedNamesRequest) (*QueryListOwnedNamesResponse, error) + ListOwnedNames(context.Context, *QueryListOwnedNames) (*QueryListOwnedNamesResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) Name(ctx context.Context, req *QueryNameRequest) (*QueryNameResponse, error) { +func (*UnimplementedQueryServer) Name(ctx context.Context, req *QueryName) (*QueryNameResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Name not implemented") } -func (*UnimplementedQueryServer) AllNames(ctx context.Context, req *QueryAllNamesRequest) (*QueryAllNamesResponse, error) { +func (*UnimplementedQueryServer) AllNames(ctx context.Context, req *QueryAllNames) (*QueryAllNamesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllNames not implemented") } -func (*UnimplementedQueryServer) Bid(ctx context.Context, req *QueryBidRequest) (*QueryBidResponse, error) { +func (*UnimplementedQueryServer) Bid(ctx context.Context, req *QueryBid) (*QueryBidResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Bid not implemented") } -func (*UnimplementedQueryServer) AllBids(ctx context.Context, req *QueryAllBidsRequest) (*QueryAllBidsResponse, error) { +func (*UnimplementedQueryServer) AllBids(ctx context.Context, req *QueryAllBids) (*QueryAllBidsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllBids not implemented") } -func (*UnimplementedQueryServer) ForSale(ctx context.Context, req *QueryForSaleRequest) (*QueryForSaleResponse, error) { +func (*UnimplementedQueryServer) ForSale(ctx context.Context, req *QueryForSale) (*QueryForSaleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ForSale not implemented") } -func (*UnimplementedQueryServer) AllForSale(ctx context.Context, req *QueryAllForSaleRequest) (*QueryAllForSaleResponse, error) { +func (*UnimplementedQueryServer) AllForSale(ctx context.Context, req *QueryAllForSale) (*QueryAllForSaleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllForSale not implemented") } -func (*UnimplementedQueryServer) Init(ctx context.Context, req *QueryInitRequest) (*QueryInitResponse, error) { +func (*UnimplementedQueryServer) Init(ctx context.Context, req *QueryInit) (*QueryInitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Init not implemented") } -func (*UnimplementedQueryServer) AllInits(ctx context.Context, req *QueryAllInitsRequest) (*QueryAllInitsResponse, error) { +func (*UnimplementedQueryServer) AllInits(ctx context.Context, req *QueryAllInits) (*QueryAllInitsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllInits not implemented") } -func (*UnimplementedQueryServer) ListOwnedNames(ctx context.Context, req *QueryListOwnedNamesRequest) (*QueryListOwnedNamesResponse, error) { +func (*UnimplementedQueryServer) ListOwnedNames(ctx context.Context, req *QueryListOwnedNames) (*QueryListOwnedNamesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListOwnedNames not implemented") } @@ -1240,7 +1238,7 @@ func RegisterQueryServer(s grpc1.Server, srv QueryServer) { } func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) + in := new(QueryParams) if err := dec(in); err != nil { return nil, err } @@ -1252,13 +1250,13 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.rns.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParams)) } return interceptor(ctx, in, info, handler) } func _Query_Name_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryNameRequest) + in := new(QueryName) if err := dec(in); err != nil { return nil, err } @@ -1270,13 +1268,13 @@ func _Query_Name_Handler(srv interface{}, ctx context.Context, dec func(interfac FullMethod: "/canine_chain.rns.Query/Name", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Name(ctx, req.(*QueryNameRequest)) + return srv.(QueryServer).Name(ctx, req.(*QueryName)) } return interceptor(ctx, in, info, handler) } func _Query_AllNames_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllNamesRequest) + in := new(QueryAllNames) if err := dec(in); err != nil { return nil, err } @@ -1288,13 +1286,13 @@ func _Query_AllNames_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.rns.Query/AllNames", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllNames(ctx, req.(*QueryAllNamesRequest)) + return srv.(QueryServer).AllNames(ctx, req.(*QueryAllNames)) } return interceptor(ctx, in, info, handler) } func _Query_Bid_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryBidRequest) + in := new(QueryBid) if err := dec(in); err != nil { return nil, err } @@ -1306,13 +1304,13 @@ func _Query_Bid_Handler(srv interface{}, ctx context.Context, dec func(interface FullMethod: "/canine_chain.rns.Query/Bid", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Bid(ctx, req.(*QueryBidRequest)) + return srv.(QueryServer).Bid(ctx, req.(*QueryBid)) } return interceptor(ctx, in, info, handler) } func _Query_AllBids_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllBidsRequest) + in := new(QueryAllBids) if err := dec(in); err != nil { return nil, err } @@ -1324,13 +1322,13 @@ func _Query_AllBids_Handler(srv interface{}, ctx context.Context, dec func(inter FullMethod: "/canine_chain.rns.Query/AllBids", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllBids(ctx, req.(*QueryAllBidsRequest)) + return srv.(QueryServer).AllBids(ctx, req.(*QueryAllBids)) } return interceptor(ctx, in, info, handler) } func _Query_ForSale_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryForSaleRequest) + in := new(QueryForSale) if err := dec(in); err != nil { return nil, err } @@ -1342,13 +1340,13 @@ func _Query_ForSale_Handler(srv interface{}, ctx context.Context, dec func(inter FullMethod: "/canine_chain.rns.Query/ForSale", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ForSale(ctx, req.(*QueryForSaleRequest)) + return srv.(QueryServer).ForSale(ctx, req.(*QueryForSale)) } return interceptor(ctx, in, info, handler) } func _Query_AllForSale_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllForSaleRequest) + in := new(QueryAllForSale) if err := dec(in); err != nil { return nil, err } @@ -1360,13 +1358,13 @@ func _Query_AllForSale_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.rns.Query/AllForSale", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllForSale(ctx, req.(*QueryAllForSaleRequest)) + return srv.(QueryServer).AllForSale(ctx, req.(*QueryAllForSale)) } return interceptor(ctx, in, info, handler) } func _Query_Init_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryInitRequest) + in := new(QueryInit) if err := dec(in); err != nil { return nil, err } @@ -1378,13 +1376,13 @@ func _Query_Init_Handler(srv interface{}, ctx context.Context, dec func(interfac FullMethod: "/canine_chain.rns.Query/Init", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Init(ctx, req.(*QueryInitRequest)) + return srv.(QueryServer).Init(ctx, req.(*QueryInit)) } return interceptor(ctx, in, info, handler) } func _Query_AllInits_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllInitsRequest) + in := new(QueryAllInits) if err := dec(in); err != nil { return nil, err } @@ -1396,13 +1394,13 @@ func _Query_AllInits_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.rns.Query/AllInits", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllInits(ctx, req.(*QueryAllInitsRequest)) + return srv.(QueryServer).AllInits(ctx, req.(*QueryAllInits)) } return interceptor(ctx, in, info, handler) } func _Query_ListOwnedNames_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryListOwnedNamesRequest) + in := new(QueryListOwnedNames) if err := dec(in); err != nil { return nil, err } @@ -1414,7 +1412,7 @@ func _Query_ListOwnedNames_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: "/canine_chain.rns.Query/ListOwnedNames", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ListOwnedNames(ctx, req.(*QueryListOwnedNamesRequest)) + return srv.(QueryServer).ListOwnedNames(ctx, req.(*QueryListOwnedNames)) } return interceptor(ctx, in, info, handler) } @@ -1468,7 +1466,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Metadata: "canine_chain/rns/query.proto", } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1478,12 +1476,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1524,7 +1522,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryNameRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryName) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1534,12 +1532,12 @@ func (m *QueryNameRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryNameRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryName) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryNameRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryName) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1587,7 +1585,7 @@ func (m *QueryNameResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllNamesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllNames) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1597,12 +1595,12 @@ func (m *QueryAllNamesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllNamesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllNames) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllNames) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1671,7 +1669,7 @@ func (m *QueryAllNamesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryBidRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryBid) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1681,12 +1679,12 @@ func (m *QueryBidRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryBidRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryBid) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryBidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryBid) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1734,7 +1732,7 @@ func (m *QueryBidResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllBidsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllBids) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1744,12 +1742,12 @@ func (m *QueryAllBidsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllBidsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllBids) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllBidsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllBids) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1818,7 +1816,7 @@ func (m *QueryAllBidsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryForSale) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1828,12 +1826,12 @@ func (m *QueryForSaleRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryForSaleRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryForSale) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryForSale) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1881,7 +1879,7 @@ func (m *QueryForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllForSaleRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllForSale) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1891,12 +1889,12 @@ func (m *QueryAllForSaleRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllForSaleRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllForSale) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllForSaleRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllForSale) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1965,7 +1963,7 @@ func (m *QueryAllForSaleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryInitRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryInit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1975,12 +1973,12 @@ func (m *QueryInitRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryInitRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryInit) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryInitRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryInit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2028,7 +2026,7 @@ func (m *QueryInitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllInitsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllInits) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2038,12 +2036,12 @@ func (m *QueryAllInitsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllInitsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllInits) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllInitsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllInits) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2112,7 +2110,7 @@ func (m *QueryAllInitsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryListOwnedNamesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryListOwnedNames) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2122,12 +2120,12 @@ func (m *QueryListOwnedNamesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryListOwnedNamesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryListOwnedNames) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryListOwnedNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryListOwnedNames) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2214,7 +2212,7 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryParams) Size() (n int) { if m == nil { return 0 } @@ -2234,7 +2232,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryNameRequest) Size() (n int) { +func (m *QueryName) Size() (n int) { if m == nil { return 0 } @@ -2258,7 +2256,7 @@ func (m *QueryNameResponse) Size() (n int) { return n } -func (m *QueryAllNamesRequest) Size() (n int) { +func (m *QueryAllNames) Size() (n int) { if m == nil { return 0 } @@ -2290,7 +2288,7 @@ func (m *QueryAllNamesResponse) Size() (n int) { return n } -func (m *QueryBidRequest) Size() (n int) { +func (m *QueryBid) Size() (n int) { if m == nil { return 0 } @@ -2314,7 +2312,7 @@ func (m *QueryBidResponse) Size() (n int) { return n } -func (m *QueryAllBidsRequest) Size() (n int) { +func (m *QueryAllBids) Size() (n int) { if m == nil { return 0 } @@ -2346,7 +2344,7 @@ func (m *QueryAllBidsResponse) Size() (n int) { return n } -func (m *QueryForSaleRequest) Size() (n int) { +func (m *QueryForSale) Size() (n int) { if m == nil { return 0 } @@ -2370,7 +2368,7 @@ func (m *QueryForSaleResponse) Size() (n int) { return n } -func (m *QueryAllForSaleRequest) Size() (n int) { +func (m *QueryAllForSale) Size() (n int) { if m == nil { return 0 } @@ -2402,7 +2400,7 @@ func (m *QueryAllForSaleResponse) Size() (n int) { return n } -func (m *QueryInitRequest) Size() (n int) { +func (m *QueryInit) Size() (n int) { if m == nil { return 0 } @@ -2427,7 +2425,7 @@ func (m *QueryInitResponse) Size() (n int) { return n } -func (m *QueryAllInitsRequest) Size() (n int) { +func (m *QueryAllInits) Size() (n int) { if m == nil { return 0 } @@ -2459,7 +2457,7 @@ func (m *QueryAllInitsResponse) Size() (n int) { return n } -func (m *QueryListOwnedNamesRequest) Size() (n int) { +func (m *QueryListOwnedNames) Size() (n int) { if m == nil { return 0 } @@ -2501,7 +2499,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2524,10 +2522,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -2634,7 +2632,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryNameRequest) Unmarshal(dAtA []byte) error { +func (m *QueryName) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2657,10 +2655,10 @@ func (m *QueryNameRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryNameRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryName: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryNameRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryName: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2799,7 +2797,7 @@ func (m *QueryNameResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllNamesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllNames) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2822,10 +2820,10 @@ func (m *QueryAllNamesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllNamesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllNames: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllNamesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllNames: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3005,7 +3003,7 @@ func (m *QueryAllNamesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryBidRequest) Unmarshal(dAtA []byte) error { +func (m *QueryBid) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3028,10 +3026,10 @@ func (m *QueryBidRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryBidRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryBid: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryBidRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryBid: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3170,7 +3168,7 @@ func (m *QueryBidResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllBidsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllBids) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3193,10 +3191,10 @@ func (m *QueryAllBidsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllBidsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllBids: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllBidsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllBids: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3376,7 +3374,7 @@ func (m *QueryAllBidsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryForSaleRequest) Unmarshal(dAtA []byte) error { +func (m *QueryForSale) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3399,10 +3397,10 @@ func (m *QueryForSaleRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryForSaleRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryForSale: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryForSaleRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryForSale: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3541,7 +3539,7 @@ func (m *QueryForSaleResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllForSaleRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllForSale) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3564,10 +3562,10 @@ func (m *QueryAllForSaleRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllForSaleRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllForSale: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllForSaleRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllForSale: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3747,7 +3745,7 @@ func (m *QueryAllForSaleResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryInitRequest) Unmarshal(dAtA []byte) error { +func (m *QueryInit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3770,10 +3768,10 @@ func (m *QueryInitRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryInitRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryInit: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryInitRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryInit: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3899,7 +3897,7 @@ func (m *QueryInitResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInitsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllInits) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3922,10 +3920,10 @@ func (m *QueryAllInitsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInitsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInits: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInitsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInits: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4105,7 +4103,7 @@ func (m *QueryAllInitsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryListOwnedNamesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryListOwnedNames) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4128,10 +4126,10 @@ func (m *QueryListOwnedNamesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryListOwnedNamesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryListOwnedNames: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryListOwnedNamesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryListOwnedNames: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/rns/types/query.pb.gw.go b/x/rns/types/query.pb.gw.go index ac9568d78..6b7abaf7e 100644 --- a/x/rns/types/query.pb.gw.go +++ b/x/rns/types/query.pb.gw.go @@ -34,7 +34,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -43,7 +43,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -52,7 +52,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryNameRequest + var protoReq QueryName var metadata runtime.ServerMetadata var ( @@ -79,7 +79,7 @@ func request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, clie } func local_request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryNameRequest + var protoReq QueryName var metadata runtime.ServerMetadata var ( @@ -110,7 +110,7 @@ var ( ) func request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllNamesRequest + var protoReq QueryAllNames var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -126,7 +126,7 @@ func request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllNamesRequest + var protoReq QueryAllNames var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -142,7 +142,7 @@ func local_request_Query_AllNames_0(ctx context.Context, marshaler runtime.Marsh } func request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryBidRequest + var protoReq QueryBid var metadata runtime.ServerMetadata var ( @@ -169,7 +169,7 @@ func request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, clien } func local_request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryBidRequest + var protoReq QueryBid var metadata runtime.ServerMetadata var ( @@ -200,7 +200,7 @@ var ( ) func request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllBidsRequest + var protoReq QueryAllBids var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -216,7 +216,7 @@ func request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marshaler, c } func local_request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllBidsRequest + var protoReq QueryAllBids var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -232,7 +232,7 @@ func local_request_Query_AllBids_0(ctx context.Context, marshaler runtime.Marsha } func request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryForSaleRequest + var protoReq QueryForSale var metadata runtime.ServerMetadata var ( @@ -259,7 +259,7 @@ func request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marshaler, c } func local_request_Query_ForSale_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryForSaleRequest + var protoReq QueryForSale var metadata runtime.ServerMetadata var ( @@ -290,7 +290,7 @@ var ( ) func request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForSaleRequest + var protoReq QueryAllForSale var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -306,7 +306,7 @@ func request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllForSaleRequest + var protoReq QueryAllForSale var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -322,7 +322,7 @@ func local_request_Query_AllForSale_0(ctx context.Context, marshaler runtime.Mar } func request_Query_Init_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryInitRequest + var protoReq QueryInit var metadata runtime.ServerMetadata var ( @@ -349,7 +349,7 @@ func request_Query_Init_0(ctx context.Context, marshaler runtime.Marshaler, clie } func local_request_Query_Init_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryInitRequest + var protoReq QueryInit var metadata runtime.ServerMetadata var ( @@ -380,7 +380,7 @@ var ( ) func request_Query_AllInits_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllInitsRequest + var protoReq QueryAllInits var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -396,7 +396,7 @@ func request_Query_AllInits_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_AllInits_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllInitsRequest + var protoReq QueryAllInits var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -416,7 +416,7 @@ var ( ) func request_Query_ListOwnedNames_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryListOwnedNamesRequest + var protoReq QueryListOwnedNames var metadata runtime.ServerMetadata var ( @@ -450,7 +450,7 @@ func request_Query_ListOwnedNames_0(ctx context.Context, marshaler runtime.Marsh } func local_request_Query_ListOwnedNames_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryListOwnedNamesRequest + var protoReq QueryListOwnedNames var metadata runtime.ServerMetadata var ( From 29272b44d3af05107df68042ff13a63d026cea3c Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 23:14:08 -0500 Subject: [PATCH 06/14] oracle module query refactor --- proto/canine_chain/oracle/query.proto | 12 +- x/oracle/client/cli/query_feeds.go | 4 +- x/oracle/keeper/grpc_query_feeds.go | 4 +- x/oracle/keeper/grpc_query_params.go | 2 +- x/oracle/keeper/keeper_test.go | 2 +- x/oracle/types/query.pb.go | 233 +++++++++++++------------- x/oracle/types/query.pb.gw.go | 12 +- 7 files changed, 134 insertions(+), 135 deletions(-) diff --git a/proto/canine_chain/oracle/query.proto b/proto/canine_chain/oracle/query.proto index 055cda712..3dd9239ac 100644 --- a/proto/canine_chain/oracle/query.proto +++ b/proto/canine_chain/oracle/query.proto @@ -12,21 +12,21 @@ option go_package = "github.com/jackalLabs/canine-chain/x/oracle/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params(QueryParams) returns (QueryParamsResponse) { option (google.api.http).get = "/jackal/canine-chain/oracle/params"; } - rpc Feed(QueryFeedRequest) returns (QueryFeedResponse) { + rpc Feed(QueryFeed) returns (QueryFeedResponse) { option (google.api.http).get = "/jackal/canine-chain/oracle/feeds/{name}"; } - rpc AllFeeds(QueryAllFeedsRequest) returns (QueryAllFeedsResponse) { + rpc AllFeeds(QueryAllFeeds) returns (QueryAllFeedsResponse) { option (google.api.http).get = "/jackal/canine-chain/oracle/feeds"; } } // QueryParamsRequest is request type for the Query/Params RPC method. -message QueryParamsRequest {} +message QueryParams {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { @@ -34,7 +34,7 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryFeedRequest { +message QueryFeed { string name = 1; } @@ -43,7 +43,7 @@ message QueryFeedResponse { Feed feed = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllFeedsRequest {} +message QueryAllFeeds {} message QueryAllFeedsResponse { // params holds all the parameters of this module. diff --git a/x/oracle/client/cli/query_feeds.go b/x/oracle/client/cli/query_feeds.go index ab7294215..ca2f892f1 100644 --- a/x/oracle/client/cli/query_feeds.go +++ b/x/oracle/client/cli/query_feeds.go @@ -19,7 +19,7 @@ func CmdQueryAllFeeds() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.AllFeeds(context.Background(), &types.QueryAllFeedsRequest{}) + res, err := queryClient.AllFeeds(context.Background(), &types.QueryAllFeeds{}) if err != nil { return err } @@ -43,7 +43,7 @@ func CmdQueryFeed() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Feed(context.Background(), &types.QueryFeedRequest{Name: args[0]}) + res, err := queryClient.Feed(context.Background(), &types.QueryFeed{Name: args[0]}) if err != nil { return err } diff --git a/x/oracle/keeper/grpc_query_feeds.go b/x/oracle/keeper/grpc_query_feeds.go index f783ec331..ba031d9dd 100644 --- a/x/oracle/keeper/grpc_query_feeds.go +++ b/x/oracle/keeper/grpc_query_feeds.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Feed(c context.Context, req *types.QueryFeedRequest) (*types.QueryFeedResponse, error) { +func (k Keeper) Feed(c context.Context, req *types.QueryFeed) (*types.QueryFeedResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -25,7 +25,7 @@ func (k Keeper) Feed(c context.Context, req *types.QueryFeedRequest) (*types.Que return &types.QueryFeedResponse{Feed: feed}, nil } -func (k Keeper) AllFeeds(c context.Context, req *types.QueryAllFeedsRequest) (*types.QueryAllFeedsResponse, error) { +func (k Keeper) AllFeeds(c context.Context, req *types.QueryAllFeeds) (*types.QueryAllFeedsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/oracle/keeper/grpc_query_params.go b/x/oracle/keeper/grpc_query_params.go index ddf47b2f0..f30711809 100644 --- a/x/oracle/keeper/grpc_query_params.go +++ b/x/oracle/keeper/grpc_query_params.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(c context.Context, req *types.QueryParams) (*types.QueryParamsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go index e153b5e8c..8facb8d51 100644 --- a/x/oracle/keeper/keeper_test.go +++ b/x/oracle/keeper/keeper_test.go @@ -75,7 +75,7 @@ func CreateRandomAccounts(numAccs int) []sdk.AccAddress { func (suite *KeeperTestSuite) TestGRPCParams() { suite.SetupSuite() - params, err := suite.queryClient.Params(gocontext.Background(), &types.QueryParamsRequest{}) + params, err := suite.queryClient.Params(gocontext.Background(), &types.QueryParams{}) suite.Require().NoError(err) suite.Require().Equal(params.Params, suite.oracleKeeper.GetParams(suite.ctx)) } diff --git a/x/oracle/types/query.pb.go b/x/oracle/types/query.pb.go index 8e7fe7235..1f80670fd 100644 --- a/x/oracle/types/query.pb.go +++ b/x/oracle/types/query.pb.go @@ -31,21 +31,21 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct { +type QueryParams struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryParams) Reset() { *m = QueryParams{} } +func (m *QueryParams) String() string { return proto.CompactTextString(m) } +func (*QueryParams) ProtoMessage() {} +func (*QueryParams) Descriptor() ([]byte, []int) { return fileDescriptor_2a4eedcae49363dd, []int{0} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -55,17 +55,17 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParams.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryParams) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryParams) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParams.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryParams proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { @@ -113,22 +113,22 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryFeedRequest struct { +type QueryFeed struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } -func (m *QueryFeedRequest) Reset() { *m = QueryFeedRequest{} } -func (m *QueryFeedRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFeedRequest) ProtoMessage() {} -func (*QueryFeedRequest) Descriptor() ([]byte, []int) { +func (m *QueryFeed) Reset() { *m = QueryFeed{} } +func (m *QueryFeed) String() string { return proto.CompactTextString(m) } +func (*QueryFeed) ProtoMessage() {} +func (*QueryFeed) Descriptor() ([]byte, []int) { return fileDescriptor_2a4eedcae49363dd, []int{2} } -func (m *QueryFeedRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFeed) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFeed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFeedRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFeed.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -138,19 +138,19 @@ func (m *QueryFeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *QueryFeedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFeedRequest.Merge(m, src) +func (m *QueryFeed) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeed.Merge(m, src) } -func (m *QueryFeedRequest) XXX_Size() int { +func (m *QueryFeed) XXX_Size() int { return m.Size() } -func (m *QueryFeedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFeedRequest.DiscardUnknown(m) +func (m *QueryFeed) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeed.DiscardUnknown(m) } -var xxx_messageInfo_QueryFeedRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFeed proto.InternalMessageInfo -func (m *QueryFeedRequest) GetName() string { +func (m *QueryFeed) GetName() string { if m != nil { return m.Name } @@ -202,21 +202,21 @@ func (m *QueryFeedResponse) GetFeed() Feed { return Feed{} } -type QueryAllFeedsRequest struct { +type QueryAllFeeds struct { } -func (m *QueryAllFeedsRequest) Reset() { *m = QueryAllFeedsRequest{} } -func (m *QueryAllFeedsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllFeedsRequest) ProtoMessage() {} -func (*QueryAllFeedsRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllFeeds) Reset() { *m = QueryAllFeeds{} } +func (m *QueryAllFeeds) String() string { return proto.CompactTextString(m) } +func (*QueryAllFeeds) ProtoMessage() {} +func (*QueryAllFeeds) Descriptor() ([]byte, []int) { return fileDescriptor_2a4eedcae49363dd, []int{4} } -func (m *QueryAllFeedsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllFeeds) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllFeeds) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllFeedsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllFeeds.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -226,17 +226,17 @@ func (m *QueryAllFeedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllFeedsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllFeedsRequest.Merge(m, src) +func (m *QueryAllFeeds) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllFeeds.Merge(m, src) } -func (m *QueryAllFeedsRequest) XXX_Size() int { +func (m *QueryAllFeeds) XXX_Size() int { return m.Size() } -func (m *QueryAllFeedsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllFeedsRequest.DiscardUnknown(m) +func (m *QueryAllFeeds) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllFeeds.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllFeedsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllFeeds proto.InternalMessageInfo type QueryAllFeedsResponse struct { // params holds all the parameters of this module. @@ -292,49 +292,48 @@ func (m *QueryAllFeedsResponse) GetPagination() *query.PageResponse { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.oracle.QueryParamsRequest") + proto.RegisterType((*QueryParams)(nil), "canine_chain.oracle.QueryParams") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.oracle.QueryParamsResponse") - proto.RegisterType((*QueryFeedRequest)(nil), "canine_chain.oracle.QueryFeedRequest") + proto.RegisterType((*QueryFeed)(nil), "canine_chain.oracle.QueryFeed") proto.RegisterType((*QueryFeedResponse)(nil), "canine_chain.oracle.QueryFeedResponse") - proto.RegisterType((*QueryAllFeedsRequest)(nil), "canine_chain.oracle.QueryAllFeedsRequest") + proto.RegisterType((*QueryAllFeeds)(nil), "canine_chain.oracle.QueryAllFeeds") proto.RegisterType((*QueryAllFeedsResponse)(nil), "canine_chain.oracle.QueryAllFeedsResponse") } func init() { proto.RegisterFile("canine_chain/oracle/query.proto", fileDescriptor_2a4eedcae49363dd) } var fileDescriptor_2a4eedcae49363dd = []byte{ - // 486 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x3d, 0x6f, 0xd4, 0x30, - 0x18, 0x3e, 0xb7, 0xc7, 0x09, 0xcc, 0x02, 0xee, 0x81, 0x4a, 0x40, 0x69, 0x09, 0xd0, 0x5e, 0x4f, - 0xc2, 0xe6, 0xda, 0x89, 0x91, 0x0e, 0x80, 0x04, 0xc3, 0x91, 0x91, 0x05, 0xbd, 0x49, 0x4d, 0x1a, - 0x48, 0xec, 0x34, 0xce, 0x21, 0x2a, 0xc4, 0xc2, 0xc2, 0xc2, 0x80, 0x84, 0xf8, 0x13, 0xfc, 0x92, - 0x8e, 0x95, 0x58, 0x98, 0x10, 0xba, 0xe3, 0x87, 0x20, 0x7f, 0x04, 0xd2, 0x36, 0xe5, 0xba, 0x59, - 0x79, 0x9f, 0x2f, 0xfb, 0x79, 0x83, 0x57, 0x62, 0x10, 0xa9, 0xe0, 0x2f, 0xe2, 0x5d, 0x48, 0x05, - 0x93, 0x25, 0xc4, 0x19, 0x67, 0x7b, 0x13, 0x5e, 0xee, 0xd3, 0xa2, 0x94, 0x95, 0x24, 0x4b, 0x4d, - 0x00, 0xb5, 0x00, 0xaf, 0x9f, 0xc8, 0x44, 0x9a, 0x39, 0xd3, 0x27, 0x0b, 0xf5, 0x6e, 0x24, 0x52, - 0x26, 0x19, 0x67, 0x50, 0xa4, 0x0c, 0x84, 0x90, 0x15, 0x54, 0xa9, 0x14, 0xca, 0x4d, 0x87, 0xb1, - 0x54, 0xb9, 0x54, 0x2c, 0x02, 0xe5, 0x1c, 0xd8, 0x9b, 0x51, 0xc4, 0x2b, 0x18, 0xb1, 0x02, 0x92, - 0x54, 0x18, 0xb0, 0xc3, 0xae, 0xb6, 0xa5, 0x2a, 0xa0, 0x84, 0xbc, 0x56, 0xf3, 0xdb, 0x10, 0x2f, - 0x39, 0xdf, 0xb1, 0xf3, 0xa0, 0x8f, 0xc9, 0x33, 0xed, 0x31, 0x36, 0xa4, 0x90, 0xef, 0x4d, 0xb8, - 0xaa, 0x82, 0x31, 0x5e, 0x3a, 0xf2, 0x55, 0x15, 0x52, 0x28, 0x4e, 0xee, 0xe3, 0x9e, 0x15, 0x5f, - 0x46, 0xab, 0x68, 0x70, 0x71, 0xf3, 0x3a, 0x6d, 0xb9, 0x34, 0xb5, 0xa4, 0xed, 0xee, 0xc1, 0xcf, - 0x95, 0x4e, 0xe8, 0x08, 0xc1, 0x1a, 0xbe, 0x64, 0x14, 0x1f, 0x72, 0xbe, 0xe3, 0x5c, 0x08, 0xc1, - 0x5d, 0x01, 0x39, 0x37, 0x62, 0x17, 0x42, 0x73, 0x0e, 0x1e, 0xe3, 0xcb, 0x0d, 0x9c, 0xf3, 0xdd, - 0xc2, 0x5d, 0x1d, 0xd9, 0xb9, 0x5e, 0x6b, 0x75, 0xd5, 0x04, 0xe7, 0x69, 0xc0, 0xc1, 0x55, 0xdc, - 0x37, 0x4a, 0x0f, 0xb2, 0x4c, 0xcf, 0xfe, 0xde, 0xed, 0x2b, 0xc2, 0x57, 0x8e, 0x0d, 0x4e, 0xd8, - 0x2c, 0x9e, 0xd9, 0x86, 0x3c, 0xc2, 0xf8, 0x5f, 0x2d, 0xcb, 0x0b, 0x26, 0xe1, 0x3a, 0xb5, 0x1d, - 0x52, 0xdd, 0x21, 0xb5, 0x5b, 0xe2, 0x3a, 0xa4, 0x63, 0x48, 0x78, 0xed, 0x18, 0x36, 0xa8, 0x9b, - 0xdf, 0x16, 0xf1, 0x39, 0x93, 0x8b, 0x7c, 0x44, 0xb8, 0x67, 0x1f, 0x91, 0xac, 0xb7, 0x86, 0x38, - 0xd9, 0x98, 0x37, 0x98, 0x0f, 0xb4, 0x9e, 0xc1, 0xf0, 0xc3, 0xf7, 0xdf, 0x5f, 0x16, 0x6e, 0x93, - 0x80, 0xbd, 0x82, 0xf8, 0x35, 0x64, 0xcc, 0x12, 0xef, 0xb6, 0xec, 0x90, 0x4e, 0xd2, 0xd5, 0x37, - 0x26, 0x77, 0x4e, 0x97, 0x6f, 0x34, 0xea, 0xad, 0xcd, 0x83, 0xb9, 0x0c, 0xf7, 0x4c, 0x86, 0x21, - 0x19, 0xfc, 0x2f, 0x83, 0x7e, 0x5e, 0xc5, 0xde, 0xe9, 0xb5, 0x78, 0x4f, 0x3e, 0x21, 0x7c, 0xbe, - 0x2e, 0x8c, 0x6c, 0x9c, 0x6e, 0x73, 0xac, 0x6d, 0x6f, 0x78, 0x16, 0xa8, 0x4b, 0xb5, 0x61, 0x52, - 0xdd, 0x22, 0x37, 0xe7, 0xa6, 0xda, 0x7e, 0x72, 0x30, 0xf5, 0xd1, 0xe1, 0xd4, 0x47, 0xbf, 0xa6, - 0x3e, 0xfa, 0x3c, 0xf3, 0x3b, 0x87, 0x33, 0xbf, 0xf3, 0x63, 0xe6, 0x77, 0x9e, 0x8f, 0x92, 0xb4, - 0xda, 0x9d, 0x44, 0x34, 0x96, 0xb9, 0x93, 0x79, 0x0a, 0x91, 0x3a, 0x2a, 0xf5, 0xb6, 0x16, 0xab, - 0xf6, 0x0b, 0xae, 0xa2, 0x9e, 0xf9, 0x15, 0xb7, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x1c, - 0xe8, 0xe1, 0x64, 0x04, 0x00, 0x00, + // 475 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6b, 0x13, 0x41, + 0x18, 0xce, 0xb4, 0x31, 0xd8, 0x29, 0x45, 0x9c, 0x2a, 0xd4, 0x55, 0x26, 0x71, 0x14, 0x8d, 0x01, + 0x67, 0x4c, 0x7b, 0xf2, 0x68, 0x0f, 0x2a, 0xe8, 0x21, 0xe6, 0xe8, 0x45, 0xde, 0xdd, 0x8e, 0xdb, + 0xd5, 0xcd, 0xcc, 0x9a, 0xd9, 0x8a, 0x45, 0x04, 0x11, 0xbc, 0x0b, 0xd2, 0xff, 0xd4, 0x63, 0xc1, + 0x8b, 0x27, 0x91, 0xc4, 0x1f, 0x22, 0xf3, 0xb1, 0x71, 0x0b, 0xdb, 0xc6, 0xdb, 0xec, 0xbe, 0xcf, + 0xd7, 0xce, 0xf3, 0x2e, 0xee, 0x26, 0xa0, 0x32, 0x25, 0x5f, 0x25, 0xfb, 0x90, 0x29, 0xa1, 0xa7, + 0x90, 0xe4, 0x52, 0xbc, 0x3b, 0x90, 0xd3, 0x43, 0x5e, 0x4c, 0x75, 0xa9, 0xc9, 0x66, 0x1d, 0xc0, + 0x3d, 0x20, 0xba, 0x92, 0xea, 0x54, 0xbb, 0xb9, 0xb0, 0x27, 0x0f, 0x8d, 0x6e, 0xa4, 0x5a, 0xa7, + 0xb9, 0x14, 0x50, 0x64, 0x02, 0x94, 0xd2, 0x25, 0x94, 0x99, 0x56, 0x26, 0x4c, 0x07, 0x89, 0x36, + 0x13, 0x6d, 0x44, 0x0c, 0x26, 0x38, 0x88, 0xf7, 0xc3, 0x58, 0x96, 0x30, 0x14, 0x05, 0xa4, 0x99, + 0x72, 0xe0, 0x80, 0xed, 0x35, 0xa5, 0x2a, 0x60, 0x0a, 0x93, 0x4a, 0x8d, 0x36, 0x21, 0x5e, 0x4b, + 0xb9, 0xe7, 0xe7, 0x6c, 0x03, 0xaf, 0xbf, 0xb0, 0x1e, 0x23, 0x47, 0x62, 0x23, 0xbc, 0x59, 0x7b, + 0x1c, 0x4b, 0x53, 0x68, 0x65, 0x24, 0x79, 0x88, 0x3b, 0x5e, 0x75, 0x0b, 0xf5, 0x50, 0x7f, 0x7d, + 0xfb, 0x3a, 0x6f, 0xf8, 0x5a, 0xee, 0x49, 0xbb, 0xed, 0xe3, 0x5f, 0xdd, 0xd6, 0x38, 0x10, 0x58, + 0x17, 0xaf, 0x39, 0xc5, 0xc7, 0x52, 0xee, 0x11, 0x82, 0xdb, 0x0a, 0x26, 0xd2, 0xa9, 0xac, 0x8d, + 0xdd, 0x99, 0x3d, 0xc5, 0x97, 0x17, 0x80, 0x85, 0xe1, 0x0e, 0x6e, 0xdb, 0x90, 0xc1, 0xee, 0x5a, + 0xa3, 0x9d, 0x25, 0x04, 0x33, 0x07, 0x66, 0x97, 0xf0, 0x86, 0x53, 0x7a, 0x94, 0xe7, 0x76, 0x66, + 0xd8, 0x11, 0xc2, 0x57, 0x4f, 0xbd, 0x69, 0xd0, 0x5f, 0xfd, 0x6f, 0x7d, 0xf2, 0x04, 0xe3, 0x7f, + 0x0d, 0x6c, 0xad, 0xb8, 0x68, 0x77, 0xb9, 0xaf, 0x8b, 0xdb, 0xba, 0xb8, 0x5f, 0x88, 0x50, 0x17, + 0x1f, 0x41, 0x2a, 0x2b, 0xc7, 0x71, 0x8d, 0xba, 0x7d, 0xb4, 0x8a, 0x2f, 0xb8, 0x5c, 0xe4, 0x33, + 0xc2, 0x1d, 0x7f, 0x6d, 0xa4, 0xd7, 0x18, 0xa2, 0xd6, 0x46, 0xd4, 0x5f, 0x86, 0xa8, 0xcc, 0xd8, + 0xe0, 0xcb, 0x8f, 0x3f, 0xdf, 0x57, 0x6e, 0x13, 0x26, 0xde, 0x40, 0xf2, 0x16, 0x72, 0xe1, 0x89, + 0xf7, 0x1b, 0xf6, 0xc4, 0x46, 0x68, 0xbb, 0x72, 0xe8, 0xd9, 0xf2, 0x76, 0x1e, 0xdd, 0x39, 0x7f, + 0xbe, 0x30, 0x7f, 0xe0, 0xcc, 0x07, 0xa4, 0x7f, 0x9e, 0xb9, 0xbd, 0x50, 0x23, 0x3e, 0xda, 0x0d, + 0xf8, 0x44, 0xbe, 0x22, 0x7c, 0xb1, 0xaa, 0x88, 0xb0, 0xb3, 0x6d, 0x2a, 0x4c, 0x34, 0x58, 0x8e, + 0x59, 0xc4, 0xb9, 0xe7, 0xe2, 0xdc, 0x22, 0x37, 0x97, 0xc6, 0xd9, 0x7d, 0x76, 0x3c, 0xa3, 0xe8, + 0x64, 0x46, 0xd1, 0xef, 0x19, 0x45, 0xdf, 0xe6, 0xb4, 0x75, 0x32, 0xa7, 0xad, 0x9f, 0x73, 0xda, + 0x7a, 0x39, 0x4c, 0xb3, 0x72, 0xff, 0x20, 0xe6, 0x89, 0x9e, 0x04, 0x99, 0xe7, 0x10, 0x9b, 0xd3, + 0x52, 0x1f, 0x2a, 0xb1, 0xf2, 0xb0, 0x90, 0x26, 0xee, 0xb8, 0x1f, 0x6c, 0xe7, 0x6f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xa1, 0xda, 0x9c, 0x7f, 0x3a, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -350,9 +349,9 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - Feed(ctx context.Context, in *QueryFeedRequest, opts ...grpc.CallOption) (*QueryFeedResponse, error) - AllFeeds(ctx context.Context, in *QueryAllFeedsRequest, opts ...grpc.CallOption) (*QueryAllFeedsResponse, error) + Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) + Feed(ctx context.Context, in *QueryFeed, opts ...grpc.CallOption) (*QueryFeedResponse, error) + AllFeeds(ctx context.Context, in *QueryAllFeeds, opts ...grpc.CallOption) (*QueryAllFeedsResponse, error) } type queryClient struct { @@ -363,7 +362,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { +func (c *queryClient) Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) err := c.cc.Invoke(ctx, "/canine_chain.oracle.Query/Params", in, out, opts...) if err != nil { @@ -372,7 +371,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) Feed(ctx context.Context, in *QueryFeedRequest, opts ...grpc.CallOption) (*QueryFeedResponse, error) { +func (c *queryClient) Feed(ctx context.Context, in *QueryFeed, opts ...grpc.CallOption) (*QueryFeedResponse, error) { out := new(QueryFeedResponse) err := c.cc.Invoke(ctx, "/canine_chain.oracle.Query/Feed", in, out, opts...) if err != nil { @@ -381,7 +380,7 @@ func (c *queryClient) Feed(ctx context.Context, in *QueryFeedRequest, opts ...gr return out, nil } -func (c *queryClient) AllFeeds(ctx context.Context, in *QueryAllFeedsRequest, opts ...grpc.CallOption) (*QueryAllFeedsResponse, error) { +func (c *queryClient) AllFeeds(ctx context.Context, in *QueryAllFeeds, opts ...grpc.CallOption) (*QueryAllFeedsResponse, error) { out := new(QueryAllFeedsResponse) err := c.cc.Invoke(ctx, "/canine_chain.oracle.Query/AllFeeds", in, out, opts...) if err != nil { @@ -393,22 +392,22 @@ func (c *queryClient) AllFeeds(ctx context.Context, in *QueryAllFeedsRequest, op // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - Feed(context.Context, *QueryFeedRequest) (*QueryFeedResponse, error) - AllFeeds(context.Context, *QueryAllFeedsRequest) (*QueryAllFeedsResponse, error) + Params(context.Context, *QueryParams) (*QueryParamsResponse, error) + Feed(context.Context, *QueryFeed) (*QueryFeedResponse, error) + AllFeeds(context.Context, *QueryAllFeeds) (*QueryAllFeedsResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) Feed(ctx context.Context, req *QueryFeedRequest) (*QueryFeedResponse, error) { +func (*UnimplementedQueryServer) Feed(ctx context.Context, req *QueryFeed) (*QueryFeedResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Feed not implemented") } -func (*UnimplementedQueryServer) AllFeeds(ctx context.Context, req *QueryAllFeedsRequest) (*QueryAllFeedsResponse, error) { +func (*UnimplementedQueryServer) AllFeeds(ctx context.Context, req *QueryAllFeeds) (*QueryAllFeedsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllFeeds not implemented") } @@ -417,7 +416,7 @@ func RegisterQueryServer(s grpc1.Server, srv QueryServer) { } func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) + in := new(QueryParams) if err := dec(in); err != nil { return nil, err } @@ -429,13 +428,13 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.oracle.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParams)) } return interceptor(ctx, in, info, handler) } func _Query_Feed_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFeedRequest) + in := new(QueryFeed) if err := dec(in); err != nil { return nil, err } @@ -447,13 +446,13 @@ func _Query_Feed_Handler(srv interface{}, ctx context.Context, dec func(interfac FullMethod: "/canine_chain.oracle.Query/Feed", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Feed(ctx, req.(*QueryFeedRequest)) + return srv.(QueryServer).Feed(ctx, req.(*QueryFeed)) } return interceptor(ctx, in, info, handler) } func _Query_AllFeeds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllFeedsRequest) + in := new(QueryAllFeeds) if err := dec(in); err != nil { return nil, err } @@ -465,7 +464,7 @@ func _Query_AllFeeds_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.oracle.Query/AllFeeds", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllFeeds(ctx, req.(*QueryAllFeedsRequest)) + return srv.(QueryServer).AllFeeds(ctx, req.(*QueryAllFeeds)) } return interceptor(ctx, in, info, handler) } @@ -491,7 +490,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Metadata: "canine_chain/oracle/query.proto", } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -501,12 +500,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -547,7 +546,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryFeedRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFeed) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -557,12 +556,12 @@ func (m *QueryFeedRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFeedRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFeed) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFeedRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFeed) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -610,7 +609,7 @@ func (m *QueryFeedResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllFeedsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllFeeds) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -620,12 +619,12 @@ func (m *QueryAllFeedsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllFeedsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllFeeds) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllFeedsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllFeeds) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -693,7 +692,7 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryParams) Size() (n int) { if m == nil { return 0 } @@ -713,7 +712,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryFeedRequest) Size() (n int) { +func (m *QueryFeed) Size() (n int) { if m == nil { return 0 } @@ -737,7 +736,7 @@ func (m *QueryFeedResponse) Size() (n int) { return n } -func (m *QueryAllFeedsRequest) Size() (n int) { +func (m *QueryAllFeeds) Size() (n int) { if m == nil { return 0 } @@ -771,7 +770,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -794,10 +793,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -904,7 +903,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFeedRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFeed) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -927,10 +926,10 @@ func (m *QueryFeedRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFeedRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFeed: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFeedRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFeed: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1069,7 +1068,7 @@ func (m *QueryFeedResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllFeedsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllFeeds) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1092,10 +1091,10 @@ func (m *QueryAllFeedsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllFeedsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllFeeds: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllFeedsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllFeeds: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: diff --git a/x/oracle/types/query.pb.gw.go b/x/oracle/types/query.pb.gw.go index 45bfb94c5..1998aac3b 100644 --- a/x/oracle/types/query.pb.gw.go +++ b/x/oracle/types/query.pb.gw.go @@ -34,7 +34,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -43,7 +43,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -52,7 +52,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_Feed_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFeedRequest + var protoReq QueryFeed var metadata runtime.ServerMetadata var ( @@ -79,7 +79,7 @@ func request_Query_Feed_0(ctx context.Context, marshaler runtime.Marshaler, clie } func local_request_Query_Feed_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFeedRequest + var protoReq QueryFeed var metadata runtime.ServerMetadata var ( @@ -106,7 +106,7 @@ func local_request_Query_Feed_0(ctx context.Context, marshaler runtime.Marshaler } func request_Query_AllFeeds_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFeedsRequest + var protoReq QueryAllFeeds var metadata runtime.ServerMetadata msg, err := client.AllFeeds(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -115,7 +115,7 @@ func request_Query_AllFeeds_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_AllFeeds_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFeedsRequest + var protoReq QueryAllFeeds var metadata runtime.ServerMetadata msg, err := server.AllFeeds(ctx, &protoReq) From 53b1c12bdb94bbc8b1456b05277a4e1e4e4b3695 Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 23:18:03 -0500 Subject: [PATCH 07/14] jklmint module query refactor --- proto/canine_chain/jklmint/query.proto | 8 +- x/jklmint/client/cli/query_get_inflation.go | 2 +- x/jklmint/client/cli/query_params.go | 2 +- x/jklmint/keeper/grpc_query_inflation.go | 2 +- x/jklmint/keeper/grpc_query_params.go | 2 +- x/jklmint/keeper/grpc_query_params_test.go | 4 +- x/jklmint/keeper/querier.go | 2 +- x/jklmint/types/keys.go | 4 +- x/jklmint/types/query.pb.go | 163 ++++++++++---------- x/jklmint/types/query.pb.gw.go | 8 +- 10 files changed, 98 insertions(+), 99 deletions(-) diff --git a/proto/canine_chain/jklmint/query.proto b/proto/canine_chain/jklmint/query.proto index 40ba03883..8a468a4ac 100644 --- a/proto/canine_chain/jklmint/query.proto +++ b/proto/canine_chain/jklmint/query.proto @@ -10,18 +10,18 @@ option go_package = "github.com/jackalLabs/canine-chain/x/jklmint/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params(QueryParams) returns (QueryParamsResponse) { option (google.api.http).get = "/cosmos/mint/v1beta1/params"; } // Inflation returns the current minting inflation value. - rpc Inflation(QueryInflationRequest) returns (QueryInflationResponse) { + rpc Inflation(QueryInflation) returns (QueryInflationResponse) { option (google.api.http).get = "/cosmos/mint/v1beta1/inflation"; } } // QueryParamsRequest is request type for the Query/Params RPC method. -message QueryParamsRequest {} +message QueryParams {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { @@ -30,7 +30,7 @@ message QueryParamsResponse { } // QueryInflationRequest is the request type for the Query/Inflation RPC method. -message QueryInflationRequest {} +message QueryInflation {} // QueryInflationResponse is the response type for the Query/Inflation RPC // method. diff --git a/x/jklmint/client/cli/query_get_inflation.go b/x/jklmint/client/cli/query_get_inflation.go index 28188e7ae..b0879673e 100644 --- a/x/jklmint/client/cli/query_get_inflation.go +++ b/x/jklmint/client/cli/query_get_inflation.go @@ -24,7 +24,7 @@ func CmdGetInflation() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryInflationRequest{} + params := &types.QueryInflation{} res, err := queryClient.Inflation(cmd.Context(), params) if err != nil { diff --git a/x/jklmint/client/cli/query_params.go b/x/jklmint/client/cli/query_params.go index 4c20d6ffe..5c2240278 100644 --- a/x/jklmint/client/cli/query_params.go +++ b/x/jklmint/client/cli/query_params.go @@ -19,7 +19,7 @@ func CmdQueryParams() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + res, err := queryClient.Params(context.Background(), &types.QueryParams{}) if err != nil { return err } diff --git a/x/jklmint/keeper/grpc_query_inflation.go b/x/jklmint/keeper/grpc_query_inflation.go index df59b0da0..324651d56 100644 --- a/x/jklmint/keeper/grpc_query_inflation.go +++ b/x/jklmint/keeper/grpc_query_inflation.go @@ -7,7 +7,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/jklmint/types" ) -func (k Keeper) Inflation(c context.Context, _ *types.QueryInflationRequest) (*types.QueryInflationResponse, error) { +func (k Keeper) Inflation(c context.Context, _ *types.QueryInflation) (*types.QueryInflationResponse, error) { ctx := sdk.UnwrapSDKContext(c) inflation, err := k.GetInflation(ctx) diff --git a/x/jklmint/keeper/grpc_query_params.go b/x/jklmint/keeper/grpc_query_params.go index 799e36b6c..d7b538126 100644 --- a/x/jklmint/keeper/grpc_query_params.go +++ b/x/jklmint/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/jklmint/types" ) -func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(c context.Context, _ *types.QueryParams) (*types.QueryParamsResponse, error) { ctx := sdk.UnwrapSDKContext(c) params := k.GetParams(ctx) diff --git a/x/jklmint/keeper/grpc_query_params_test.go b/x/jklmint/keeper/grpc_query_params_test.go index 2b9c1cd98..40c0bec8a 100644 --- a/x/jklmint/keeper/grpc_query_params_test.go +++ b/x/jklmint/keeper/grpc_query_params_test.go @@ -37,11 +37,11 @@ func (suite *MintTestSuite) SetupTest() { func (suite *MintTestSuite) TestGRPCParams() { app, ctx, queryClient := suite.app, suite.ctx, suite.queryClient - params, err := queryClient.Params(gocontext.Background(), &types.QueryParamsRequest{}) + params, err := queryClient.Params(gocontext.Background(), &types.QueryParams{}) suite.Require().NoError(err) suite.Require().Equal(params.Params, app.MintKeeper.GetParams(ctx)) - inflation, err := queryClient.Inflation(gocontext.Background(), &types.QueryInflationRequest{}) + inflation, err := queryClient.Inflation(gocontext.Background(), &types.QueryInflation{}) suite.Require().NoError(err) appInflation, err := app.MintKeeper.GetInflation(ctx) diff --git a/x/jklmint/keeper/querier.go b/x/jklmint/keeper/querier.go index 1fac76093..0ea1bae8e 100644 --- a/x/jklmint/keeper/querier.go +++ b/x/jklmint/keeper/querier.go @@ -16,7 +16,7 @@ func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { case types.QueryParameters: return queryParams(ctx, k, legacyQuerierCdc) - case types.QueryInflation: + case types.QueryInflationKey: return queryInflation(ctx, k, legacyQuerierCdc) default: diff --git a/x/jklmint/types/keys.go b/x/jklmint/types/keys.go index b8d281dc8..6d918abb4 100644 --- a/x/jklmint/types/keys.go +++ b/x/jklmint/types/keys.go @@ -19,8 +19,8 @@ const ( MemStoreKey = "mem_jklmint" // Query endpoints supported by the minting querier - QueryParameters = "parameters" - QueryInflation = "inflation" + QueryParameters = "parameters" + QueryInflationKey = "inflation" ) func KeyPrefix(p string) []byte { diff --git a/x/jklmint/types/query.pb.go b/x/jklmint/types/query.pb.go index ebf78a7c0..4bb08f011 100644 --- a/x/jklmint/types/query.pb.go +++ b/x/jklmint/types/query.pb.go @@ -31,21 +31,21 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct { +type QueryParams struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryParams) Reset() { *m = QueryParams{} } +func (m *QueryParams) String() string { return proto.CompactTextString(m) } +func (*QueryParams) ProtoMessage() {} +func (*QueryParams) Descriptor() ([]byte, []int) { return fileDescriptor_18b2f9a9be818a21, []int{0} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -55,17 +55,17 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParams.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryParams) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryParams) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParams.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryParams proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { @@ -114,21 +114,21 @@ func (m *QueryParamsResponse) GetParams() Params { } // QueryInflationRequest is the request type for the Query/Inflation RPC method. -type QueryInflationRequest struct { +type QueryInflation struct { } -func (m *QueryInflationRequest) Reset() { *m = QueryInflationRequest{} } -func (m *QueryInflationRequest) String() string { return proto.CompactTextString(m) } -func (*QueryInflationRequest) ProtoMessage() {} -func (*QueryInflationRequest) Descriptor() ([]byte, []int) { +func (m *QueryInflation) Reset() { *m = QueryInflation{} } +func (m *QueryInflation) String() string { return proto.CompactTextString(m) } +func (*QueryInflation) ProtoMessage() {} +func (*QueryInflation) Descriptor() ([]byte, []int) { return fileDescriptor_18b2f9a9be818a21, []int{2} } -func (m *QueryInflationRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryInflation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryInflationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryInflation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryInflationRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryInflation.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -138,17 +138,17 @@ func (m *QueryInflationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryInflationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryInflationRequest.Merge(m, src) +func (m *QueryInflation) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryInflation.Merge(m, src) } -func (m *QueryInflationRequest) XXX_Size() int { +func (m *QueryInflation) XXX_Size() int { return m.Size() } -func (m *QueryInflationRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryInflationRequest.DiscardUnknown(m) +func (m *QueryInflation) XXX_DiscardUnknown() { + xxx_messageInfo_QueryInflation.DiscardUnknown(m) } -var xxx_messageInfo_QueryInflationRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryInflation proto.InternalMessageInfo // QueryInflationResponse is the response type for the Query/Inflation RPC // method. @@ -191,41 +191,40 @@ func (m *QueryInflationResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryInflationResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.jklmint.QueryParamsRequest") + proto.RegisterType((*QueryParams)(nil), "canine_chain.jklmint.QueryParams") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.jklmint.QueryParamsResponse") - proto.RegisterType((*QueryInflationRequest)(nil), "canine_chain.jklmint.QueryInflationRequest") + proto.RegisterType((*QueryInflation)(nil), "canine_chain.jklmint.QueryInflation") proto.RegisterType((*QueryInflationResponse)(nil), "canine_chain.jklmint.QueryInflationResponse") } func init() { proto.RegisterFile("canine_chain/jklmint/query.proto", fileDescriptor_18b2f9a9be818a21) } var fileDescriptor_18b2f9a9be818a21 = []byte{ - // 392 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4f, 0xe2, 0x40, - 0x14, 0xc7, 0x5b, 0xb2, 0x4b, 0xc2, 0xec, 0x9e, 0x66, 0xd9, 0x5d, 0x53, 0xb1, 0x60, 0x4d, 0x08, - 0x46, 0xe9, 0x04, 0xbc, 0x79, 0x24, 0x5e, 0x4c, 0x38, 0x08, 0x47, 0x2f, 0x66, 0x5a, 0x87, 0x52, - 0x68, 0x67, 0x0a, 0x33, 0x18, 0xb9, 0xf2, 0x01, 0x8c, 0x89, 0x67, 0xbf, 0x0f, 0x47, 0x12, 0x2f, - 0xc6, 0x03, 0x31, 0xe0, 0x07, 0x31, 0x4c, 0x07, 0x44, 0x6c, 0x0c, 0xa7, 0x36, 0x6f, 0xfe, 0xef, - 0xfd, 0x7f, 0xef, 0x9f, 0x07, 0x0a, 0x2e, 0xa6, 0x3e, 0x25, 0x57, 0x6e, 0x1b, 0xfb, 0x14, 0x75, - 0xba, 0x41, 0xe8, 0x53, 0x81, 0x7a, 0x03, 0xd2, 0x1f, 0xda, 0x51, 0x9f, 0x09, 0x06, 0xb3, 0xeb, - 0x0a, 0x5b, 0x29, 0x8c, 0xac, 0xc7, 0x3c, 0x26, 0x05, 0x68, 0xf1, 0x17, 0x6b, 0x8d, 0x9c, 0xc7, - 0x98, 0x17, 0x10, 0x84, 0x23, 0x1f, 0x61, 0x4a, 0x99, 0xc0, 0xc2, 0x67, 0x94, 0xab, 0xd7, 0xfd, - 0x44, 0xaf, 0x08, 0xf7, 0x71, 0xa8, 0x24, 0x56, 0x16, 0xc0, 0xc6, 0xc2, 0xfb, 0x42, 0x16, 0x9b, - 0xa4, 0x37, 0x20, 0x5c, 0x58, 0x0d, 0xf0, 0xe7, 0x53, 0x95, 0x47, 0x8c, 0x72, 0x02, 0x4f, 0x41, - 0x3a, 0x6e, 0xde, 0xd1, 0x0b, 0x7a, 0xe9, 0x57, 0x35, 0x67, 0x27, 0xa1, 0xda, 0x71, 0x57, 0xed, - 0xc7, 0x78, 0x9a, 0xd7, 0x9a, 0xaa, 0xc3, 0xfa, 0x0f, 0xfe, 0xca, 0x91, 0xe7, 0xb4, 0x15, 0x48, - 0xc8, 0xa5, 0x57, 0x0b, 0xfc, 0xdb, 0x7c, 0x50, 0x76, 0x75, 0x90, 0xf1, 0x97, 0x45, 0xe9, 0xf8, - 0xbb, 0x66, 0x2f, 0x66, 0xbe, 0x4c, 0xf3, 0x45, 0xcf, 0x17, 0xed, 0x81, 0x63, 0xbb, 0x2c, 0x44, - 0x2e, 0xe3, 0x21, 0xe3, 0xea, 0x53, 0xe6, 0xd7, 0x5d, 0x24, 0x86, 0x11, 0xe1, 0xf6, 0x19, 0x71, - 0x9b, 0x1f, 0x03, 0xaa, 0x8f, 0x29, 0xf0, 0x53, 0x1a, 0xc1, 0x91, 0x0e, 0xd2, 0x31, 0x23, 0x2c, - 0x25, 0x6f, 0xf0, 0x35, 0x12, 0xe3, 0x70, 0x0b, 0x65, 0xcc, 0x6d, 0x1d, 0x8c, 0x9e, 0xde, 0x1e, - 0x52, 0x7b, 0x70, 0x77, 0x89, 0x26, 0x63, 0xbf, 0xa9, 0x38, 0x44, 0xe0, 0x8a, 0x8a, 0x1f, 0xde, - 0xe9, 0x20, 0xb3, 0x5a, 0x19, 0x1e, 0x7d, 0x33, 0x7d, 0x33, 0x31, 0xe3, 0x78, 0x3b, 0xb1, 0xa2, - 0x29, 0x4a, 0x9a, 0x02, 0x34, 0x13, 0x69, 0x56, 0xf9, 0xd4, 0xea, 0xe3, 0x99, 0xa9, 0x4f, 0x66, - 0xa6, 0xfe, 0x3a, 0x33, 0xf5, 0xfb, 0xb9, 0xa9, 0x4d, 0xe6, 0xa6, 0xf6, 0x3c, 0x37, 0xb5, 0xcb, - 0xea, 0x5a, 0xd8, 0x1d, 0xec, 0x76, 0x71, 0x50, 0xc7, 0x0e, 0x47, 0x31, 0x44, 0x39, 0x3e, 0xae, - 0xdb, 0xd5, 0x79, 0xc9, 0xf0, 0x9d, 0xb4, 0x3c, 0xaf, 0x93, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x3f, 0xfa, 0x1b, 0xa0, 0xef, 0x02, 0x00, 0x00, + // 384 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0x4e, 0xcc, 0xcb, + 0xcc, 0x4b, 0x8d, 0x4f, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0xcf, 0xca, 0xce, 0xc9, 0xcd, 0xcc, 0x2b, + 0xd1, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0x56, + 0xa1, 0x07, 0x55, 0x21, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa0, 0x0f, 0x62, 0x41, 0xd4, + 0x4a, 0xc9, 0xa4, 0xe7, 0xe7, 0xa7, 0xe7, 0xa4, 0xea, 0x27, 0x16, 0x64, 0xea, 0x27, 0xe6, 0xe5, + 0xe5, 0x97, 0x24, 0x96, 0x64, 0xe6, 0xe7, 0x15, 0x43, 0x65, 0x15, 0xb1, 0xda, 0x55, 0x90, 0x58, + 0x94, 0x98, 0x0b, 0x55, 0xa2, 0xc4, 0xcb, 0xc5, 0x1d, 0x08, 0xb2, 0x3b, 0x00, 0x2c, 0xa8, 0x14, + 0xc8, 0x25, 0x8c, 0xc4, 0x0d, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15, 0xb2, 0xe2, 0x62, + 0x83, 0xe8, 0x92, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd1, 0xc3, 0xe6, 0x46, 0x3d, 0x88, + 0x2e, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x3a, 0x94, 0x04, 0xb8, 0xf8, 0xc0, 0x46, + 0x7a, 0xe6, 0xa5, 0xe5, 0x80, 0x5d, 0xa7, 0x94, 0xc6, 0x25, 0x86, 0x2a, 0x02, 0xb7, 0xc7, 0x87, + 0x8b, 0x33, 0x13, 0x26, 0x08, 0xb6, 0x8a, 0xc7, 0x49, 0x0f, 0x64, 0xd8, 0xad, 0x7b, 0xf2, 0x6a, + 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, + 0xc5, 0x50, 0x4a, 0xb7, 0x38, 0x25, 0x5b, 0xbf, 0xa4, 0xb2, 0x20, 0xb5, 0x58, 0xcf, 0x25, 0x35, + 0x39, 0x08, 0x61, 0x80, 0x51, 0x1f, 0x13, 0x17, 0x2b, 0xd8, 0x22, 0xa1, 0x6a, 0x2e, 0x36, 0x88, + 0xdb, 0x84, 0x14, 0xb1, 0xbb, 0x1c, 0xc9, 0xd3, 0x52, 0x9a, 0x04, 0x95, 0xc0, 0xdc, 0xab, 0xa4, + 0xdc, 0x74, 0xf9, 0xc9, 0x64, 0x26, 0x59, 0x21, 0x69, 0x98, 0x93, 0xc0, 0x01, 0x5c, 0x66, 0x98, + 0x94, 0x5a, 0x92, 0x68, 0x08, 0x0d, 0x68, 0xa1, 0x76, 0x46, 0x2e, 0x4e, 0xb8, 0x57, 0x85, 0x54, + 0xf0, 0x98, 0x0e, 0x57, 0x25, 0xa5, 0x43, 0x8c, 0x2a, 0xb8, 0x33, 0xd4, 0xc0, 0xce, 0x50, 0x10, + 0x92, 0xc3, 0xea, 0x0c, 0x78, 0x80, 0x38, 0xf9, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, + 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, + 0x1c, 0x43, 0x94, 0x11, 0x52, 0xe8, 0x66, 0x25, 0x26, 0x67, 0x27, 0xe6, 0xf8, 0x24, 0x26, 0x15, + 0xeb, 0x43, 0x1c, 0xa1, 0x0b, 0x49, 0x3f, 0x15, 0xf0, 0x14, 0x04, 0x0e, 0xed, 0x24, 0x36, 0x70, + 0x0a, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xef, 0x1b, 0x55, 0xca, 0xd2, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -241,9 +240,9 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Inflation returns the current minting inflation value. - Inflation(ctx context.Context, in *QueryInflationRequest, opts ...grpc.CallOption) (*QueryInflationResponse, error) + Inflation(ctx context.Context, in *QueryInflation, opts ...grpc.CallOption) (*QueryInflationResponse, error) } type queryClient struct { @@ -254,7 +253,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { +func (c *queryClient) Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) err := c.cc.Invoke(ctx, "/canine_chain.jklmint.Query/Params", in, out, opts...) if err != nil { @@ -263,7 +262,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) Inflation(ctx context.Context, in *QueryInflationRequest, opts ...grpc.CallOption) (*QueryInflationResponse, error) { +func (c *queryClient) Inflation(ctx context.Context, in *QueryInflation, opts ...grpc.CallOption) (*QueryInflationResponse, error) { out := new(QueryInflationResponse) err := c.cc.Invoke(ctx, "/canine_chain.jklmint.Query/Inflation", in, out, opts...) if err != nil { @@ -275,19 +274,19 @@ func (c *queryClient) Inflation(ctx context.Context, in *QueryInflationRequest, // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + Params(context.Context, *QueryParams) (*QueryParamsResponse, error) // Inflation returns the current minting inflation value. - Inflation(context.Context, *QueryInflationRequest) (*QueryInflationResponse, error) + Inflation(context.Context, *QueryInflation) (*QueryInflationResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) Inflation(ctx context.Context, req *QueryInflationRequest) (*QueryInflationResponse, error) { +func (*UnimplementedQueryServer) Inflation(ctx context.Context, req *QueryInflation) (*QueryInflationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Inflation not implemented") } @@ -296,7 +295,7 @@ func RegisterQueryServer(s grpc1.Server, srv QueryServer) { } func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) + in := new(QueryParams) if err := dec(in); err != nil { return nil, err } @@ -308,13 +307,13 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.jklmint.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParams)) } return interceptor(ctx, in, info, handler) } func _Query_Inflation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryInflationRequest) + in := new(QueryInflation) if err := dec(in); err != nil { return nil, err } @@ -326,7 +325,7 @@ func _Query_Inflation_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/canine_chain.jklmint.Query/Inflation", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Inflation(ctx, req.(*QueryInflationRequest)) + return srv.(QueryServer).Inflation(ctx, req.(*QueryInflation)) } return interceptor(ctx, in, info, handler) } @@ -348,7 +347,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Metadata: "canine_chain/jklmint/query.proto", } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -358,12 +357,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -404,7 +403,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryInflationRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryInflation) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -414,12 +413,12 @@ func (m *QueryInflationRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryInflationRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryInflation) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryInflationRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryInflation) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -471,7 +470,7 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryParams) Size() (n int) { if m == nil { return 0 } @@ -491,7 +490,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryInflationRequest) Size() (n int) { +func (m *QueryInflation) Size() (n int) { if m == nil { return 0 } @@ -517,7 +516,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -540,10 +539,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -650,7 +649,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryInflationRequest) Unmarshal(dAtA []byte) error { +func (m *QueryInflation) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -673,10 +672,10 @@ func (m *QueryInflationRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryInflationRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryInflation: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryInflationRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryInflation: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: diff --git a/x/jklmint/types/query.pb.gw.go b/x/jklmint/types/query.pb.gw.go index f0eaea3ce..86f6097b4 100644 --- a/x/jklmint/types/query.pb.gw.go +++ b/x/jklmint/types/query.pb.gw.go @@ -34,7 +34,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -43,7 +43,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -52,7 +52,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_Inflation_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryInflationRequest + var protoReq QueryInflation var metadata runtime.ServerMetadata msg, err := client.Inflation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -61,7 +61,7 @@ func request_Query_Inflation_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_Inflation_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryInflationRequest + var protoReq QueryInflation var metadata runtime.ServerMetadata msg, err := server.Inflation(ctx, &protoReq) From 218b4c6051a4ed2d519e03586d6003c2351703c8 Mon Sep 17 00:00:00 2001 From: marston Date: Wed, 8 Nov 2023 23:21:15 -0500 Subject: [PATCH 08/14] filetree module query refactor --- proto/canine_chain/filetree/query.proto | 22 +- x/filetree/client/cli/query_files.go | 6 +- x/filetree/client/cli/query_get_keys.go | 2 +- x/filetree/client/cli/query_params.go | 2 +- x/filetree/client/cli/query_pubkey.go | 4 +- x/filetree/client/cli/tx_add_editors.go | 4 +- x/filetree/client/cli/tx_add_viewers.go | 4 +- x/filetree/client/cli/tx_remove_editors.go | 2 +- x/filetree/client/cli/tx_remove_viewers.go | 2 +- x/filetree/client/cli/utils.go | 2 +- x/filetree/keeper/grpc_query_files.go | 4 +- x/filetree/keeper/grpc_query_params.go | 2 +- x/filetree/keeper/grpc_query_pubkey.go | 4 +- .../keeper/msg_server_add_editors_test.go | 2 +- .../keeper/msg_server_add_viewers_test.go | 4 +- .../keeper/msg_server_change_owner_test.go | 6 +- .../keeper/msg_server_delete_file_test.go | 2 +- .../keeper/msg_server_remove_editors_test.go | 4 +- .../keeper/msg_server_remove_viewers_test.go | 4 +- .../keeper/msg_server_reset_editors_test.go | 4 +- .../keeper/msg_server_reset_viewers_test.go | 4 +- x/filetree/types/query.pb.go | 378 +++++++++--------- x/filetree/types/query.pb.gw.go | 20 +- 23 files changed, 244 insertions(+), 244 deletions(-) diff --git a/proto/canine_chain/filetree/query.proto b/proto/canine_chain/filetree/query.proto index 297b8bf5e..dfef7ec35 100644 --- a/proto/canine_chain/filetree/query.proto +++ b/proto/canine_chain/filetree/query.proto @@ -13,35 +13,35 @@ option go_package = "github.com/jackalLabs/canine-chain/x/filetree/types"; // Query defines the gRPC querier service. service Query { // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params(QueryParams) returns (QueryParamsResponse) { option (google.api.http).get = "/jackal/canine/filetree/params"; } // Queries a Files by index. - rpc File(QueryFileRequest) returns (QueryFileResponse) { + rpc File(QueryFile) returns (QueryFileResponse) { option (google.api.http).get = "/jackal/canine-chain/filetree/files/{address}/{owner_address}"; } // Queries a list of Files items. - rpc AllFiles(QueryAllFilesRequest) returns (QueryAllFilesResponse) { + rpc AllFiles(QueryAllFiles) returns (QueryAllFilesResponse) { option (google.api.http).get = "/jackal/canine-chain/filetree/files"; } // Queries a Pubkey by index. - rpc PubKey(QueryPubKeyRequest) returns (QueryPubKeyResponse) { + rpc PubKey(QueryPubKey) returns (QueryPubKeyResponse) { option (google.api.http).get = "/jackal/canine-chain/filetree/pubkeys/{address}"; } // Queries a list of Pubkey items. - rpc AllPubKeys(QueryAllPubKeysRequest) returns (QueryAllPubKeysResponse) { + rpc AllPubKeys(QueryAllPubKeys) returns (QueryAllPubKeysResponse) { option (google.api.http).get = "/jackal/canine-chain/filetree/pubkeys"; } } -// QueryParamsRequest is request type for the Query/Params RPC method. -message QueryParamsRequest {} +// QueryParams is request type for the Query/Params RPC method. +message QueryParams {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { @@ -49,14 +49,14 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryFileRequest { +message QueryFile { string address = 1; string owner_address = 2; } message QueryFileResponse { Files file = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllFilesRequest { +message QueryAllFiles { cosmos.base.query.v1beta1.PageRequest pagination = 1; } @@ -65,13 +65,13 @@ message QueryAllFilesResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryPubKeyRequest { string address = 1; } +message QueryPubKey { string address = 1; } message QueryPubKeyResponse { Pubkey pub_key = 1 [ (gogoproto.nullable) = false ]; } -message QueryAllPubKeysRequest { +message QueryAllPubKeys { cosmos.base.query.v1beta1.PageRequest pagination = 1; } diff --git a/x/filetree/client/cli/query_files.go b/x/filetree/client/cli/query_files.go index e9ead016c..6556bfdda 100644 --- a/x/filetree/client/cli/query_files.go +++ b/x/filetree/client/cli/query_files.go @@ -26,7 +26,7 @@ func CmdListFiles() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllFilesRequest{ + params := &types.QueryAllFiles{ Pagination: pageReq, } @@ -59,7 +59,7 @@ func CmdShowFiles() *cobra.Command { argAddress := args[0] argOwnerAddress := args[1] - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: argAddress, OwnerAddress: argOwnerAddress, } @@ -107,7 +107,7 @@ func CmdShowFileFromPath() *cobra.Command { Hash := H.Sum(nil) ownerAddress := fmt.Sprintf("%x", Hash) - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerAddress, } diff --git a/x/filetree/client/cli/query_get_keys.go b/x/filetree/client/cli/query_get_keys.go index a31132fb8..c3b154725 100644 --- a/x/filetree/client/cli/query_get_keys.go +++ b/x/filetree/client/cli/query_get_keys.go @@ -48,7 +48,7 @@ func CmdGetKeys() *cobra.Command { Hash := H.Sum(nil) ownerString := fmt.Sprintf("%x", Hash) // Make the owner string to find the file - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerString, } diff --git a/x/filetree/client/cli/query_params.go b/x/filetree/client/cli/query_params.go index 8ebf7cab6..efd9cf6e1 100644 --- a/x/filetree/client/cli/query_params.go +++ b/x/filetree/client/cli/query_params.go @@ -19,7 +19,7 @@ func CmdQueryParams() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) + res, err := queryClient.Params(context.Background(), &types.QueryParams{}) if err != nil { return err } diff --git a/x/filetree/client/cli/query_pubkey.go b/x/filetree/client/cli/query_pubkey.go index 792d66b2c..c3b913560 100644 --- a/x/filetree/client/cli/query_pubkey.go +++ b/x/filetree/client/cli/query_pubkey.go @@ -23,7 +23,7 @@ func CmdListPubkey() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryAllPubKeysRequest{ + params := &types.QueryAllPubKeys{ Pagination: pageReq, } @@ -54,7 +54,7 @@ func CmdShowPubkey() *cobra.Command { argAddress := args[0] - params := &types.QueryPubKeyRequest{ + params := &types.QueryPubKey{ Address: argAddress, } diff --git a/x/filetree/client/cli/tx_add_editors.go b/x/filetree/client/cli/tx_add_editors.go index b9b6379d8..609f963b4 100644 --- a/x/filetree/client/cli/tx_add_editors.go +++ b/x/filetree/client/cli/tx_add_editors.go @@ -57,7 +57,7 @@ func CmdAddEditors() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKeyRequest{Address: key.String()}) + res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKey{Address: key.String()}) if err != nil { return types.ErrPubKeyNotFound } @@ -67,7 +67,7 @@ func CmdAddEditors() *cobra.Command { return err } // Perhaps below file query should be replaced with fully fledged 'query file' function that checks permissions first - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerChainAddress, } diff --git a/x/filetree/client/cli/tx_add_viewers.go b/x/filetree/client/cli/tx_add_viewers.go index e0715968d..355953dfa 100644 --- a/x/filetree/client/cli/tx_add_viewers.go +++ b/x/filetree/client/cli/tx_add_viewers.go @@ -56,7 +56,7 @@ func CmdAddViewers() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKeyRequest{Address: key.String()}) + res, err := queryClient.PubKey(cmd.Context(), &types.QueryPubKey{Address: key.String()}) if err != nil { return types.ErrPubKeyNotFound } @@ -66,7 +66,7 @@ func CmdAddViewers() *cobra.Command { return err } // Perhaps below file query should be replaced with fully fledged 'query file' function that checks permissions first - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerChainAddress, } diff --git a/x/filetree/client/cli/tx_remove_editors.go b/x/filetree/client/cli/tx_remove_editors.go index 2a15747d8..2d9860549 100644 --- a/x/filetree/client/cli/tx_remove_editors.go +++ b/x/filetree/client/cli/tx_remove_editors.go @@ -43,7 +43,7 @@ func CmdRemoveEditors() *cobra.Command { continue } - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerChainAddress, } diff --git a/x/filetree/client/cli/tx_remove_viewers.go b/x/filetree/client/cli/tx_remove_viewers.go index c258e2eb7..96c5f1250 100644 --- a/x/filetree/client/cli/tx_remove_viewers.go +++ b/x/filetree/client/cli/tx_remove_viewers.go @@ -43,7 +43,7 @@ func CmdRemoveViewers() *cobra.Command { continue } - params := &types.QueryFileRequest{ + params := &types.QueryFile{ Address: merklePath, OwnerAddress: ownerChainAddress, } diff --git a/x/filetree/client/cli/utils.go b/x/filetree/client/cli/utils.go index 4c20a3a07..363e99746 100644 --- a/x/filetree/client/cli/utils.go +++ b/x/filetree/client/cli/utils.go @@ -66,7 +66,7 @@ func encryptFileAESKey(cmd *cobra.Command, key string, argKeys string) ([]byte, queryClient := filetypes.NewQueryClient(clientCtx) - res, err := queryClient.PubKey(cmd.Context(), &filetypes.QueryPubKeyRequest{Address: key}) + res, err := queryClient.PubKey(cmd.Context(), &filetypes.QueryPubKey{Address: key}) if err != nil { return nil, filetypes.ErrPubKeyNotFound } diff --git a/x/filetree/keeper/grpc_query_files.go b/x/filetree/keeper/grpc_query_files.go index c455be943..cf46c2dab 100644 --- a/x/filetree/keeper/grpc_query_files.go +++ b/x/filetree/keeper/grpc_query_files.go @@ -12,7 +12,7 @@ import ( ) // To remove -func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*types.QueryAllFilesResponse, error) { +func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFiles) (*types.QueryAllFilesResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -39,7 +39,7 @@ func (k Keeper) AllFiles(c context.Context, req *types.QueryAllFilesRequest) (*t return &types.QueryAllFilesResponse{Files: filess, Pagination: pageRes}, nil } -func (k Keeper) File(c context.Context, req *types.QueryFileRequest) (*types.QueryFileResponse, error) { +func (k Keeper) File(c context.Context, req *types.QueryFile) (*types.QueryFileResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/filetree/keeper/grpc_query_params.go b/x/filetree/keeper/grpc_query_params.go index 3f56dd154..f2bd8fcbd 100644 --- a/x/filetree/keeper/grpc_query_params.go +++ b/x/filetree/keeper/grpc_query_params.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { +func (k Keeper) Params(c context.Context, req *types.QueryParams) (*types.QueryParamsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/filetree/keeper/grpc_query_pubkey.go b/x/filetree/keeper/grpc_query_pubkey.go index f34e18c91..663bd8771 100644 --- a/x/filetree/keeper/grpc_query_pubkey.go +++ b/x/filetree/keeper/grpc_query_pubkey.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" ) -func (k Keeper) AllPubKeys(c context.Context, req *types.QueryAllPubKeysRequest) (*types.QueryAllPubKeysResponse, error) { +func (k Keeper) AllPubKeys(c context.Context, req *types.QueryAllPubKeys) (*types.QueryAllPubKeysResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -38,7 +38,7 @@ func (k Keeper) AllPubKeys(c context.Context, req *types.QueryAllPubKeysRequest) return &types.QueryAllPubKeysResponse{PubKey: pubkeys, Pagination: pageRes}, nil } -func (k Keeper) PubKey(c context.Context, req *types.QueryPubKeyRequest) (*types.QueryPubKeyResponse, error) { +func (k Keeper) PubKey(c context.Context, req *types.QueryPubKey) (*types.QueryPubKeyResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } diff --git a/x/filetree/keeper/msg_server_add_editors_test.go b/x/filetree/keeper/msg_server_add_editors_test.go index 79af6d6c4..b4a843298 100644 --- a/x/filetree/keeper/msg_server_add_editors_test.go +++ b/x/filetree/keeper/msg_server_add_editors_test.go @@ -99,7 +99,7 @@ func (suite *KeeperTestSuite) TestMsgAddEditors() { suite.Require().NoError(err) suite.Require().EqualValues(types.MsgAddEditorsResponse{}, *res) - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: aliceHomeMerklePath, OwnerAddress: ownerAddress, } diff --git a/x/filetree/keeper/msg_server_add_viewers_test.go b/x/filetree/keeper/msg_server_add_viewers_test.go index 839d3fc7f..83bd94e2a 100644 --- a/x/filetree/keeper/msg_server_add_viewers_test.go +++ b/x/filetree/keeper/msg_server_add_viewers_test.go @@ -85,7 +85,7 @@ func (suite *KeeperTestSuite) TestMsgAddViewers() { // If alice wants to share pepe with bob, she will take bob's public key from chain and use ECIES to encrypt pepeAESKeyAndIV - pubKeyReq := types.QueryPubKeyRequest{ + pubKeyReq := types.QueryPubKey{ Address: bob, } @@ -161,7 +161,7 @@ func (suite *KeeperTestSuite) TestMsgAddViewers() { suite.Require().EqualValues(types.MsgAddViewersResponse{}, *res) // Let's confirm that bob is a viewer - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: ownerAddress, } diff --git a/x/filetree/keeper/msg_server_change_owner_test.go b/x/filetree/keeper/msg_server_change_owner_test.go index 0dab01f1b..bac711c95 100644 --- a/x/filetree/keeper/msg_server_change_owner_test.go +++ b/x/filetree/keeper/msg_server_change_owner_test.go @@ -40,7 +40,7 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { // Let's query the file after it was set to confirm that alice is the owner - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -142,7 +142,7 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { // Because filetree entries are indexed (keyed) by address and ownerAddress, querying for a pepe.jpg that belongs to alice as an owner // should fail here because alice gave away pepe.jpg to bob - fileReq1 := types.QueryFileRequest{ + fileReq1 := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -154,7 +154,7 @@ func (suite *KeeperTestSuite) TestMsgChangeOwners() { bobAccountHash := types.HashThenHex(bob) bobOwnerAddress := types.MakeOwnerAddress(pepeMerklePath, bobAccountHash) - fileReq2 := types.QueryFileRequest{ + fileReq2 := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: bobOwnerAddress, } diff --git a/x/filetree/keeper/msg_server_delete_file_test.go b/x/filetree/keeper/msg_server_delete_file_test.go index 3a6b904ea..c20841701 100644 --- a/x/filetree/keeper/msg_server_delete_file_test.go +++ b/x/filetree/keeper/msg_server_delete_file_test.go @@ -49,7 +49,7 @@ func (suite *KeeperTestSuite) TestMsgDeleteFile() { // Let's confirm that bob has edit access before moving on - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: types.MerklePath("s/home/"), OwnerAddress: types.MakeOwnerAddress(types.MerklePath("s/home/"), aliceAccountHash), } diff --git a/x/filetree/keeper/msg_server_remove_editors_test.go b/x/filetree/keeper/msg_server_remove_editors_test.go index b50046e91..dfe17a63d 100644 --- a/x/filetree/keeper/msg_server_remove_editors_test.go +++ b/x/filetree/keeper/msg_server_remove_editors_test.go @@ -46,7 +46,7 @@ func (suite *KeeperTestSuite) TestMsgRemoveEditors() { // Let's query the file after it was set to confirm that alice and bob are editors - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -124,7 +124,7 @@ func (suite *KeeperTestSuite) TestMsgRemoveEditors() { suite.Require().EqualValues(types.MsgRemoveEditorsResponse{}, *res) // Let's confirm that bob is no longer an editor - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } diff --git a/x/filetree/keeper/msg_server_remove_viewers_test.go b/x/filetree/keeper/msg_server_remove_viewers_test.go index 5ee906a67..21dce3a23 100644 --- a/x/filetree/keeper/msg_server_remove_viewers_test.go +++ b/x/filetree/keeper/msg_server_remove_viewers_test.go @@ -60,7 +60,7 @@ func (suite *KeeperTestSuite) TestMsgRemoveViewers() { // Let's query the file after it was set to confirm that alice and bob are viewers - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -138,7 +138,7 @@ func (suite *KeeperTestSuite) TestMsgRemoveViewers() { suite.Require().EqualValues(types.MsgRemoveViewersResponse{}, *res) // Let's confirm that bob is no longer a viewer - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } diff --git a/x/filetree/keeper/msg_server_reset_editors_test.go b/x/filetree/keeper/msg_server_reset_editors_test.go index e403e17fa..bc390e180 100644 --- a/x/filetree/keeper/msg_server_reset_editors_test.go +++ b/x/filetree/keeper/msg_server_reset_editors_test.go @@ -46,7 +46,7 @@ func (suite *KeeperTestSuite) TestMsgResetEditors() { // Let's query the file after it was set to confirm that alice and bob are editors - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -130,7 +130,7 @@ func (suite *KeeperTestSuite) TestMsgResetEditors() { suite.Require().EqualValues(types.MsgRemoveEditorsResponse{}, *res) // Let's confirm that bob is no longer an editor - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } diff --git a/x/filetree/keeper/msg_server_reset_viewers_test.go b/x/filetree/keeper/msg_server_reset_viewers_test.go index a08c8d0ba..d31a6af07 100644 --- a/x/filetree/keeper/msg_server_reset_viewers_test.go +++ b/x/filetree/keeper/msg_server_reset_viewers_test.go @@ -60,7 +60,7 @@ func (suite *KeeperTestSuite) TestMsgResetViewers() { // Let's query the file after it was set to confirm that alice, bob, and charlie are viewers - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } @@ -144,7 +144,7 @@ func (suite *KeeperTestSuite) TestMsgResetViewers() { suite.Require().EqualValues(types.MsgRemoveViewersResponse{}, *res) // Let's confirm that bob and charlie are no longer viewers - fileReq := types.QueryFileRequest{ + fileReq := types.QueryFile{ Address: pepeMerklePath, OwnerAddress: aliceOwnerAddress, } diff --git a/x/filetree/types/query.pb.go b/x/filetree/types/query.pb.go index 418ee895a..81763c58e 100644 --- a/x/filetree/types/query.pb.go +++ b/x/filetree/types/query.pb.go @@ -30,22 +30,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct { +// QueryParams is request type for the Query/Params RPC method. +type QueryParams struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryParams) Reset() { *m = QueryParams{} } +func (m *QueryParams) String() string { return proto.CompactTextString(m) } +func (*QueryParams) ProtoMessage() {} +func (*QueryParams) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{0} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -55,17 +55,17 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParams.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryParams) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryParams) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParams.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryParams proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { @@ -113,23 +113,23 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryFileRequest struct { +type QueryFile struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` OwnerAddress string `protobuf:"bytes,2,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` } -func (m *QueryFileRequest) Reset() { *m = QueryFileRequest{} } -func (m *QueryFileRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFileRequest) ProtoMessage() {} -func (*QueryFileRequest) Descriptor() ([]byte, []int) { +func (m *QueryFile) Reset() { *m = QueryFile{} } +func (m *QueryFile) String() string { return proto.CompactTextString(m) } +func (*QueryFile) ProtoMessage() {} +func (*QueryFile) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{2} } -func (m *QueryFileRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFileRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryFile.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -139,26 +139,26 @@ func (m *QueryFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *QueryFileRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFileRequest.Merge(m, src) +func (m *QueryFile) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFile.Merge(m, src) } -func (m *QueryFileRequest) XXX_Size() int { +func (m *QueryFile) XXX_Size() int { return m.Size() } -func (m *QueryFileRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFileRequest.DiscardUnknown(m) +func (m *QueryFile) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFile.DiscardUnknown(m) } -var xxx_messageInfo_QueryFileRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryFile proto.InternalMessageInfo -func (m *QueryFileRequest) GetAddress() string { +func (m *QueryFile) GetAddress() string { if m != nil { return m.Address } return "" } -func (m *QueryFileRequest) GetOwnerAddress() string { +func (m *QueryFile) GetOwnerAddress() string { if m != nil { return m.OwnerAddress } @@ -209,22 +209,22 @@ func (m *QueryFileResponse) GetFile() Files { return Files{} } -type QueryAllFilesRequest struct { +type QueryAllFiles struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllFilesRequest) Reset() { *m = QueryAllFilesRequest{} } -func (m *QueryAllFilesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllFilesRequest) ProtoMessage() {} -func (*QueryAllFilesRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllFiles) Reset() { *m = QueryAllFiles{} } +func (m *QueryAllFiles) String() string { return proto.CompactTextString(m) } +func (*QueryAllFiles) ProtoMessage() {} +func (*QueryAllFiles) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{4} } -func (m *QueryAllFilesRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllFiles) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllFiles) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllFilesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllFiles.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -234,19 +234,19 @@ func (m *QueryAllFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllFilesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllFilesRequest.Merge(m, src) +func (m *QueryAllFiles) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllFiles.Merge(m, src) } -func (m *QueryAllFilesRequest) XXX_Size() int { +func (m *QueryAllFiles) XXX_Size() int { return m.Size() } -func (m *QueryAllFilesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllFilesRequest.DiscardUnknown(m) +func (m *QueryAllFiles) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllFiles.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllFilesRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllFiles proto.InternalMessageInfo -func (m *QueryAllFilesRequest) GetPagination() *query.PageRequest { +func (m *QueryAllFiles) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -305,22 +305,22 @@ func (m *QueryAllFilesResponse) GetPagination() *query.PageResponse { return nil } -type QueryPubKeyRequest struct { +type QueryPubKey struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *QueryPubKeyRequest) Reset() { *m = QueryPubKeyRequest{} } -func (m *QueryPubKeyRequest) String() string { return proto.CompactTextString(m) } -func (*QueryPubKeyRequest) ProtoMessage() {} -func (*QueryPubKeyRequest) Descriptor() ([]byte, []int) { +func (m *QueryPubKey) Reset() { *m = QueryPubKey{} } +func (m *QueryPubKey) String() string { return proto.CompactTextString(m) } +func (*QueryPubKey) ProtoMessage() {} +func (*QueryPubKey) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{6} } -func (m *QueryPubKeyRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryPubKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPubKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryPubKeyRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPubKey.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -330,19 +330,19 @@ func (m *QueryPubKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryPubKeyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPubKeyRequest.Merge(m, src) +func (m *QueryPubKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPubKey.Merge(m, src) } -func (m *QueryPubKeyRequest) XXX_Size() int { +func (m *QueryPubKey) XXX_Size() int { return m.Size() } -func (m *QueryPubKeyRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPubKeyRequest.DiscardUnknown(m) +func (m *QueryPubKey) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPubKey.DiscardUnknown(m) } -var xxx_messageInfo_QueryPubKeyRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPubKey proto.InternalMessageInfo -func (m *QueryPubKeyRequest) GetAddress() string { +func (m *QueryPubKey) GetAddress() string { if m != nil { return m.Address } @@ -393,22 +393,22 @@ func (m *QueryPubKeyResponse) GetPubKey() Pubkey { return Pubkey{} } -type QueryAllPubKeysRequest struct { +type QueryAllPubKeys struct { Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QueryAllPubKeysRequest) Reset() { *m = QueryAllPubKeysRequest{} } -func (m *QueryAllPubKeysRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllPubKeysRequest) ProtoMessage() {} -func (*QueryAllPubKeysRequest) Descriptor() ([]byte, []int) { +func (m *QueryAllPubKeys) Reset() { *m = QueryAllPubKeys{} } +func (m *QueryAllPubKeys) String() string { return proto.CompactTextString(m) } +func (*QueryAllPubKeys) ProtoMessage() {} +func (*QueryAllPubKeys) Descriptor() ([]byte, []int) { return fileDescriptor_f2d116acb9d238bd, []int{8} } -func (m *QueryAllPubKeysRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryAllPubKeys) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllPubKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryAllPubKeys) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllPubKeysRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryAllPubKeys.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -418,19 +418,19 @@ func (m *QueryAllPubKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *QueryAllPubKeysRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPubKeysRequest.Merge(m, src) +func (m *QueryAllPubKeys) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPubKeys.Merge(m, src) } -func (m *QueryAllPubKeysRequest) XXX_Size() int { +func (m *QueryAllPubKeys) XXX_Size() int { return m.Size() } -func (m *QueryAllPubKeysRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPubKeysRequest.DiscardUnknown(m) +func (m *QueryAllPubKeys) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPubKeys.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllPubKeysRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryAllPubKeys proto.InternalMessageInfo -func (m *QueryAllPubKeysRequest) GetPagination() *query.PageRequest { +func (m *QueryAllPubKeys) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } @@ -490,64 +490,64 @@ func (m *QueryAllPubKeysResponse) GetPagination() *query.PageResponse { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "canine_chain.filetree.QueryParamsRequest") + proto.RegisterType((*QueryParams)(nil), "canine_chain.filetree.QueryParams") proto.RegisterType((*QueryParamsResponse)(nil), "canine_chain.filetree.QueryParamsResponse") - proto.RegisterType((*QueryFileRequest)(nil), "canine_chain.filetree.QueryFileRequest") + proto.RegisterType((*QueryFile)(nil), "canine_chain.filetree.QueryFile") proto.RegisterType((*QueryFileResponse)(nil), "canine_chain.filetree.QueryFileResponse") - proto.RegisterType((*QueryAllFilesRequest)(nil), "canine_chain.filetree.QueryAllFilesRequest") + proto.RegisterType((*QueryAllFiles)(nil), "canine_chain.filetree.QueryAllFiles") proto.RegisterType((*QueryAllFilesResponse)(nil), "canine_chain.filetree.QueryAllFilesResponse") - proto.RegisterType((*QueryPubKeyRequest)(nil), "canine_chain.filetree.QueryPubKeyRequest") + proto.RegisterType((*QueryPubKey)(nil), "canine_chain.filetree.QueryPubKey") proto.RegisterType((*QueryPubKeyResponse)(nil), "canine_chain.filetree.QueryPubKeyResponse") - proto.RegisterType((*QueryAllPubKeysRequest)(nil), "canine_chain.filetree.QueryAllPubKeysRequest") + proto.RegisterType((*QueryAllPubKeys)(nil), "canine_chain.filetree.QueryAllPubKeys") proto.RegisterType((*QueryAllPubKeysResponse)(nil), "canine_chain.filetree.QueryAllPubKeysResponse") } func init() { proto.RegisterFile("canine_chain/filetree/query.proto", fileDescriptor_f2d116acb9d238bd) } var fileDescriptor_f2d116acb9d238bd = []byte{ - // 666 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0xeb, 0xfd, 0xe8, 0xc0, 0x80, 0x04, 0x66, 0x83, 0x29, 0x1a, 0x61, 0x64, 0xda, 0x3a, - 0x36, 0x1a, 0xab, 0x9b, 0x04, 0x48, 0x80, 0xd0, 0x26, 0x31, 0x0e, 0x03, 0x69, 0x2b, 0x37, 0x0e, - 0x14, 0xa7, 0x33, 0x59, 0x68, 0x1a, 0x67, 0xf9, 0x01, 0x54, 0xd3, 0x0e, 0x70, 0xe1, 0x8a, 0xe0, - 0x82, 0x76, 0xda, 0x9f, 0xb3, 0xe3, 0x24, 0x2e, 0x9c, 0x10, 0x6a, 0xf9, 0x43, 0x50, 0x6c, 0x87, - 0x26, 0x5d, 0xdb, 0x04, 0x69, 0xb7, 0xd4, 0xfe, 0xbe, 0xef, 0xfb, 0xd8, 0xef, 0x3d, 0x17, 0xde, - 0xaa, 0x13, 0xc7, 0x72, 0x68, 0xad, 0xbe, 0x4b, 0x2c, 0x07, 0xbf, 0xb1, 0x6c, 0x1a, 0x78, 0x94, - 0xe2, 0xbd, 0x90, 0x7a, 0x2d, 0xdd, 0xf5, 0x58, 0xc0, 0xd0, 0x54, 0x52, 0xa2, 0xc7, 0x12, 0x65, - 0xd2, 0x64, 0x26, 0xe3, 0x0a, 0x1c, 0x7d, 0x09, 0xb1, 0x32, 0x63, 0x32, 0x66, 0xda, 0x14, 0x13, - 0xd7, 0xc2, 0xc4, 0x71, 0x58, 0x40, 0x02, 0x8b, 0x39, 0xbe, 0xdc, 0x5d, 0xaa, 0x33, 0xbf, 0xc9, - 0x7c, 0x6c, 0x10, 0x5f, 0xe6, 0xc0, 0xef, 0x2a, 0x06, 0x0d, 0x48, 0x05, 0xbb, 0xc4, 0xb4, 0x1c, - 0x2e, 0x96, 0x5a, 0xad, 0x3f, 0x99, 0x4b, 0x3c, 0xd2, 0x8c, 0xfd, 0x06, 0xd0, 0x47, 0x1f, 0x7e, - 0x86, 0x4d, 0x68, 0x34, 0xa8, 0x3c, 0xa1, 0x36, 0x09, 0xd1, 0x76, 0x04, 0xb3, 0xc5, 0xbd, 0xab, - 0x74, 0x2f, 0xa4, 0x7e, 0xa0, 0x55, 0xe1, 0xd5, 0xd4, 0xaa, 0xef, 0x32, 0xc7, 0xa7, 0xe8, 0x01, - 0x2c, 0x0a, 0x86, 0x69, 0x30, 0x0b, 0x16, 0x2f, 0xac, 0xdc, 0xd0, 0xfb, 0xde, 0x8f, 0x2e, 0xc2, - 0xd6, 0xc7, 0x8e, 0x7f, 0xdd, 0x2c, 0x54, 0x65, 0x88, 0xb6, 0x0d, 0x2f, 0x73, 0xcf, 0x0d, 0xcb, - 0xa6, 0x32, 0x0f, 0x9a, 0x86, 0x13, 0x64, 0x67, 0xc7, 0xa3, 0xbe, 0x70, 0x3c, 0x5f, 0x8d, 0x7f, - 0xa2, 0x39, 0x78, 0x89, 0xbd, 0x77, 0xa8, 0x57, 0x8b, 0xf7, 0x47, 0xf8, 0xfe, 0x45, 0xbe, 0xb8, - 0x26, 0xd6, 0xb4, 0x4d, 0x78, 0x25, 0x61, 0x29, 0x21, 0xef, 0xc2, 0xb1, 0x08, 0x44, 0x22, 0xce, - 0x0c, 0x40, 0x8c, 0x42, 0x62, 0x42, 0xae, 0xd7, 0x5e, 0xc1, 0x49, 0x6e, 0xb6, 0x66, 0xdb, 0x7c, - 0x33, 0x66, 0xdc, 0x80, 0xb0, 0x5b, 0x20, 0xe9, 0xba, 0xa0, 0x8b, 0x6a, 0xea, 0x51, 0x35, 0x75, - 0xd1, 0x31, 0xb2, 0x9a, 0xfa, 0x16, 0x31, 0xe3, 0xf3, 0x55, 0x13, 0x91, 0xda, 0x21, 0x80, 0x53, - 0x3d, 0x09, 0x24, 0xf1, 0x7d, 0x38, 0xce, 0xcb, 0x36, 0x0d, 0x66, 0x47, 0x73, 0x22, 0x8b, 0x00, - 0xf4, 0x34, 0xc5, 0x36, 0xc2, 0xd9, 0x4a, 0x99, 0x6c, 0x22, 0x6d, 0x0a, 0x4e, 0x8f, 0xdb, 0x20, - 0x34, 0x36, 0x69, 0x2b, 0xb3, 0x3c, 0xda, 0x8b, 0xb8, 0x41, 0xa4, 0x5e, 0x9e, 0xe4, 0x21, 0x9c, - 0x70, 0x43, 0xa3, 0xd6, 0xa0, 0xad, 0xac, 0x0e, 0xe1, 0x3d, 0xf8, 0xaf, 0x43, 0xb8, 0x8b, 0xf6, - 0x1a, 0x5e, 0x8b, 0x2f, 0x48, 0xf8, 0x9e, 0x79, 0x0d, 0x8e, 0x00, 0xbc, 0x7e, 0x2a, 0x45, 0x3f, - 0xf6, 0xd1, 0xff, 0x64, 0x3f, 0xb3, 0x4a, 0xac, 0x7c, 0x2c, 0xc2, 0x71, 0x8e, 0x88, 0x3e, 0x03, - 0x58, 0x14, 0x93, 0x84, 0x6e, 0x0f, 0x40, 0x39, 0x3d, 0xba, 0xca, 0x52, 0x1e, 0xa9, 0xc8, 0xab, - 0x2d, 0x7c, 0xfa, 0xf1, 0xe7, 0xdb, 0xc8, 0x2c, 0x52, 0xf1, 0x5b, 0x52, 0x6f, 0x10, 0x1b, 0x8b, - 0xd0, 0xde, 0x17, 0x07, 0x1d, 0x01, 0x38, 0x16, 0x75, 0x1f, 0x2a, 0x0d, 0x33, 0x4f, 0x0c, 0xb6, - 0xb2, 0x98, 0x2d, 0x94, 0x0c, 0x4f, 0x38, 0xc3, 0x63, 0xf4, 0x28, 0xcd, 0x50, 0xee, 0xf7, 0xae, - 0xe1, 0x7d, 0xd9, 0x7f, 0x07, 0x78, 0x3f, 0xf5, 0x3a, 0x1c, 0xa0, 0xaf, 0x00, 0x9e, 0x8b, 0x07, - 0x0b, 0x2d, 0x0f, 0xcb, 0xde, 0x33, 0xdf, 0xca, 0x9d, 0x7c, 0x62, 0x89, 0xbb, 0xcc, 0x71, 0xe7, - 0xd1, 0x5c, 0x0e, 0x5c, 0xf4, 0x3d, 0xaa, 0xa0, 0xe8, 0x8f, 0xe1, 0x15, 0x4c, 0x4e, 0x5d, 0x46, - 0x05, 0x53, 0x03, 0xa7, 0xdd, 0xe3, 0x38, 0x15, 0x84, 0x87, 0xe3, 0x88, 0x27, 0x3f, 0x71, 0x7f, - 0xe8, 0x10, 0x40, 0xd8, 0x1d, 0x02, 0x54, 0xce, 0xb8, 0x84, 0xf4, 0x3c, 0x2a, 0x7a, 0x5e, 0xb9, - 0xc4, 0x2c, 0x73, 0xcc, 0x12, 0x9a, 0xcf, 0x85, 0xb9, 0xfe, 0xfc, 0xb8, 0xad, 0x82, 0x93, 0xb6, - 0x0a, 0x7e, 0xb7, 0x55, 0xf0, 0xa5, 0xa3, 0x16, 0x4e, 0x3a, 0x6a, 0xe1, 0x67, 0x47, 0x2d, 0xbc, - 0x5c, 0x35, 0xad, 0x60, 0x37, 0x34, 0xf4, 0x3a, 0x6b, 0x4a, 0xab, 0x67, 0xc4, 0xf0, 0xd3, 0x76, - 0x1f, 0xba, 0x86, 0x41, 0xcb, 0xa5, 0xbe, 0x51, 0xe4, 0x7f, 0x75, 0xab, 0x7f, 0x03, 0x00, 0x00, - 0xff, 0xff, 0xf8, 0x89, 0x74, 0xd0, 0xf1, 0x07, 0x00, 0x00, + // 660 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x6b, 0xd4, 0x4e, + 0x18, 0xc7, 0x77, 0xfa, 0xf7, 0xd7, 0xe9, 0xaf, 0x88, 0xa3, 0xc5, 0x12, 0x6a, 0x5c, 0xa7, 0x76, + 0xb7, 0x54, 0x9b, 0x61, 0x5b, 0x50, 0x41, 0x45, 0x5a, 0xb0, 0x82, 0x55, 0xa8, 0xf1, 0x20, 0x7a, + 0x59, 0x26, 0xdb, 0x31, 0x8d, 0x9b, 0xcd, 0xa4, 0xf9, 0xa3, 0x2e, 0xa5, 0x20, 0x5e, 0xbd, 0x28, + 0x3d, 0xe9, 0xc9, 0x97, 0xd3, 0x63, 0xc1, 0x8b, 0xa7, 0x22, 0xbb, 0xbe, 0x10, 0xc9, 0x4c, 0x92, + 0x26, 0x65, 0x77, 0xb3, 0x42, 0x6f, 0x49, 0xe6, 0xfb, 0x7c, 0x9f, 0xcf, 0xcc, 0xf3, 0x3c, 0x13, + 0x78, 0xbd, 0x41, 0x1d, 0xcb, 0x61, 0xf5, 0xc6, 0x2e, 0xb5, 0x1c, 0xf2, 0xc6, 0xb2, 0x59, 0xe0, + 0x31, 0x46, 0xf6, 0x42, 0xe6, 0xb5, 0x35, 0xd7, 0xe3, 0x01, 0x47, 0xb3, 0x59, 0x89, 0x96, 0x48, + 0x94, 0xcb, 0x26, 0x37, 0xb9, 0x50, 0x90, 0xe8, 0x49, 0x8a, 0x95, 0x79, 0x93, 0x73, 0xd3, 0x66, + 0x84, 0xba, 0x16, 0xa1, 0x8e, 0xc3, 0x03, 0x1a, 0x58, 0xdc, 0xf1, 0xe3, 0xd5, 0xe5, 0x06, 0xf7, + 0x5b, 0xdc, 0x27, 0x06, 0xf5, 0xe3, 0x1c, 0xe4, 0x5d, 0xcd, 0x60, 0x01, 0xad, 0x11, 0x97, 0x9a, + 0x96, 0x23, 0xc4, 0xb1, 0x16, 0xf7, 0x26, 0x73, 0xa9, 0x47, 0x5b, 0x89, 0x5f, 0x1f, 0xfa, 0xe8, + 0xc1, 0x2f, 0xb0, 0x09, 0x8d, 0x26, 0x8b, 0x77, 0x88, 0x67, 0xe0, 0xf4, 0xf3, 0x08, 0x66, 0x5b, + 0x78, 0x63, 0x1d, 0x5e, 0xca, 0xbc, 0xea, 0xcc, 0x77, 0xb9, 0xe3, 0x33, 0x74, 0x0f, 0x4e, 0xc8, + 0xe4, 0x73, 0xa0, 0x0c, 0x96, 0xa6, 0x57, 0xaf, 0x6a, 0x3d, 0x0f, 0x46, 0x93, 0x61, 0x1b, 0x63, + 0x47, 0x27, 0xd7, 0x4a, 0x7a, 0x1c, 0x82, 0x9f, 0xc0, 0x29, 0xe1, 0xb9, 0x69, 0xd9, 0x0c, 0xcd, + 0xc1, 0x49, 0xba, 0xb3, 0xe3, 0x31, 0x5f, 0x5a, 0x4d, 0xe9, 0xc9, 0x2b, 0x5a, 0x80, 0x33, 0xfc, + 0xbd, 0xc3, 0xbc, 0x7a, 0xb2, 0x3e, 0x22, 0xd6, 0xff, 0x17, 0x1f, 0xd7, 0xe5, 0x37, 0xbc, 0x05, + 0x2f, 0xa6, 0x5e, 0x29, 0xdd, 0x6d, 0x38, 0x16, 0x11, 0xc4, 0x6c, 0xf3, 0x7d, 0xd8, 0xa2, 0x90, + 0x04, 0x4d, 0xe8, 0xf1, 0x4b, 0x38, 0x23, 0xcc, 0xd6, 0x6d, 0x5b, 0x2c, 0xa2, 0x4d, 0x08, 0x4f, + 0x6b, 0x11, 0xdb, 0x55, 0x34, 0x59, 0x38, 0x2d, 0x2a, 0x9c, 0x26, 0x9b, 0x23, 0x2e, 0x9c, 0xb6, + 0x4d, 0x4d, 0xa6, 0xb3, 0xbd, 0x90, 0xf9, 0x81, 0x9e, 0x89, 0xc4, 0xdf, 0x01, 0x9c, 0xcd, 0x39, + 0xa7, 0xa8, 0x77, 0xe1, 0xb8, 0xa8, 0xd0, 0x1c, 0x28, 0x8f, 0x0e, 0xc9, 0x2a, 0x03, 0xd0, 0xe3, + 0x1c, 0xdb, 0x88, 0x60, 0xab, 0x16, 0xb2, 0xc9, 0xb4, 0x39, 0xb8, 0x6a, 0x52, 0xf1, 0xd0, 0xd8, + 0x62, 0xed, 0xfe, 0x05, 0xc1, 0x2f, 0x92, 0x5e, 0x10, 0xc2, 0x74, 0x0b, 0xf7, 0xe1, 0xa4, 0x1b, + 0x1a, 0xf5, 0x26, 0x6b, 0x17, 0x35, 0x83, 0xe8, 0xb3, 0xb4, 0x19, 0x84, 0x0b, 0x7e, 0x05, 0x2f, + 0x24, 0x27, 0x23, 0x7d, 0xcf, 0xef, 0xd4, 0x7f, 0x00, 0x78, 0xe5, 0x8c, 0x77, 0x6f, 0xe8, 0xd1, + 0x7f, 0x84, 0x3e, 0xb7, 0xb3, 0x5f, 0x3d, 0x19, 0x87, 0xe3, 0x02, 0x11, 0x7d, 0x04, 0x70, 0x42, + 0x4e, 0x0b, 0xc2, 0x7d, 0x50, 0x32, 0x83, 0xa8, 0x2c, 0x17, 0x6b, 0x92, 0x84, 0xb8, 0xf2, 0xe9, + 0xe7, 0x9f, 0xc3, 0x91, 0x32, 0x52, 0xc9, 0x5b, 0xda, 0x68, 0x52, 0x9b, 0xc8, 0xd0, 0xb3, 0xf7, + 0x08, 0xfa, 0x06, 0xe0, 0x98, 0x98, 0xc9, 0xf2, 0x20, 0xf3, 0x48, 0xa1, 0x2c, 0x15, 0x29, 0xd2, + 0xe4, 0x8f, 0x44, 0xf2, 0x87, 0xe8, 0x41, 0x3e, 0xf9, 0x4a, 0xaf, 0x6b, 0x8a, 0xec, 0xc7, 0xad, + 0x76, 0x40, 0xf6, 0x73, 0xa3, 0x7f, 0x80, 0x3e, 0x03, 0xf8, 0x5f, 0x3a, 0x96, 0x37, 0x06, 0x65, + 0x4f, 0x54, 0xca, 0xad, 0x61, 0x54, 0x29, 0xe7, 0x4d, 0xc1, 0xb9, 0x88, 0x16, 0x86, 0xe0, 0x44, + 0x5f, 0xa3, 0x62, 0xc9, 0x56, 0x18, 0x5c, 0x2c, 0xa1, 0x29, 0x28, 0x56, 0x6e, 0x9a, 0xf0, 0x1d, + 0xc1, 0x51, 0x43, 0x64, 0x30, 0x87, 0xbc, 0xb3, 0x33, 0x27, 0x86, 0x0e, 0x01, 0x84, 0x99, 0x21, + 0xaa, 0x14, 0xec, 0x3e, 0xd6, 0x29, 0xda, 0x70, 0xba, 0x94, 0x6f, 0x45, 0xf0, 0x55, 0xd1, 0xe2, + 0x50, 0x7c, 0x1b, 0xcf, 0x8e, 0x3a, 0x2a, 0x38, 0xee, 0xa8, 0xe0, 0x77, 0x47, 0x05, 0x5f, 0xba, + 0x6a, 0xe9, 0xb8, 0xab, 0x96, 0x7e, 0x75, 0xd5, 0xd2, 0xeb, 0x35, 0xd3, 0x0a, 0x76, 0x43, 0x43, + 0x6b, 0xf0, 0x56, 0x6c, 0xf5, 0x94, 0x1a, 0x7e, 0xde, 0xee, 0xc3, 0xa9, 0x61, 0xd0, 0x76, 0x99, + 0x6f, 0x4c, 0x88, 0x9f, 0xd4, 0xda, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x0d, 0xa7, 0x03, + 0xab, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -563,15 +563,15 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) // Queries a Files by index. - File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) + File(ctx context.Context, in *QueryFile, opts ...grpc.CallOption) (*QueryFileResponse, error) // Queries a list of Files items. - AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) + AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. - PubKey(ctx context.Context, in *QueryPubKeyRequest, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) + PubKey(ctx context.Context, in *QueryPubKey, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - AllPubKeys(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) + AllPubKeys(ctx context.Context, in *QueryAllPubKeys, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) } type queryClient struct { @@ -582,7 +582,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { +func (c *queryClient) Params(ctx context.Context, in *QueryParams, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/Params", in, out, opts...) if err != nil { @@ -591,7 +591,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } -func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...grpc.CallOption) (*QueryFileResponse, error) { +func (c *queryClient) File(ctx context.Context, in *QueryFile, opts ...grpc.CallOption) (*QueryFileResponse, error) { out := new(QueryFileResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/File", in, out, opts...) if err != nil { @@ -600,7 +600,7 @@ func (c *queryClient) File(ctx context.Context, in *QueryFileRequest, opts ...gr return out, nil } -func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { +func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) { out := new(QueryAllFilesResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/AllFiles", in, out, opts...) if err != nil { @@ -609,7 +609,7 @@ func (c *queryClient) AllFiles(ctx context.Context, in *QueryAllFilesRequest, op return out, nil } -func (c *queryClient) PubKey(ctx context.Context, in *QueryPubKeyRequest, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) { +func (c *queryClient) PubKey(ctx context.Context, in *QueryPubKey, opts ...grpc.CallOption) (*QueryPubKeyResponse, error) { out := new(QueryPubKeyResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/PubKey", in, out, opts...) if err != nil { @@ -618,7 +618,7 @@ func (c *queryClient) PubKey(ctx context.Context, in *QueryPubKeyRequest, opts . return out, nil } -func (c *queryClient) AllPubKeys(ctx context.Context, in *QueryAllPubKeysRequest, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) { +func (c *queryClient) AllPubKeys(ctx context.Context, in *QueryAllPubKeys, opts ...grpc.CallOption) (*QueryAllPubKeysResponse, error) { out := new(QueryAllPubKeysResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Query/AllPubKeys", in, out, opts...) if err != nil { @@ -630,34 +630,34 @@ func (c *queryClient) AllPubKeys(ctx context.Context, in *QueryAllPubKeysRequest // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + Params(context.Context, *QueryParams) (*QueryParamsResponse, error) // Queries a Files by index. - File(context.Context, *QueryFileRequest) (*QueryFileResponse, error) + File(context.Context, *QueryFile) (*QueryFileResponse, error) // Queries a list of Files items. - AllFiles(context.Context, *QueryAllFilesRequest) (*QueryAllFilesResponse, error) + AllFiles(context.Context, *QueryAllFiles) (*QueryAllFilesResponse, error) // Queries a Pubkey by index. - PubKey(context.Context, *QueryPubKeyRequest) (*QueryPubKeyResponse, error) + PubKey(context.Context, *QueryPubKey) (*QueryPubKeyResponse, error) // Queries a list of Pubkey items. - AllPubKeys(context.Context, *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) + AllPubKeys(context.Context, *QueryAllPubKeys) (*QueryAllPubKeysResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParams) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } -func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFileRequest) (*QueryFileResponse, error) { +func (*UnimplementedQueryServer) File(ctx context.Context, req *QueryFile) (*QueryFileResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method File not implemented") } -func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFilesRequest) (*QueryAllFilesResponse, error) { +func (*UnimplementedQueryServer) AllFiles(ctx context.Context, req *QueryAllFiles) (*QueryAllFilesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllFiles not implemented") } -func (*UnimplementedQueryServer) PubKey(ctx context.Context, req *QueryPubKeyRequest) (*QueryPubKeyResponse, error) { +func (*UnimplementedQueryServer) PubKey(ctx context.Context, req *QueryPubKey) (*QueryPubKeyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PubKey not implemented") } -func (*UnimplementedQueryServer) AllPubKeys(ctx context.Context, req *QueryAllPubKeysRequest) (*QueryAllPubKeysResponse, error) { +func (*UnimplementedQueryServer) AllPubKeys(ctx context.Context, req *QueryAllPubKeys) (*QueryAllPubKeysResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllPubKeys not implemented") } @@ -666,7 +666,7 @@ func RegisterQueryServer(s grpc1.Server, srv QueryServer) { } func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) + in := new(QueryParams) if err := dec(in); err != nil { return nil, err } @@ -678,13 +678,13 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.filetree.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParams)) } return interceptor(ctx, in, info, handler) } func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFileRequest) + in := new(QueryFile) if err := dec(in); err != nil { return nil, err } @@ -696,13 +696,13 @@ func _Query_File_Handler(srv interface{}, ctx context.Context, dec func(interfac FullMethod: "/canine_chain.filetree.Query/File", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).File(ctx, req.(*QueryFileRequest)) + return srv.(QueryServer).File(ctx, req.(*QueryFile)) } return interceptor(ctx, in, info, handler) } func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllFilesRequest) + in := new(QueryAllFiles) if err := dec(in); err != nil { return nil, err } @@ -714,13 +714,13 @@ func _Query_AllFiles_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/canine_chain.filetree.Query/AllFiles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFilesRequest)) + return srv.(QueryServer).AllFiles(ctx, req.(*QueryAllFiles)) } return interceptor(ctx, in, info, handler) } func _Query_PubKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPubKeyRequest) + in := new(QueryPubKey) if err := dec(in); err != nil { return nil, err } @@ -732,13 +732,13 @@ func _Query_PubKey_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/canine_chain.filetree.Query/PubKey", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PubKey(ctx, req.(*QueryPubKeyRequest)) + return srv.(QueryServer).PubKey(ctx, req.(*QueryPubKey)) } return interceptor(ctx, in, info, handler) } func _Query_AllPubKeys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPubKeysRequest) + in := new(QueryAllPubKeys) if err := dec(in); err != nil { return nil, err } @@ -750,7 +750,7 @@ func _Query_AllPubKeys_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/canine_chain.filetree.Query/AllPubKeys", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllPubKeys(ctx, req.(*QueryAllPubKeysRequest)) + return srv.(QueryServer).AllPubKeys(ctx, req.(*QueryAllPubKeys)) } return interceptor(ctx, in, info, handler) } @@ -784,7 +784,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Metadata: "canine_chain/filetree/query.proto", } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -794,12 +794,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -840,7 +840,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryFileRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryFile) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -850,12 +850,12 @@ func (m *QueryFileRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFileRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryFile) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryFile) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -910,7 +910,7 @@ func (m *QueryFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllFilesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllFiles) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -920,12 +920,12 @@ func (m *QueryAllFilesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllFilesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllFiles) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllFilesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllFiles) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -994,7 +994,7 @@ func (m *QueryAllFilesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryPubKeyRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPubKey) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1004,12 +1004,12 @@ func (m *QueryPubKeyRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPubKeyRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPubKey) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPubKeyRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPubKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1057,7 +1057,7 @@ func (m *QueryPubKeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllPubKeysRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPubKeys) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1067,12 +1067,12 @@ func (m *QueryAllPubKeysRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPubKeysRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPubKeys) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPubKeysRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPubKeys) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1152,7 +1152,7 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryParams) Size() (n int) { if m == nil { return 0 } @@ -1172,7 +1172,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryFileRequest) Size() (n int) { +func (m *QueryFile) Size() (n int) { if m == nil { return 0 } @@ -1200,7 +1200,7 @@ func (m *QueryFileResponse) Size() (n int) { return n } -func (m *QueryAllFilesRequest) Size() (n int) { +func (m *QueryAllFiles) Size() (n int) { if m == nil { return 0 } @@ -1232,7 +1232,7 @@ func (m *QueryAllFilesResponse) Size() (n int) { return n } -func (m *QueryPubKeyRequest) Size() (n int) { +func (m *QueryPubKey) Size() (n int) { if m == nil { return 0 } @@ -1256,7 +1256,7 @@ func (m *QueryPubKeyResponse) Size() (n int) { return n } -func (m *QueryAllPubKeysRequest) Size() (n int) { +func (m *QueryAllPubKeys) Size() (n int) { if m == nil { return 0 } @@ -1294,7 +1294,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1317,10 +1317,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -1427,7 +1427,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFileRequest) Unmarshal(dAtA []byte) error { +func (m *QueryFile) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1450,10 +1450,10 @@ func (m *QueryFileRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFileRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryFile: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFileRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryFile: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1624,7 +1624,7 @@ func (m *QueryFileResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllFilesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllFiles) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1647,10 +1647,10 @@ func (m *QueryAllFilesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllFilesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllFiles: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllFilesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllFiles: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1830,7 +1830,7 @@ func (m *QueryAllFilesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPubKeyRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPubKey) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1853,10 +1853,10 @@ func (m *QueryPubKeyRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPubKeyRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPubKey: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPubKeyRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPubKey: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1995,7 +1995,7 @@ func (m *QueryPubKeyResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPubKeysRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllPubKeys) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2018,10 +2018,10 @@ func (m *QueryAllPubKeysRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPubKeysRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPubKeys: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPubKeysRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPubKeys: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/filetree/types/query.pb.gw.go b/x/filetree/types/query.pb.gw.go index c2330062b..e0c12b404 100644 --- a/x/filetree/types/query.pb.gw.go +++ b/x/filetree/types/query.pb.gw.go @@ -34,7 +34,7 @@ var _ = descriptor.ForMessage var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -43,7 +43,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest + var protoReq QueryParams var metadata runtime.ServerMetadata msg, err := server.Params(ctx, &protoReq) @@ -52,7 +52,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } func request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileRequest + var protoReq QueryFile var metadata runtime.ServerMetadata var ( @@ -90,7 +90,7 @@ func request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, clie } func local_request_Query_File_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFileRequest + var protoReq QueryFile var metadata runtime.ServerMetadata var ( @@ -132,7 +132,7 @@ var ( ) func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFilesRequest + var protoReq QueryAllFiles var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -148,7 +148,7 @@ func request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllFilesRequest + var protoReq QueryAllFiles var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -164,7 +164,7 @@ func local_request_Query_AllFiles_0(ctx context.Context, marshaler runtime.Marsh } func request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPubKeyRequest + var protoReq QueryPubKey var metadata runtime.ServerMetadata var ( @@ -191,7 +191,7 @@ func request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshaler, cl } func local_request_Query_PubKey_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPubKeyRequest + var protoReq QueryPubKey var metadata runtime.ServerMetadata var ( @@ -222,7 +222,7 @@ var ( ) func request_Query_AllPubKeys_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPubKeysRequest + var protoReq QueryAllPubKeys var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -238,7 +238,7 @@ func request_Query_AllPubKeys_0(ctx context.Context, marshaler runtime.Marshaler } func local_request_Query_AllPubKeys_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPubKeysRequest + var protoReq QueryAllPubKeys var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { From 1ace93bb696abe34571bfc990f2ffd0731e73ec0 Mon Sep 17 00:00:00 2001 From: marston Date: Thu, 9 Nov 2023 10:32:33 -0500 Subject: [PATCH 09/14] erin recommendations --- proto/canine_chain/filetree/tx.proto | 12 +- proto/canine_chain/rns/query.proto | 2 +- proto/canine_chain/rns/tx.proto | 6 +- proto/canine_chain/storage/query.proto | 6 +- proto/canine_chain/storage/tx.proto | 4 +- x/filetree/client/cli/tx.go | 1 - x/filetree/client/cli/tx_make_root.go | 75 -- x/filetree/handler.go | 3 - x/filetree/keeper/msg_server_make_root.go | 14 - .../keeper/msg_server_make_root_test.go | 6 +- x/filetree/types/codec.go | 4 +- x/filetree/types/message_make_root.go | 76 -- x/filetree/types/test_helpers.go | 10 +- x/filetree/types/tx.pb.go | 647 ++---------------- x/oracle/simulation/delist.go | 2 +- x/rns/handler.go | 4 +- x/rns/keeper/msg_server_delist.go | 4 +- x/rns/keeper/msg_server_delist_test.go | 24 +- x/rns/simulation/delist.go | 2 +- x/rns/types/codec.go | 4 +- x/rns/types/message_delist.go | 16 +- x/rns/types/message_delist_test.go | 8 +- x/rns/types/tx.pb.go | 154 ++--- x/storage/client/cli/tx_init_provider.go | 7 +- .../client/cli/tx_set_provider_totalspace.go | 6 +- x/storage/keeper/grpc_query_freespace.go | 4 +- x/storage/keeper/msg_server_init_provider.go | 3 +- x/storage/keeper/msg_server_proofs_test.go | 2 +- x/storage/keeper/msg_server_providers_test.go | 17 +- .../msg_server_set_provider_totalspace.go | 19 +- x/storage/keeper/providers_test.go | 2 +- x/storage/simulation/init_miner.go | 3 +- x/storage/simulation/set_miner_totalspace.go | 3 +- x/storage/types/message_init_miner.go | 6 +- x/storage/types/message_init_miner_test.go | 16 +- .../types/message_set_miner_totalspace.go | 6 +- .../message_set_miner_totalspace_test.go | 11 +- x/storage/types/query.pb.go | 332 ++++----- x/storage/types/tx.pb.go | 228 +++--- 39 files changed, 471 insertions(+), 1278 deletions(-) delete mode 100644 x/filetree/types/message_make_root.go diff --git a/proto/canine_chain/filetree/tx.proto b/proto/canine_chain/filetree/tx.proto index e10fae56d..d5db66523 100644 --- a/proto/canine_chain/filetree/tx.proto +++ b/proto/canine_chain/filetree/tx.proto @@ -10,7 +10,6 @@ service Msg { rpc PostKey(MsgPostKey) returns (MsgPostKeyResponse); rpc DeleteFile(MsgDeleteFile) returns (MsgDeleteFileResponse); rpc RemoveViewers(MsgRemoveViewers) returns (MsgRemoveViewersResponse); - rpc MakeRoot(MsgMakeRoot) returns (MsgMakeRootResponse); rpc MakeRootV2(MsgMakeRootV2) returns (MsgMakeRootResponse); rpc AddEditors(MsgAddEditors) returns (MsgAddEditorsResponse); @@ -67,15 +66,6 @@ message MsgRemoveViewers { message MsgRemoveViewersResponse {} -message MsgMakeRoot { - string creator = 1; - string account = 2; - string root_hash_path = 3; - string contents = 4; - string editors = 5; - string viewers = 6; - string tracking_number = 7; -} message MsgMakeRootResponse {} @@ -125,7 +115,7 @@ message MsgChangeOwner { string creator = 1; string address = 2; string file_owner = 3; - string newOwner = 4; + string new_owner = 4; } message MsgChangeOwnerResponse {} diff --git a/proto/canine_chain/rns/query.proto b/proto/canine_chain/rns/query.proto index e13eed523..49f3a26b0 100644 --- a/proto/canine_chain/rns/query.proto +++ b/proto/canine_chain/rns/query.proto @@ -81,7 +81,7 @@ message QueryParamsResponse { message QueryName { string index = 1; } -message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } +message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } // TODO: Check if this breaks everything to change it to Name message QueryAllNames { cosmos.base.query.v1beta1.PageRequest pagination = 1; diff --git a/proto/canine_chain/rns/tx.proto b/proto/canine_chain/rns/tx.proto index dd8610474..0e1e6724a 100644 --- a/proto/canine_chain/rns/tx.proto +++ b/proto/canine_chain/rns/tx.proto @@ -11,7 +11,7 @@ service Msg { rpc CancelBid(MsgCancelBid) returns (MsgCancelBidResponse); rpc List(MsgList) returns (MsgListResponse); rpc Buy(MsgBuy) returns (MsgBuyResponse); - rpc DeList(MsgDeList) returns (MsgDeListResponse); + rpc Delist(MsgDelist) returns (MsgDelistResponse); rpc Transfer(MsgTransfer) returns (MsgTransferResponse); rpc AddRecord(MsgAddRecord) returns (MsgAddRecordResponse); rpc DelRecord(MsgDelRecord) returns (MsgDelRecordResponse); @@ -75,12 +75,12 @@ message MsgBuy { message MsgBuyResponse {} -message MsgDeList { +message MsgDelist { string creator = 1; string name = 2; } -message MsgDeListResponse {} +message MsgDelistResponse {} message MsgTransfer { string creator = 1; diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index faa8c6a2a..433f75f2e 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -268,9 +268,9 @@ message QueryFreeSpace { string address = 1; } message QueryStoreCount { string address = 1; } -message QueryFreeSpaceResponse { string space = 1; } +message QueryFreeSpaceResponse { int64 space = 1; } -message QueryStoreCountResponse { string count = 1; } +message QueryStoreCountResponse { int64 count = 1; } message QueryFindFile { bytes merkle = 1; } @@ -315,7 +315,7 @@ message QueryFileUploadCheckResponse { } message QueryPriceCheck { - string duration = 1; + string duration = 1; // formatted as time int64 bytes = 2; } diff --git a/proto/canine_chain/storage/tx.proto b/proto/canine_chain/storage/tx.proto index c6e612a7a..79cf9d82b 100644 --- a/proto/canine_chain/storage/tx.proto +++ b/proto/canine_chain/storage/tx.proto @@ -85,7 +85,7 @@ message MsgSetProviderKeybaseResponse {} message MsgSetProviderTotalSpace { string creator = 1; - string space = 2; + int64 space = 2; } message MsgSetProviderTotalSpaceResponse {} @@ -109,7 +109,7 @@ message MsgInitProvider { string creator = 1; string ip = 2; string keybase = 3; - string total_space = 4; + int64 total_space = 4; } message MsgInitProviderResponse {} diff --git a/x/filetree/client/cli/tx.go b/x/filetree/client/cli/tx.go index 334474bfd..3ff04ae40 100644 --- a/x/filetree/client/cli/tx.go +++ b/x/filetree/client/cli/tx.go @@ -28,7 +28,6 @@ func GetTxCmd() *cobra.Command { cmd.AddCommand(CmdPostkey()) cmd.AddCommand(CmdDeleteFile()) cmd.AddCommand(CmdRemoveViewers()) - cmd.AddCommand(CmdMakeRoot()) cmd.AddCommand(CmdMakeRootV2()) cmd.AddCommand(CmdAddEditors()) cmd.AddCommand(CmdRemoveEditors()) diff --git a/x/filetree/client/cli/tx_make_root.go b/x/filetree/client/cli/tx_make_root.go index 77adf9f49..54e393e33 100644 --- a/x/filetree/client/cli/tx_make_root.go +++ b/x/filetree/client/cli/tx_make_root.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "strconv" - "strings" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -17,80 +16,6 @@ import ( var _ = strconv.Itoa(0) -/* -Deprecated: CMDMakeRoot is being replaced by CMDMakeRootV2 -*/ -func CmdMakeRoot() *cobra.Command { - cmd := &cobra.Command{ - Use: "make-root [account] [root-hash-path]", - Short: "Broadcast message make root", - Args: cobra.ExactArgs(2), - RunE: func(cmd *cobra.Command, args []string) (err error) { - fmt.Println("make-root is deprecated as of v2.0.0, please consider using make-root-v2.") - argAccount := args[0] - argRootHashPath := args[1] - - if err != nil { - return err - } - - clientCtx, err := client.GetClientTxContext(cmd) - if err != nil { - return err - } - - // In the keeper, the merklePath function will trim the trailing slash for us but let's just do it anyways to be safe. - trimMerklePath := strings.TrimSuffix(argRootHashPath, "/") - merklePath := types.MerklePath(trimMerklePath) - - editors := make(map[string]string) - - trackingNumber := uuid.NewString() - - // This root folder is the master root and has no file key, so there is nothing to encrypt. - // We include the creator of this root as an editor so that they can add children--folders or files - - h := sha256.New() - h.Write([]byte(fmt.Sprintf("e%s%s", trackingNumber, clientCtx.GetFromAddress().String()))) - hash := h.Sum(nil) - - addressString := fmt.Sprintf("%x", hash) - - editors[addressString] = fmt.Sprintf("%x", "Placeholder key") // Determine if we need a place holder key - - jsonEditors, err := json.Marshal(editors) - if err != nil { - return err - } - - h1 := sha256.New() - h1.Write([]byte(argAccount)) - hash1 := h1.Sum(nil) - - accountHash := fmt.Sprintf("%x", hash1) - // FE will init their own root folders - - msg := types.NewMsgMakeRoot( - clientCtx.GetFromAddress().String(), - accountHash, - merklePath, - "Contents", - string(jsonEditors), - "Viewers", - trackingNumber, - ) - if err := msg.ValidateBasic(); err != nil { - return err - } - return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) - }, - } - - flags.AddTxFlagsToCmd(cmd) - - return cmd -} - func CmdMakeRootV2() *cobra.Command { cmd := &cobra.Command{ Use: "make-root-v2", diff --git a/x/filetree/handler.go b/x/filetree/handler.go index 98dcb443f..f490e8fc4 100644 --- a/x/filetree/handler.go +++ b/x/filetree/handler.go @@ -32,9 +32,6 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgRemoveViewers: res, err := msgServer.RemoveViewers(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgMakeRoot: - res, err := msgServer.MakeRoot(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) case *types.MsgMakeRootV2: res, err := msgServer.MakeRootV2(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) diff --git a/x/filetree/keeper/msg_server_make_root.go b/x/filetree/keeper/msg_server_make_root.go index 633baf1aa..78668867a 100644 --- a/x/filetree/keeper/msg_server_make_root.go +++ b/x/filetree/keeper/msg_server_make_root.go @@ -32,20 +32,6 @@ func (k msgServer) MakeRootFolder(ctx sdk.Context, creator string, viewers strin k.SetFiles(ctx, file) } -/* -Deprecated: MakeRoot is being replaced by MakeRootV2 -*/ -func (k msgServer) MakeRoot(goCtx context.Context, msg *types.MsgMakeRoot) (*types.MsgMakeRootResponse, error) { - newMsg := types.MsgMakeRootV2{ - Creator: msg.Creator, - Editors: msg.Editors, - Viewers: msg.Editors, - TrackingNumber: msg.TrackingNumber, - } - - return k.MakeRootV2(goCtx, &newMsg) -} - func (k msgServer) MakeRootV2(goCtx context.Context, msg *types.MsgMakeRootV2) (*types.MsgMakeRootResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/filetree/keeper/msg_server_make_root_test.go b/x/filetree/keeper/msg_server_make_root_test.go index 9a2289362..07e44a6cf 100644 --- a/x/filetree/keeper/msg_server_make_root_test.go +++ b/x/filetree/keeper/msg_server_make_root_test.go @@ -18,13 +18,13 @@ func (suite *KeeperTestSuite) TestMsgMakeRoot() { suite.Require().NoError(err) cases := []struct { - preRun func() *types.MsgMakeRoot + preRun func() *types.MsgMakeRootV2 expErr bool expErrMsg string name string }{ { - preRun: func() *types.MsgMakeRoot { + preRun: func() *types.MsgMakeRootV2 { return msg }, expErr: false, @@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestMsgMakeRoot() { suite.Run(tc.name, func() { msg := tc.preRun() suite.Require().NoError(err) - res, err := msgSrvr.MakeRoot(context, msg) + res, err := msgSrvr.MakeRootV2(context, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) diff --git a/x/filetree/types/codec.go b/x/filetree/types/codec.go index b444c4b42..0e44bc4e5 100644 --- a/x/filetree/types/codec.go +++ b/x/filetree/types/codec.go @@ -14,7 +14,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgPostKey{}, "filetree/PostKey", nil) cdc.RegisterConcrete(&MsgDeleteFile{}, "filetree/DeleteFile", nil) cdc.RegisterConcrete(&MsgRemoveViewers{}, "filetree/RemoveViewers", nil) - cdc.RegisterConcrete(&MsgMakeRoot{}, "filetree/MakeRoot", nil) + cdc.RegisterConcrete(&MsgMakeRootV2{}, "filetree/MakeRoot", nil) cdc.RegisterConcrete(&MsgAddEditors{}, "filetree/AddEditors", nil) cdc.RegisterConcrete(&MsgRemoveEditors{}, "filetree/RemoveEditors", nil) cdc.RegisterConcrete(&MsgResetEditors{}, "filetree/ResetEditors", nil) @@ -39,7 +39,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgRemoveViewers{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgMakeRoot{}, + &MsgMakeRootV2{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgAddEditors{}, diff --git a/x/filetree/types/message_make_root.go b/x/filetree/types/message_make_root.go deleted file mode 100644 index 82dd44b97..000000000 --- a/x/filetree/types/message_make_root.go +++ /dev/null @@ -1,76 +0,0 @@ -package types - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" -) - -const TypeMsgMakeRoot = "make_root" - -var _ sdk.Msg = &MsgMakeRoot{} - -/* -Deprecated: NewMsgMakeRoot is being replaced by NewMsgMakeRootV2 -*/ -func NewMsgMakeRoot(creator string, account string, rootHashPath string, contents string, editors string, viewers string, trackingNumber string) *MsgMakeRoot { - return &MsgMakeRoot{ - Creator: creator, - Account: account, - RootHashPath: rootHashPath, - Contents: contents, - Editors: editors, - Viewers: viewers, - TrackingNumber: trackingNumber, - } -} - -func (msg *MsgMakeRoot) Route() string { - return RouterKey -} - -func (msg *MsgMakeRoot) Type() string { - return TypeMsgMakeRoot -} - -func (msg *MsgMakeRoot) GetSigners() []sdk.AccAddress { - creator, err := sdk.AccAddressFromBech32(msg.Creator) - if err != nil { - panic(err) - } - return []sdk.AccAddress{creator} -} - -func (msg *MsgMakeRoot) GetSignBytes() []byte { - bz := ModuleCdc.MustMarshalJSON(msg) - return sdk.MustSortJSON(bz) -} - -func (msg *MsgMakeRoot) ValidateBasic() error { - _, err := sdk.AccAddressFromBech32(msg.Creator) - if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) - } - - if msg.Account == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid account: %s", msg.Account) - } - if msg.RootHashPath == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid root hash path: %s", msg.RootHashPath) - } - if msg.Editors == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid editors: %s", msg.Editors) - } - if msg.Viewers == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid viewers: %s", msg.Viewers) - } - if msg.TrackingNumber == "" { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, - "invalid tracking number: %s", msg.TrackingNumber) - } - - return nil -} diff --git a/x/filetree/types/test_helpers.go b/x/filetree/types/test_helpers.go index f2db299ec..c842ea3f9 100644 --- a/x/filetree/types/test_helpers.go +++ b/x/filetree/types/test_helpers.go @@ -40,8 +40,7 @@ func MakePrivateKey(fromName string) (*eciesgo.PrivateKey, error) { return newKey, nil } -func CreateMsgMakeRoot(creator string) (*MsgMakeRoot, error) { - merklePath := MerklePath("s/") +func CreateMsgMakeRoot(creator string) (*MsgMakeRootV2, error) { trackingNumber := uuid.NewString() editorIds := strings.Split(creator, ",") @@ -50,13 +49,8 @@ func CreateMsgMakeRoot(creator string) (*MsgMakeRoot, error) { return nil, err } - accountHash := HashThenHex(creator) - - msg := NewMsgMakeRoot( + msg := NewMsgMakeRootV2( creator, - accountHash, - merklePath, - "Contents", string(jsonEditors), "Viewers", trackingNumber, diff --git a/x/filetree/types/tx.pb.go b/x/filetree/types/tx.pb.go index 12be99f12..7648ef2eb 100644 --- a/x/filetree/types/tx.pb.go +++ b/x/filetree/types/tx.pb.go @@ -571,98 +571,6 @@ func (m *MsgRemoveViewersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveViewersResponse proto.InternalMessageInfo -type MsgMakeRoot struct { - Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` - RootHashPath string `protobuf:"bytes,3,opt,name=root_hash_path,json=rootHashPath,proto3" json:"root_hash_path,omitempty"` - Contents string `protobuf:"bytes,4,opt,name=contents,proto3" json:"contents,omitempty"` - Editors string `protobuf:"bytes,5,opt,name=editors,proto3" json:"editors,omitempty"` - Viewers string `protobuf:"bytes,6,opt,name=viewers,proto3" json:"viewers,omitempty"` - TrackingNumber string `protobuf:"bytes,7,opt,name=tracking_number,json=trackingNumber,proto3" json:"tracking_number,omitempty"` -} - -func (m *MsgMakeRoot) Reset() { *m = MsgMakeRoot{} } -func (m *MsgMakeRoot) String() string { return proto.CompactTextString(m) } -func (*MsgMakeRoot) ProtoMessage() {} -func (*MsgMakeRoot) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{10} -} -func (m *MsgMakeRoot) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgMakeRoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgMakeRoot.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 *MsgMakeRoot) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgMakeRoot.Merge(m, src) -} -func (m *MsgMakeRoot) XXX_Size() int { - return m.Size() -} -func (m *MsgMakeRoot) XXX_DiscardUnknown() { - xxx_messageInfo_MsgMakeRoot.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgMakeRoot proto.InternalMessageInfo - -func (m *MsgMakeRoot) GetCreator() string { - if m != nil { - return m.Creator - } - return "" -} - -func (m *MsgMakeRoot) GetAccount() string { - if m != nil { - return m.Account - } - return "" -} - -func (m *MsgMakeRoot) GetRootHashPath() string { - if m != nil { - return m.RootHashPath - } - return "" -} - -func (m *MsgMakeRoot) GetContents() string { - if m != nil { - return m.Contents - } - return "" -} - -func (m *MsgMakeRoot) GetEditors() string { - if m != nil { - return m.Editors - } - return "" -} - -func (m *MsgMakeRoot) GetViewers() string { - if m != nil { - return m.Viewers - } - return "" -} - -func (m *MsgMakeRoot) GetTrackingNumber() string { - if m != nil { - return m.TrackingNumber - } - return "" -} - type MsgMakeRootResponse struct { } @@ -670,7 +578,7 @@ func (m *MsgMakeRootResponse) Reset() { *m = MsgMakeRootResponse{} } func (m *MsgMakeRootResponse) String() string { return proto.CompactTextString(m) } func (*MsgMakeRootResponse) ProtoMessage() {} func (*MsgMakeRootResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{11} + return fileDescriptor_e5756d04c34e5a81, []int{10} } func (m *MsgMakeRootResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -710,7 +618,7 @@ func (m *MsgMakeRootV2) Reset() { *m = MsgMakeRootV2{} } func (m *MsgMakeRootV2) String() string { return proto.CompactTextString(m) } func (*MsgMakeRootV2) ProtoMessage() {} func (*MsgMakeRootV2) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{12} + return fileDescriptor_e5756d04c34e5a81, []int{11} } func (m *MsgMakeRootV2) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -779,7 +687,7 @@ func (m *MsgAddEditors) Reset() { *m = MsgAddEditors{} } func (m *MsgAddEditors) String() string { return proto.CompactTextString(m) } func (*MsgAddEditors) ProtoMessage() {} func (*MsgAddEditors) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{13} + return fileDescriptor_e5756d04c34e5a81, []int{12} } func (m *MsgAddEditors) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -850,7 +758,7 @@ func (m *MsgAddEditorsResponse) Reset() { *m = MsgAddEditorsResponse{} } func (m *MsgAddEditorsResponse) String() string { return proto.CompactTextString(m) } func (*MsgAddEditorsResponse) ProtoMessage() {} func (*MsgAddEditorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{14} + return fileDescriptor_e5756d04c34e5a81, []int{13} } func (m *MsgAddEditorsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -890,7 +798,7 @@ func (m *MsgRemoveEditors) Reset() { *m = MsgRemoveEditors{} } func (m *MsgRemoveEditors) String() string { return proto.CompactTextString(m) } func (*MsgRemoveEditors) ProtoMessage() {} func (*MsgRemoveEditors) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{15} + return fileDescriptor_e5756d04c34e5a81, []int{14} } func (m *MsgRemoveEditors) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +862,7 @@ func (m *MsgRemoveEditorsResponse) Reset() { *m = MsgRemoveEditorsRespon func (m *MsgRemoveEditorsResponse) String() string { return proto.CompactTextString(m) } func (*MsgRemoveEditorsResponse) ProtoMessage() {} func (*MsgRemoveEditorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{16} + return fileDescriptor_e5756d04c34e5a81, []int{15} } func (m *MsgRemoveEditorsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -993,7 +901,7 @@ func (m *MsgResetEditors) Reset() { *m = MsgResetEditors{} } func (m *MsgResetEditors) String() string { return proto.CompactTextString(m) } func (*MsgResetEditors) ProtoMessage() {} func (*MsgResetEditors) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{17} + return fileDescriptor_e5756d04c34e5a81, []int{16} } func (m *MsgResetEditors) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +958,7 @@ func (m *MsgResetEditorsResponse) Reset() { *m = MsgResetEditorsResponse func (m *MsgResetEditorsResponse) String() string { return proto.CompactTextString(m) } func (*MsgResetEditorsResponse) ProtoMessage() {} func (*MsgResetEditorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{18} + return fileDescriptor_e5756d04c34e5a81, []int{17} } func (m *MsgResetEditorsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1089,7 +997,7 @@ func (m *MsgResetViewers) Reset() { *m = MsgResetViewers{} } func (m *MsgResetViewers) String() string { return proto.CompactTextString(m) } func (*MsgResetViewers) ProtoMessage() {} func (*MsgResetViewers) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{19} + return fileDescriptor_e5756d04c34e5a81, []int{18} } func (m *MsgResetViewers) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1146,7 +1054,7 @@ func (m *MsgResetViewersResponse) Reset() { *m = MsgResetViewersResponse func (m *MsgResetViewersResponse) String() string { return proto.CompactTextString(m) } func (*MsgResetViewersResponse) ProtoMessage() {} func (*MsgResetViewersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{20} + return fileDescriptor_e5756d04c34e5a81, []int{19} } func (m *MsgResetViewersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1179,14 +1087,14 @@ type MsgChangeOwner struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` FileOwner string `protobuf:"bytes,3,opt,name=file_owner,json=fileOwner,proto3" json:"file_owner,omitempty"` - NewOwner string `protobuf:"bytes,4,opt,name=newOwner,proto3" json:"newOwner,omitempty"` + NewOwner string `protobuf:"bytes,4,opt,name=new_owner,json=newOwner,proto3" json:"new_owner,omitempty"` } func (m *MsgChangeOwner) Reset() { *m = MsgChangeOwner{} } func (m *MsgChangeOwner) String() string { return proto.CompactTextString(m) } func (*MsgChangeOwner) ProtoMessage() {} func (*MsgChangeOwner) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{21} + return fileDescriptor_e5756d04c34e5a81, []int{20} } func (m *MsgChangeOwner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1250,7 +1158,7 @@ func (m *MsgChangeOwnerResponse) Reset() { *m = MsgChangeOwnerResponse{} func (m *MsgChangeOwnerResponse) String() string { return proto.CompactTextString(m) } func (*MsgChangeOwnerResponse) ProtoMessage() {} func (*MsgChangeOwnerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_e5756d04c34e5a81, []int{22} + return fileDescriptor_e5756d04c34e5a81, []int{21} } func (m *MsgChangeOwnerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1290,7 +1198,6 @@ func init() { proto.RegisterType((*MsgDeleteFileResponse)(nil), "canine_chain.filetree.MsgDeleteFileResponse") proto.RegisterType((*MsgRemoveViewers)(nil), "canine_chain.filetree.MsgRemoveViewers") proto.RegisterType((*MsgRemoveViewersResponse)(nil), "canine_chain.filetree.MsgRemoveViewersResponse") - proto.RegisterType((*MsgMakeRoot)(nil), "canine_chain.filetree.MsgMakeRoot") proto.RegisterType((*MsgMakeRootResponse)(nil), "canine_chain.filetree.MsgMakeRootResponse") proto.RegisterType((*MsgMakeRootV2)(nil), "canine_chain.filetree.MsgMakeRootV2") proto.RegisterType((*MsgAddEditors)(nil), "canine_chain.filetree.MsgAddEditors") @@ -1308,62 +1215,59 @@ func init() { func init() { proto.RegisterFile("canine_chain/filetree/tx.proto", fileDescriptor_e5756d04c34e5a81) } var fileDescriptor_e5756d04c34e5a81 = []byte{ - // 871 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x53, 0xdb, 0x38, - 0x14, 0xc6, 0x24, 0x90, 0xe4, 0xf1, 0x73, 0xbc, 0xcb, 0xe2, 0xf5, 0x0e, 0xd9, 0x5d, 0x0f, 0xbb, - 0x94, 0x4e, 0x49, 0x66, 0xe0, 0xd2, 0x6b, 0x4b, 0xdb, 0x69, 0x87, 0xa6, 0x30, 0x39, 0xd0, 0x19, - 0x0e, 0x0d, 0x8e, 0x2d, 0x6c, 0x37, 0xc1, 0xca, 0x58, 0xe2, 0x47, 0x4e, 0xbd, 0x74, 0x7a, 0xee, - 0xdf, 0xd0, 0x4b, 0xff, 0x95, 0x1e, 0x39, 0xf6, 0xc8, 0xc0, 0x7f, 0xd1, 0x53, 0xc7, 0x96, 0x64, - 0x2b, 0x26, 0xb1, 0xd3, 0x42, 0x6f, 0xd1, 0x7b, 0x9f, 0xf4, 0x7d, 0x7a, 0x7a, 0x9f, 0x14, 0x43, - 0xd5, 0x32, 0x7d, 0xcf, 0x47, 0x2d, 0xcb, 0x35, 0x3d, 0xbf, 0x7e, 0xe4, 0x75, 0x11, 0x0d, 0x10, - 0xaa, 0xd3, 0xf3, 0x5a, 0x2f, 0xc0, 0x14, 0xab, 0x4b, 0x72, 0xbe, 0x26, 0xf2, 0xc6, 0x37, 0x05, - 0x66, 0x1a, 0xc4, 0xd9, 0xc3, 0x84, 0x3e, 0xf3, 0xba, 0x48, 0xd5, 0xa0, 0x64, 0x05, 0xc8, 0xa4, - 0x38, 0xd0, 0x94, 0x7f, 0x94, 0x7b, 0x95, 0xa6, 0x18, 0x86, 0x19, 0xd3, 0xb2, 0xf0, 0x89, 0x4f, - 0xb5, 0x49, 0x96, 0xe1, 0x43, 0xf5, 0x6f, 0x98, 0x71, 0x4d, 0xe2, 0xb6, 0x7a, 0x66, 0x80, 0x7c, - 0xaa, 0x15, 0xa2, 0x2c, 0x84, 0xa1, 0xbd, 0x28, 0xa2, 0xae, 0x40, 0x34, 0x6a, 0x59, 0xae, 0xd7, - 0xb5, 0xb5, 0x62, 0x94, 0xaf, 0x84, 0x91, 0xed, 0x30, 0xa0, 0xea, 0x50, 0xb6, 0xb0, 0x4f, 0x91, - 0x4f, 0x89, 0x36, 0x15, 0x25, 0xe3, 0x71, 0xc8, 0x7a, 0xea, 0xa1, 0x33, 0x14, 0x10, 0x6d, 0x9a, - 0xb1, 0xf2, 0x61, 0x98, 0x41, 0xb6, 0x47, 0x71, 0x40, 0xb4, 0x12, 0xcb, 0xf0, 0xa1, 0xba, 0x06, - 0x0b, 0x34, 0x30, 0xad, 0x8e, 0xe7, 0x3b, 0x2d, 0xff, 0xe4, 0xb8, 0x8d, 0x02, 0xad, 0x1c, 0x21, - 0xe6, 0x45, 0xf8, 0x55, 0x14, 0x35, 0xd6, 0xe1, 0x37, 0x69, 0xef, 0x4d, 0x44, 0x7a, 0xd8, 0x27, - 0x48, 0x55, 0xa1, 0xd8, 0x33, 0xa9, 0xcb, 0x0b, 0x10, 0xfd, 0x36, 0x3e, 0x29, 0x30, 0xd7, 0x20, - 0xce, 0x23, 0xdb, 0xde, 0x4f, 0xf8, 0x47, 0x54, 0x6a, 0x05, 0x80, 0x89, 0x6c, 0x79, 0x36, 0xe1, - 0xc5, 0xaa, 0xb0, 0xc8, 0x0b, 0x9b, 0x84, 0xe5, 0xe2, 0xe9, 0x0e, 0xea, 0x13, 0x51, 0x2e, 0x16, - 0xda, 0x41, 0xfd, 0x68, 0x65, 0xd3, 0xb6, 0x03, 0x44, 0x08, 0xaf, 0x95, 0x18, 0x86, 0x2b, 0x87, - 0x27, 0xd7, 0xc2, 0x67, 0x3e, 0x0a, 0x78, 0xad, 0x2a, 0x61, 0x64, 0x37, 0x0c, 0x18, 0xcb, 0xb0, - 0x34, 0xa0, 0x51, 0xec, 0xc8, 0x78, 0x08, 0xc0, 0x37, 0xba, 0x83, 0xfa, 0x19, 0xca, 0x17, 0xa1, - 0xd0, 0x41, 0x7d, 0x2e, 0x39, 0xfc, 0x69, 0xfc, 0x0e, 0x6a, 0x32, 0x33, 0x5e, 0xef, 0x30, 0x2a, - 0xc6, 0x13, 0xd4, 0x45, 0x14, 0xe5, 0xb4, 0xcd, 0x5f, 0x50, 0xe1, 0xcd, 0x41, 0x5d, 0xbe, 0x70, - 0x99, 0xb5, 0x06, 0x75, 0xe5, 0x9e, 0x2a, 0x0c, 0xf4, 0x14, 0xdf, 0x4a, 0xc2, 0x10, 0x53, 0xbf, - 0x57, 0x60, 0xb1, 0x41, 0x9c, 0x26, 0x3a, 0xc6, 0xa7, 0xe8, 0xd6, 0x67, 0x21, 0x95, 0xba, 0x90, - 0x55, 0xea, 0x62, 0xba, 0xd4, 0x3a, 0x68, 0x69, 0x15, 0xb1, 0xc4, 0x4b, 0xe6, 0xa9, 0x86, 0xd9, - 0x41, 0x4d, 0x8c, 0xe9, 0x4f, 0x79, 0x6a, 0x15, 0xe6, 0x03, 0x8c, 0x69, 0x2b, 0xa9, 0x1d, 0xd3, - 0x37, 0x1b, 0x46, 0x9f, 0x8b, 0xfa, 0xc9, 0xce, 0x29, 0xde, 0x74, 0x8e, 0xf0, 0xc7, 0xd4, 0xa0, - 0x3f, 0x46, 0x7b, 0x6a, 0x88, 0x73, 0x4a, 0x43, 0x9d, 0xb3, 0x14, 0x39, 0x47, 0xec, 0x30, 0xde, - 0xf9, 0x07, 0xe6, 0x12, 0x11, 0xdf, 0xdf, 0xcc, 0xde, 0xbb, 0xd0, 0x37, 0x39, 0x52, 0x5f, 0x21, - 0x57, 0x5f, 0x71, 0xa8, 0xbe, 0xc4, 0xae, 0x4f, 0x93, 0x45, 0x47, 0xb7, 0x08, 0x63, 0x96, 0x5b, - 0x84, 0x45, 0xb8, 0x5d, 0x79, 0x5a, 0xb6, 0x2b, 0x0b, 0xdd, 0x91, 0x5d, 0xb9, 0xc6, 0xe1, 0x3d, - 0x7e, 0xeb, 0x0d, 0xdc, 0x49, 0x8f, 0xa7, 0x25, 0xda, 0xb0, 0x10, 0xe5, 0x08, 0xa2, 0xf9, 0x02, - 0x25, 0x05, 0x93, 0x59, 0x0a, 0x0a, 0x69, 0x05, 0x7f, 0xc2, 0x72, 0x8a, 0x65, 0x98, 0x80, 0xfc, - 0x5b, 0xe0, 0x2e, 0x04, 0xa4, 0x5d, 0xfe, 0x0e, 0xe6, 0x1b, 0xc4, 0xd9, 0x76, 0x4d, 0xdf, 0x61, - 0xe0, 0x5f, 0xc0, 0x1f, 0x1a, 0xdc, 0x47, 0x67, 0xbb, 0xd2, 0xf9, 0xc4, 0x63, 0x43, 0x83, 0x3f, - 0x06, 0x05, 0x08, 0x69, 0x9b, 0x9f, 0x2b, 0x50, 0x68, 0x10, 0x47, 0x3d, 0x80, 0x72, 0xfc, 0xb0, - 0x1b, 0xb5, 0xa1, 0x7f, 0x00, 0x6a, 0xd2, 0x03, 0xa8, 0xdf, 0xcf, 0xc7, 0xc4, 0x8f, 0xe4, 0x21, - 0x80, 0xf4, 0x18, 0xae, 0x8e, 0x9e, 0x99, 0xa0, 0xf4, 0x07, 0xe3, 0xa0, 0x62, 0x86, 0xd7, 0x50, - 0x12, 0x2f, 0xd6, 0xbf, 0xd9, 0xc2, 0x76, 0x50, 0x5f, 0x5f, 0xcf, 0x85, 0xc8, 0xd2, 0xa5, 0xa7, - 0x2b, 0x43, 0x7a, 0x82, 0xca, 0x92, 0x7e, 0xf3, 0x91, 0x52, 0x3d, 0x98, 0x1b, 0x7c, 0xa0, 0xd6, - 0x46, 0x4f, 0x1f, 0x00, 0xea, 0xf5, 0x31, 0x81, 0x31, 0xd5, 0x01, 0x94, 0xe3, 0x87, 0x26, 0xe3, - 0x8c, 0x05, 0x26, 0xeb, 0x8c, 0xd3, 0xd7, 0xb9, 0xfa, 0x06, 0x40, 0xba, 0xca, 0x57, 0xf3, 0x67, - 0xee, 0x6f, 0xfe, 0xd0, 0xfa, 0xac, 0x87, 0xc4, 0xfd, 0x91, 0xdd, 0x43, 0x1c, 0x95, 0xd3, 0x43, - 0xa9, 0x5b, 0x22, 0x39, 0x08, 0x41, 0x92, 0x7b, 0x10, 0x82, 0xa7, 0x3e, 0x26, 0x30, 0xa6, 0x3a, - 0x82, 0xd9, 0x81, 0xeb, 0xf0, 0xff, 0xac, 0x05, 0x12, 0x9c, 0x5e, 0x1b, 0x0f, 0x77, 0x83, 0x47, - 0xb4, 0x56, 0x1e, 0x8f, 0xe8, 0xac, 0xda, 0x78, 0xb8, 0x98, 0xc7, 0x82, 0x19, 0xf9, 0x72, 0xfb, - 0x6f, 0xf4, 0x74, 0x09, 0xa6, 0x6f, 0x8c, 0x05, 0x13, 0x24, 0x8f, 0x1b, 0x5f, 0xae, 0xaa, 0xca, - 0xc5, 0x55, 0x55, 0xb9, 0xbc, 0xaa, 0x2a, 0x1f, 0xaf, 0xab, 0x13, 0x17, 0xd7, 0xd5, 0x89, 0xaf, - 0xd7, 0xd5, 0x89, 0x83, 0x2d, 0xc7, 0xa3, 0xee, 0x49, 0xbb, 0x66, 0xe1, 0xe3, 0xfa, 0x5b, 0xd3, - 0xea, 0x98, 0xdd, 0x97, 0x66, 0x9b, 0xd4, 0xd9, 0xea, 0x1b, 0xec, 0x2b, 0xe7, 0x5c, 0xfa, 0xce, - 0xe9, 0xf7, 0x10, 0x69, 0x4f, 0x47, 0xdf, 0x3a, 0x5b, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7, - 0xe4, 0xf7, 0xb2, 0x0d, 0x0d, 0x00, 0x00, + // 819 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xd3, 0x48, + 0x14, 0xae, 0x9b, 0x6c, 0x9b, 0xbc, 0x6e, 0x7f, 0xc8, 0xbb, 0xdd, 0x7a, 0xbd, 0x6a, 0x76, 0x37, + 0x02, 0x4a, 0x11, 0x4d, 0xa4, 0xf6, 0xc2, 0x15, 0x0a, 0x48, 0xa8, 0x04, 0xaa, 0x1c, 0x8a, 0xd4, + 0x03, 0xa9, 0x63, 0xbf, 0xda, 0x26, 0xa9, 0x1d, 0x79, 0xa6, 0x4d, 0x73, 0xe3, 0x80, 0x38, 0xf3, + 0x37, 0xf0, 0xd7, 0x20, 0x71, 0xe9, 0x91, 0x23, 0x6a, 0xff, 0x0b, 0x4e, 0xc8, 0x9e, 0x19, 0x7b, + 0xec, 0x26, 0x76, 0xa4, 0x96, 0x5b, 0xe6, 0xbd, 0xcf, 0xf3, 0x7d, 0xf3, 0xde, 0x37, 0x6f, 0x02, + 0x35, 0xd3, 0xf0, 0x5c, 0x0f, 0x3b, 0xa6, 0x63, 0xb8, 0x5e, 0xf3, 0xd8, 0xed, 0x23, 0x0d, 0x10, + 0x9b, 0xf4, 0xbc, 0x31, 0x08, 0x7c, 0xea, 0xab, 0xab, 0x72, 0xbe, 0x21, 0xf2, 0xf5, 0x1f, 0x0a, + 0x2c, 0xb4, 0x88, 0xbd, 0xef, 0x13, 0xfa, 0xdc, 0xed, 0xa3, 0xaa, 0xc1, 0xbc, 0x19, 0xa0, 0x41, + 0xfd, 0x40, 0x53, 0xfe, 0x53, 0xee, 0x57, 0xdb, 0x62, 0x19, 0x66, 0x0c, 0xd3, 0xf4, 0x4f, 0x3d, + 0xaa, 0xcd, 0xb2, 0x0c, 0x5f, 0xaa, 0xff, 0xc2, 0x82, 0x63, 0x10, 0xa7, 0x33, 0x30, 0x02, 0xf4, + 0xa8, 0x56, 0x8a, 0xb2, 0x10, 0x86, 0xf6, 0xa3, 0x88, 0xba, 0x0e, 0xd1, 0xaa, 0x63, 0x3a, 0x6e, + 0xdf, 0xd2, 0xca, 0x51, 0xbe, 0x1a, 0x46, 0x76, 0xc3, 0x80, 0xaa, 0x43, 0xc5, 0xf4, 0x3d, 0x8a, + 0x1e, 0x25, 0xda, 0x6f, 0x51, 0x32, 0x5e, 0x87, 0xac, 0x67, 0x2e, 0x0e, 0x31, 0x20, 0xda, 0x1c, + 0x63, 0xe5, 0xcb, 0x30, 0x83, 0x96, 0x4b, 0xfd, 0x80, 0x68, 0xf3, 0x2c, 0xc3, 0x97, 0xea, 0x06, + 0x2c, 0xd3, 0xc0, 0x30, 0x7b, 0xae, 0x67, 0x77, 0xbc, 0xd3, 0x93, 0x2e, 0x06, 0x5a, 0x25, 0x42, + 0x2c, 0x89, 0xf0, 0xab, 0x28, 0x5a, 0xdf, 0x84, 0x3f, 0xa4, 0xb3, 0xb7, 0x91, 0x0c, 0x7c, 0x8f, + 0xa0, 0xaa, 0x42, 0x79, 0x60, 0x50, 0x87, 0x17, 0x20, 0xfa, 0x5d, 0xff, 0xac, 0xc0, 0x62, 0x8b, + 0xd8, 0x8f, 0x2d, 0xeb, 0x20, 0xe1, 0x9f, 0x50, 0xa9, 0x75, 0x00, 0x26, 0xb2, 0xe3, 0x5a, 0x84, + 0x17, 0xab, 0xca, 0x22, 0x2f, 0x2c, 0x12, 0x96, 0x8b, 0xa7, 0x7b, 0x38, 0x22, 0xa2, 0x5c, 0x2c, + 0xb4, 0x87, 0xa3, 0x68, 0x67, 0xc3, 0xb2, 0x02, 0x24, 0x84, 0xd7, 0x4a, 0x2c, 0xc3, 0x9d, 0xc3, + 0xce, 0x75, 0xfc, 0xa1, 0x87, 0x01, 0xaf, 0x55, 0x35, 0x8c, 0xbc, 0x0e, 0x03, 0xf5, 0x35, 0x58, + 0x4d, 0x69, 0x14, 0x27, 0xaa, 0x3f, 0x02, 0xe0, 0x07, 0xdd, 0xc3, 0x51, 0x8e, 0xf2, 0x15, 0x28, + 0xf5, 0x70, 0xc4, 0x25, 0x87, 0x3f, 0xeb, 0x7f, 0x82, 0x9a, 0x7c, 0x19, 0xef, 0x77, 0x14, 0x15, + 0xe3, 0x29, 0xf6, 0x91, 0x62, 0x81, 0x6d, 0xfe, 0x81, 0x2a, 0x37, 0x07, 0x75, 0xf8, 0xc6, 0x15, + 0x66, 0x0d, 0xea, 0xc8, 0x9e, 0x2a, 0xa5, 0x3c, 0xc5, 0x8f, 0x92, 0x30, 0xc4, 0xd4, 0x1f, 0x14, + 0x58, 0x69, 0x11, 0xbb, 0x8d, 0x27, 0xfe, 0x19, 0xde, 0xb8, 0x17, 0x52, 0xa9, 0x4b, 0x79, 0xa5, + 0x2e, 0x67, 0x4b, 0xad, 0x83, 0x96, 0x55, 0x11, 0x4b, 0x5c, 0x8d, 0x6c, 0xd5, 0x32, 0x7a, 0xd8, + 0xf6, 0x7d, 0x1a, 0x87, 0x3f, 0x32, 0x0b, 0x89, 0xf8, 0xc1, 0x76, 0xfe, 0x65, 0x13, 0xe6, 0x9e, + 0x4d, 0x9b, 0x5b, 0xba, 0x10, 0xa5, 0xf4, 0x85, 0x18, 0x63, 0xfb, 0xf2, 0x58, 0xdb, 0x27, 0x5e, + 0x7e, 0x96, 0x6c, 0x3a, 0xb9, 0x7e, 0x8c, 0x59, 0xae, 0x1f, 0x8b, 0x70, 0x2f, 0xf3, 0xb4, 0xec, + 0x65, 0x16, 0xba, 0x25, 0x2f, 0x73, 0x8d, 0xe3, 0x0d, 0x70, 0xe3, 0x03, 0xdc, 0x8a, 0x01, 0xb2, + 0x12, 0x2d, 0x58, 0x8e, 0x72, 0x04, 0x69, 0xb1, 0x40, 0x49, 0xc1, 0x6c, 0x9e, 0x82, 0x52, 0x56, + 0xc1, 0xdf, 0xb0, 0x96, 0x61, 0x19, 0x27, 0xa0, 0xf8, 0x8a, 0xdc, 0x86, 0x80, 0xec, 0x15, 0x78, + 0xaf, 0xc0, 0x52, 0x8b, 0xd8, 0xbb, 0x8e, 0xe1, 0xd9, 0x0c, 0xfd, 0x0b, 0x04, 0x84, 0xb3, 0xc5, + 0xc3, 0x61, 0xaa, 0x43, 0x15, 0x0f, 0x87, 0x4c, 0x9d, 0x06, 0x7f, 0xa5, 0x15, 0x08, 0x71, 0xdb, + 0x5f, 0x2b, 0x50, 0x6a, 0x11, 0x5b, 0x3d, 0x84, 0x4a, 0xfc, 0xee, 0xd5, 0x1b, 0x63, 0xdf, 0xc7, + 0x86, 0xf4, 0x3e, 0xe8, 0x0f, 0x8a, 0x31, 0xf1, 0x1b, 0x72, 0x04, 0x20, 0xbd, 0x15, 0x77, 0x26, + 0x7f, 0x99, 0xa0, 0xf4, 0x87, 0xd3, 0xa0, 0x62, 0x86, 0x37, 0x30, 0x2f, 0x06, 0xfa, 0xff, 0xf9, + 0xc2, 0xf6, 0x70, 0xa4, 0x6f, 0x16, 0x42, 0x64, 0xe9, 0xd2, 0x64, 0xcf, 0x91, 0x9e, 0xa0, 0xf2, + 0xa4, 0x5f, 0x9f, 0xe1, 0xaa, 0x0b, 0x8b, 0xe9, 0xf9, 0xbd, 0x31, 0xf9, 0xf3, 0x14, 0x50, 0x6f, + 0x4e, 0x09, 0x8c, 0xa9, 0xde, 0x02, 0x48, 0x03, 0x37, 0xe7, 0x30, 0x09, 0x2a, 0xaf, 0xcf, 0xd9, + 0xa1, 0xce, 0xfb, 0x2c, 0x6e, 0x79, 0x7e, 0x9f, 0x39, 0xaa, 0xa0, 0xcf, 0x99, 0xbb, 0x9c, 0x14, + 0x4b, 0x90, 0x14, 0x16, 0x4b, 0xf0, 0x34, 0xa7, 0x04, 0xc6, 0x54, 0xc7, 0xf0, 0x7b, 0x6a, 0x68, + 0xdd, 0xcb, 0xdb, 0x20, 0xc1, 0xe9, 0x8d, 0xe9, 0x70, 0xd7, 0x78, 0x44, 0xfb, 0x8b, 0x78, 0x44, + 0xf7, 0x1b, 0xd3, 0xe1, 0x62, 0x1e, 0x13, 0x16, 0xe4, 0x09, 0x74, 0x77, 0xf2, 0xe7, 0x12, 0x4c, + 0xdf, 0x9a, 0x0a, 0x26, 0x48, 0x9e, 0xb4, 0xbe, 0x5c, 0xd6, 0x94, 0x8b, 0xcb, 0x9a, 0xf2, 0xfd, + 0xb2, 0xa6, 0x7c, 0xba, 0xaa, 0xcd, 0x5c, 0x5c, 0xd5, 0x66, 0xbe, 0x5d, 0xd5, 0x66, 0x0e, 0x77, + 0x6c, 0x97, 0x3a, 0xa7, 0xdd, 0x86, 0xe9, 0x9f, 0x34, 0xdf, 0x19, 0x66, 0xcf, 0xe8, 0xbf, 0x34, + 0xba, 0xa4, 0xc9, 0x76, 0xdf, 0x62, 0x7f, 0xd4, 0xcf, 0xa5, 0xbf, 0xea, 0xa3, 0x01, 0x92, 0xee, + 0x5c, 0xf4, 0x77, 0x7d, 0xe7, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x75, 0xf6, 0x78, 0xa7, 0xd0, + 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1383,7 +1287,6 @@ type MsgClient interface { PostKey(ctx context.Context, in *MsgPostKey, opts ...grpc.CallOption) (*MsgPostKeyResponse, error) DeleteFile(ctx context.Context, in *MsgDeleteFile, opts ...grpc.CallOption) (*MsgDeleteFileResponse, error) RemoveViewers(ctx context.Context, in *MsgRemoveViewers, opts ...grpc.CallOption) (*MsgRemoveViewersResponse, error) - MakeRoot(ctx context.Context, in *MsgMakeRoot, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) MakeRootV2(ctx context.Context, in *MsgMakeRootV2, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) AddEditors(ctx context.Context, in *MsgAddEditors, opts ...grpc.CallOption) (*MsgAddEditorsResponse, error) RemoveEditors(ctx context.Context, in *MsgRemoveEditors, opts ...grpc.CallOption) (*MsgRemoveEditorsResponse, error) @@ -1445,15 +1348,6 @@ func (c *msgClient) RemoveViewers(ctx context.Context, in *MsgRemoveViewers, opt return out, nil } -func (c *msgClient) MakeRoot(ctx context.Context, in *MsgMakeRoot, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) { - out := new(MsgMakeRootResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/MakeRoot", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *msgClient) MakeRootV2(ctx context.Context, in *MsgMakeRootV2, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) { out := new(MsgMakeRootResponse) err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/MakeRootV2", in, out, opts...) @@ -1515,7 +1409,6 @@ type MsgServer interface { PostKey(context.Context, *MsgPostKey) (*MsgPostKeyResponse, error) DeleteFile(context.Context, *MsgDeleteFile) (*MsgDeleteFileResponse, error) RemoveViewers(context.Context, *MsgRemoveViewers) (*MsgRemoveViewersResponse, error) - MakeRoot(context.Context, *MsgMakeRoot) (*MsgMakeRootResponse, error) MakeRootV2(context.Context, *MsgMakeRootV2) (*MsgMakeRootResponse, error) AddEditors(context.Context, *MsgAddEditors) (*MsgAddEditorsResponse, error) RemoveEditors(context.Context, *MsgRemoveEditors) (*MsgRemoveEditorsResponse, error) @@ -1543,9 +1436,6 @@ func (*UnimplementedMsgServer) DeleteFile(ctx context.Context, req *MsgDeleteFil func (*UnimplementedMsgServer) RemoveViewers(ctx context.Context, req *MsgRemoveViewers) (*MsgRemoveViewersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveViewers not implemented") } -func (*UnimplementedMsgServer) MakeRoot(ctx context.Context, req *MsgMakeRoot) (*MsgMakeRootResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method MakeRoot not implemented") -} func (*UnimplementedMsgServer) MakeRootV2(ctx context.Context, req *MsgMakeRootV2) (*MsgMakeRootResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MakeRootV2 not implemented") } @@ -1659,24 +1549,6 @@ func _Msg_RemoveViewers_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Msg_MakeRoot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgMakeRoot) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).MakeRoot(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/canine_chain.filetree.Msg/MakeRoot", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).MakeRoot(ctx, req.(*MsgMakeRoot)) - } - return interceptor(ctx, in, info, handler) -} - func _Msg_MakeRootV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(MsgMakeRootV2) if err := dec(in); err != nil { @@ -1809,10 +1681,6 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "RemoveViewers", Handler: _Msg_RemoveViewers_Handler, }, - { - MethodName: "MakeRoot", - Handler: _Msg_MakeRoot_Handler, - }, { MethodName: "MakeRootV2", Handler: _Msg_MakeRootV2_Handler, @@ -2233,78 +2101,6 @@ func (m *MsgRemoveViewersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *MsgMakeRoot) 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 *MsgMakeRoot) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgMakeRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TrackingNumber) > 0 { - i -= len(m.TrackingNumber) - copy(dAtA[i:], m.TrackingNumber) - i = encodeVarintTx(dAtA, i, uint64(len(m.TrackingNumber))) - i-- - dAtA[i] = 0x3a - } - if len(m.Viewers) > 0 { - i -= len(m.Viewers) - copy(dAtA[i:], m.Viewers) - i = encodeVarintTx(dAtA, i, uint64(len(m.Viewers))) - i-- - dAtA[i] = 0x32 - } - if len(m.Editors) > 0 { - i -= len(m.Editors) - copy(dAtA[i:], m.Editors) - i = encodeVarintTx(dAtA, i, uint64(len(m.Editors))) - i-- - dAtA[i] = 0x2a - } - if len(m.Contents) > 0 { - i -= len(m.Contents) - copy(dAtA[i:], m.Contents) - i = encodeVarintTx(dAtA, i, uint64(len(m.Contents))) - i-- - dAtA[i] = 0x22 - } - if len(m.RootHashPath) > 0 { - i -= len(m.RootHashPath) - copy(dAtA[i:], m.RootHashPath) - i = encodeVarintTx(dAtA, i, uint64(len(m.RootHashPath))) - i-- - dAtA[i] = 0x1a - } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintTx(dAtA, i, uint64(len(m.Account))) - i-- - dAtA[i] = 0x12 - } - if len(m.Creator) > 0 { - i -= len(m.Creator) - copy(dAtA[i:], m.Creator) - i = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *MsgMakeRootResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2935,43 +2731,6 @@ func (m *MsgRemoveViewersResponse) Size() (n int) { return n } -func (m *MsgMakeRoot) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Account) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.RootHashPath) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Contents) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Editors) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Viewers) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.TrackingNumber) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - return n -} - func (m *MsgMakeRootResponse) Size() (n int) { if m == nil { return 0 @@ -4414,280 +4173,6 @@ func (m *MsgRemoveViewersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgMakeRoot) 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 ErrIntOverflowTx - } - 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: MsgMakeRoot: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgMakeRoot: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Creator = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Account = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootHashPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RootHashPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Contents", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Contents = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Editors", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Editors = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Viewers", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Viewers = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrackingNumber", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TrackingNumber = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *MsgMakeRootResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/simulation/delist.go b/x/oracle/simulation/delist.go index 1aa6f49cf..83719cc2a 100644 --- a/x/oracle/simulation/delist.go +++ b/x/oracle/simulation/delist.go @@ -18,7 +18,7 @@ func SimulateMsgDelist( return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { simAccount, _ := simtypes.RandomAcc(r, accs) - msg := &types.MsgDeList{ + msg := &types.MsgDelist{ Creator: simAccount.Address.String(), } diff --git a/x/rns/handler.go b/x/rns/handler.go index dacd50dae..e1c2164ff 100644 --- a/x/rns/handler.go +++ b/x/rns/handler.go @@ -35,8 +35,8 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgBuy: res, err := msgServer.Buy(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgDeList: - res, err := msgServer.DeList(sdk.WrapSDKContext(ctx), msg) + case *types.MsgDelist: + res, err := msgServer.Delist(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) case *types.MsgTransfer: res, err := msgServer.Transfer(sdk.WrapSDKContext(ctx), msg) diff --git a/x/rns/keeper/msg_server_delist.go b/x/rns/keeper/msg_server_delist.go index c6e999be2..19a00112f 100644 --- a/x/rns/keeper/msg_server_delist.go +++ b/x/rns/keeper/msg_server_delist.go @@ -10,7 +10,7 @@ import ( "github.com/jackalLabs/canine-chain/v3/x/rns/types" ) -func (k msgServer) DeList(goCtx context.Context, msg *types.MsgDeList) (*types.MsgDeListResponse, error) { +func (k msgServer) Delist(goCtx context.Context, msg *types.MsgDelist) (*types.MsgDelistResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) mname := strings.ToLower(msg.Name) @@ -41,5 +41,5 @@ func (k msgServer) DeList(goCtx context.Context, msg *types.MsgDeList) (*types.M k.RemoveForsale(ctx, mname) - return &types.MsgDeListResponse{}, nil + return &types.MsgDelistResponse{}, nil } diff --git a/x/rns/keeper/msg_server_delist_test.go b/x/rns/keeper/msg_server_delist_test.go index e06ffba18..835abc28a 100644 --- a/x/rns/keeper/msg_server_delist_test.go +++ b/x/rns/keeper/msg_server_delist_test.go @@ -36,14 +36,14 @@ func (suite *KeeperTestSuite) TestDelistMsg() { // Use postRun to return it to original state cases := []struct { testName string - preRun func() *types.MsgDeList + preRun func() *types.MsgDelist postRun func() expErr bool expErrMsg string }{ { testName: "Name_listed", - preRun: func() *types.MsgDeList { + preRun: func() *types.MsgDelist { // Check if name is actually saved name, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) @@ -54,7 +54,7 @@ func (suite *KeeperTestSuite) TestDelistMsg() { Owner: nameOwner.String(), } keeper.SetForsale(suite.ctx, newsale) - return &types.MsgDeList{ + return &types.MsgDelist{ Creator: nameOwner.String(), Name: fmt.Sprintf("%s,%s", name.Name, name.Tld), } @@ -73,8 +73,8 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "name_not_found", - preRun: func() *types.MsgDeList { - return &types.MsgDeList{ + preRun: func() *types.MsgDelist { + return &types.MsgDelist{ Creator: nameOwner.String(), Name: "nonexistent.jkl", } @@ -85,8 +85,8 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "wrong_onwer", - preRun: func() *types.MsgDeList { - return &types.MsgDeList{ + preRun: func() *types.MsgDelist { + return &types.MsgDelist{ Creator: "wrong_account", Name: "Nuggie.jkl", } @@ -97,13 +97,13 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "cannot_transfer_free_name", - preRun: func() *types.MsgDeList { + preRun: func() *types.MsgDelist { blockHeight := suite.ctx.BlockHeight() names, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) names.Locked = blockHeight + 1 keeper.SetNames(suite.ctx, names) - return &types.MsgDeList{ + return &types.MsgDelist{ Creator: nameOwner.String(), Name: "Nuggie.jkl", } @@ -121,13 +121,13 @@ func (suite *KeeperTestSuite) TestDelistMsg() { { testName: "expired_name", - preRun: func() *types.MsgDeList { + preRun: func() *types.MsgDelist { blockHeight := suite.ctx.BlockHeight() names, found := keeper.GetNames(suite.ctx, "Nuggie", "jkl") suite.Require().True(found) names.Expires = blockHeight - 1 keeper.SetNames(suite.ctx, names) - return &types.MsgDeList{ + return &types.MsgDelist{ Creator: nameOwner.String(), Name: "Nuggie.jkl", } @@ -148,7 +148,7 @@ func (suite *KeeperTestSuite) TestDelistMsg() { suite.Run(tc.testName, func() { msg := tc.preRun() - _, err := msgSrvr.DeList(ctx, msg) + _, err := msgSrvr.Delist(ctx, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) diff --git a/x/rns/simulation/delist.go b/x/rns/simulation/delist.go index 18e426157..858e0055e 100644 --- a/x/rns/simulation/delist.go +++ b/x/rns/simulation/delist.go @@ -36,7 +36,7 @@ func SimulateMsgDelist( return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDelist, "name is expired"), nil, nil } - msg := &types.MsgDeList{ + msg := &types.MsgDelist{ Creator: forsale.Owner, Name: forsale.Name, } diff --git a/x/rns/types/codec.go b/x/rns/types/codec.go index 2c9d423fa..bc193d09f 100644 --- a/x/rns/types/codec.go +++ b/x/rns/types/codec.go @@ -15,7 +15,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgCancelBid{}, "rns/CancelBid", nil) cdc.RegisterConcrete(&MsgList{}, "rns/List", nil) cdc.RegisterConcrete(&MsgBuy{}, "rns/Buy", nil) - cdc.RegisterConcrete(&MsgDeList{}, "rns/DeList", nil) + cdc.RegisterConcrete(&MsgDelist{}, "rns/Delist", nil) cdc.RegisterConcrete(&MsgTransfer{}, "rns/Transfer", nil) cdc.RegisterConcrete(&MsgAddRecord{}, "rns/AddRecord", nil) cdc.RegisterConcrete(&MsgDelRecord{}, "rns/DelRecord", nil) @@ -43,7 +43,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgBuy{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgDeList{}, + &MsgDelist{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgTransfer{}, diff --git a/x/rns/types/message_delist.go b/x/rns/types/message_delist.go index 704fedb16..36c8d0743 100644 --- a/x/rns/types/message_delist.go +++ b/x/rns/types/message_delist.go @@ -7,24 +7,24 @@ import ( const TypeMsgDelist = "delist" -var _ sdk.Msg = &MsgDeList{} +var _ sdk.Msg = &MsgDelist{} -func NewMsgDeList(creator string, name string) *MsgDeList { - return &MsgDeList{ +func NewMsgDeList(creator string, name string) *MsgDelist { + return &MsgDelist{ Creator: creator, Name: name, } } -func (msg *MsgDeList) Route() string { +func (msg *MsgDelist) Route() string { return RouterKey } -func (msg *MsgDeList) Type() string { +func (msg *MsgDelist) Type() string { return TypeMsgDelist } -func (msg *MsgDeList) GetSigners() []sdk.AccAddress { +func (msg *MsgDelist) GetSigners() []sdk.AccAddress { creator, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { panic(err) @@ -32,12 +32,12 @@ func (msg *MsgDeList) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{creator} } -func (msg *MsgDeList) GetSignBytes() []byte { +func (msg *MsgDelist) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(msg) return sdk.MustSortJSON(bz) } -func (msg *MsgDeList) ValidateBasic() error { +func (msg *MsgDelist) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) diff --git a/x/rns/types/message_delist_test.go b/x/rns/types/message_delist_test.go index ea3c3e5b6..8c21b3b5c 100644 --- a/x/rns/types/message_delist_test.go +++ b/x/rns/types/message_delist_test.go @@ -13,26 +13,26 @@ import ( func TestMsgDelist_ValidateBasic(t *testing.T) { tests := []struct { name string - msg MsgDeList + msg MsgDelist err error }{ { name: "invalid address", - msg: MsgDeList{ + msg: MsgDelist{ Creator: "invalid_address", Name: "validname.jkl", }, err: sdkerrors.ErrInvalidAddress, }, { name: "invalid name", - msg: MsgDeList{ + msg: MsgDelist{ Creator: "cosmos1k3qu47ycrut4sr73vv6uqtuhyyfewymu34gju2", Name: "invalidname", }, err: sdkerrors.ErrInvalidRequest, }, { name: "valid address", - msg: MsgDeList{ + msg: MsgDelist{ Creator: "cosmos1k3qu47ycrut4sr73vv6uqtuhyyfewymu34gju2", Name: "validname.jkl", }, diff --git a/x/rns/types/tx.pb.go b/x/rns/types/tx.pb.go index a57824a77..10176ceae 100644 --- a/x/rns/types/tx.pb.go +++ b/x/rns/types/tx.pb.go @@ -691,23 +691,23 @@ func (m *MsgBuyResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgBuyResponse proto.InternalMessageInfo -type MsgDeList struct { +type MsgDelist struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` } -func (m *MsgDeList) Reset() { *m = MsgDeList{} } -func (m *MsgDeList) String() string { return proto.CompactTextString(m) } -func (*MsgDeList) ProtoMessage() {} -func (*MsgDeList) Descriptor() ([]byte, []int) { +func (m *MsgDelist) Reset() { *m = MsgDelist{} } +func (m *MsgDelist) String() string { return proto.CompactTextString(m) } +func (*MsgDelist) ProtoMessage() {} +func (*MsgDelist) Descriptor() ([]byte, []int) { return fileDescriptor_26cd098678d4da9c, []int{14} } -func (m *MsgDeList) XXX_Unmarshal(b []byte) error { +func (m *MsgDelist) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgDeList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgDelist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgDeList.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgDelist.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -717,47 +717,47 @@ func (m *MsgDeList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *MsgDeList) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDeList.Merge(m, src) +func (m *MsgDelist) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDelist.Merge(m, src) } -func (m *MsgDeList) XXX_Size() int { +func (m *MsgDelist) XXX_Size() int { return m.Size() } -func (m *MsgDeList) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDeList.DiscardUnknown(m) +func (m *MsgDelist) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDelist.DiscardUnknown(m) } -var xxx_messageInfo_MsgDeList proto.InternalMessageInfo +var xxx_messageInfo_MsgDelist proto.InternalMessageInfo -func (m *MsgDeList) GetCreator() string { +func (m *MsgDelist) GetCreator() string { if m != nil { return m.Creator } return "" } -func (m *MsgDeList) GetName() string { +func (m *MsgDelist) GetName() string { if m != nil { return m.Name } return "" } -type MsgDeListResponse struct { +type MsgDelistResponse struct { } -func (m *MsgDeListResponse) Reset() { *m = MsgDeListResponse{} } -func (m *MsgDeListResponse) String() string { return proto.CompactTextString(m) } -func (*MsgDeListResponse) ProtoMessage() {} -func (*MsgDeListResponse) Descriptor() ([]byte, []int) { +func (m *MsgDelistResponse) Reset() { *m = MsgDelistResponse{} } +func (m *MsgDelistResponse) String() string { return proto.CompactTextString(m) } +func (*MsgDelistResponse) ProtoMessage() {} +func (*MsgDelistResponse) Descriptor() ([]byte, []int) { return fileDescriptor_26cd098678d4da9c, []int{15} } -func (m *MsgDeListResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgDelistResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgDeListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgDelistResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgDeListResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgDelistResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -767,17 +767,17 @@ func (m *MsgDeListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *MsgDeListResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDeListResponse.Merge(m, src) +func (m *MsgDelistResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDelistResponse.Merge(m, src) } -func (m *MsgDeListResponse) XXX_Size() int { +func (m *MsgDelistResponse) XXX_Size() int { return m.Size() } -func (m *MsgDeListResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDeListResponse.DiscardUnknown(m) +func (m *MsgDelistResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDelistResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgDeListResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgDelistResponse proto.InternalMessageInfo type MsgTransfer struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` @@ -1170,8 +1170,8 @@ func init() { proto.RegisterType((*MsgListResponse)(nil), "canine_chain.rns.MsgListResponse") proto.RegisterType((*MsgBuy)(nil), "canine_chain.rns.MsgBuy") proto.RegisterType((*MsgBuyResponse)(nil), "canine_chain.rns.MsgBuyResponse") - proto.RegisterType((*MsgDeList)(nil), "canine_chain.rns.MsgDeList") - proto.RegisterType((*MsgDeListResponse)(nil), "canine_chain.rns.MsgDeListResponse") + proto.RegisterType((*MsgDelist)(nil), "canine_chain.rns.MsgDelist") + proto.RegisterType((*MsgDelistResponse)(nil), "canine_chain.rns.MsgDelistResponse") proto.RegisterType((*MsgTransfer)(nil), "canine_chain.rns.MsgTransfer") proto.RegisterType((*MsgTransferResponse)(nil), "canine_chain.rns.MsgTransferResponse") proto.RegisterType((*MsgAddRecord)(nil), "canine_chain.rns.MsgAddRecord") @@ -1205,28 +1205,28 @@ var fileDescriptor_26cd098678d4da9c = []byte{ 0x29, 0xbd, 0xe1, 0x4a, 0x6f, 0x51, 0xec, 0xe3, 0x49, 0x6d, 0x25, 0xc9, 0xaa, 0x76, 0x17, 0xea, 0xbf, 0xe3, 0xd1, 0xf0, 0x2c, 0xa2, 0x59, 0xfd, 0xce, 0xa7, 0x24, 0xf2, 0xb1, 0x3c, 0xbb, 0x08, 0x9c, 0x5d, 0x78, 0x20, 0xe9, 0x94, 0xc2, 0x2b, 0x51, 0xfd, 0xd9, 0xbc, 0xe6, 0x89, 0x65, 0xad, - 0x67, 0x73, 0xc5, 0xf4, 0x9a, 0xcf, 0xca, 0x00, 0xd7, 0x3f, 0xad, 0x9c, 0x0b, 0xb1, 0x55, 0xf1, - 0x7d, 0xe6, 0x93, 0xff, 0x91, 0xa0, 0x98, 0x9e, 0xd7, 0x9e, 0x7c, 0x0b, 0x5a, 0x04, 0xfb, 0x38, - 0xba, 0xc4, 0x44, 0x96, 0x40, 0xc5, 0x72, 0xd6, 0x73, 0x62, 0xa5, 0xf7, 0x43, 0xcc, 0x4a, 0x10, - 0x8c, 0xb0, 0x9f, 0x90, 0xa0, 0x7e, 0xc1, 0x2f, 0xd1, 0x64, 0xa6, 0x0a, 0xce, 0x83, 0x32, 0xab, - 0x19, 0x07, 0xd0, 0x24, 0x5c, 0xc1, 0xdc, 0xe6, 0x4f, 0x65, 0x94, 0x4f, 0x56, 0xae, 0xbf, 0x36, - 0x59, 0x03, 0x3c, 0xf9, 0x9f, 0x73, 0x49, 0x56, 0xb5, 0x5b, 0xb1, 0x1e, 0xf1, 0xc9, 0x7a, 0x17, - 0x47, 0x1b, 0x7a, 0x25, 0xe7, 0x85, 0x25, 0xe5, 0xfb, 0x5e, 0xfc, 0xda, 0x01, 0xdd, 0xa3, 0xa1, - 0x31, 0x84, 0x96, 0xfa, 0x28, 0x3d, 0x76, 0xd7, 0x3f, 0x5b, 0x6e, 0xe1, 0x63, 0x62, 0x3d, 0xdd, - 0x08, 0xe7, 0xcc, 0xc6, 0x09, 0xe8, 0xdc, 0x38, 0xa5, 0xd9, 0xfd, 0x28, 0xb0, 0xba, 0x55, 0x88, - 0xa2, 0xf8, 0x00, 0xed, 0x95, 0xd7, 0xed, 0xd2, 0x74, 0x85, 0x5b, 0xcf, 0x36, 0xe3, 0x45, 0xd2, - 0x95, 0xad, 0xcb, 0x49, 0x15, 0x5e, 0x41, 0x7a, 0xcb, 0xd8, 0xc6, 0x00, 0x1a, 0xdc, 0x27, 0x87, - 0xa5, 0xf9, 0x0c, 0xb2, 0x9e, 0x54, 0x42, 0x37, 0x4a, 0xc6, 0x9c, 0x5b, 0x5e, 0x98, 0xd9, 0xbc, - 0xaa, 0x64, 0x2b, 0xd7, 0x1a, 0xef, 0xa1, 0x29, 0x2d, 0xfb, 0xa8, 0x34, 0x57, 0x80, 0xd6, 0xd1, - 0x06, 0x50, 0x71, 0x0d, 0xa1, 0xa5, 0xec, 0x5a, 0x3e, 0x13, 0x39, 0x5c, 0x31, 0x13, 0xeb, 0x9e, - 0xe4, 0x0d, 0x55, 0x86, 0xac, 0x68, 0x68, 0x8e, 0x57, 0x35, 0x74, 0xdd, 0x50, 0x8c, 0x74, 0xe5, - 0x26, 0xbb, 0xe2, 0xc5, 0x26, 0x1b, 0x49, 0x6f, 0xf9, 0x89, 0x35, 0x94, 0x9b, 0xa9, 0xbc, 0xa1, + 0x67, 0x73, 0xc5, 0xf4, 0x9a, 0xcf, 0xca, 0x00, 0x4f, 0x6a, 0x9f, 0x56, 0xce, 0x85, 0xd8, 0xaa, + 0xf8, 0x3e, 0xf3, 0xc9, 0xff, 0x48, 0x50, 0x4c, 0xcf, 0x6b, 0x4f, 0xbe, 0x05, 0x2d, 0x82, 0x7d, + 0x1c, 0x5d, 0x62, 0x22, 0x4b, 0xa0, 0x62, 0x39, 0xeb, 0x39, 0xb1, 0xd2, 0xfb, 0x21, 0x66, 0x25, + 0x08, 0x46, 0xd8, 0x4f, 0x48, 0x50, 0xbf, 0xe0, 0x97, 0x68, 0x32, 0x53, 0x05, 0xe7, 0x41, 0x99, + 0xd5, 0x8c, 0x03, 0x68, 0x12, 0xae, 0x60, 0x6e, 0xf3, 0xa7, 0x32, 0xca, 0x27, 0x2b, 0xd7, 0x5f, + 0x9b, 0xac, 0x01, 0x9e, 0xfc, 0xcf, 0xb9, 0x24, 0xab, 0xda, 0xad, 0x58, 0x8f, 0xf8, 0x64, 0xbd, + 0x8b, 0xa3, 0x0d, 0xbd, 0x92, 0xf3, 0xc2, 0x92, 0xf2, 0x7d, 0x2f, 0x7e, 0xed, 0x80, 0xee, 0xd1, + 0xd0, 0x18, 0x42, 0x4b, 0x7d, 0x94, 0x1e, 0xbb, 0xeb, 0x9f, 0x2d, 0xb7, 0xf0, 0x31, 0xb1, 0x9e, + 0x6e, 0x84, 0x73, 0x66, 0xe3, 0x04, 0x74, 0x6e, 0x9c, 0xd2, 0xec, 0x7e, 0x14, 0x58, 0xdd, 0x2a, + 0x44, 0x51, 0x7c, 0x80, 0xf6, 0xca, 0xeb, 0x76, 0x69, 0xba, 0xc2, 0xad, 0x67, 0x9b, 0xf1, 0x22, + 0xe9, 0xca, 0xd6, 0xe5, 0xa4, 0x0a, 0xaf, 0x20, 0xbd, 0x65, 0x6c, 0x63, 0x00, 0x0d, 0xee, 0xea, + 0xc3, 0xd2, 0x7c, 0x06, 0x59, 0x4f, 0x2a, 0xa1, 0x1b, 0x25, 0x63, 0xce, 0x2d, 0x2f, 0xcc, 0x6c, + 0x5e, 0x55, 0xb2, 0x95, 0x6b, 0x8d, 0xf7, 0xd0, 0x94, 0x96, 0x7d, 0x54, 0x9a, 0x2b, 0x40, 0xeb, + 0x68, 0x03, 0xa8, 0xb8, 0x86, 0xd0, 0x52, 0x76, 0x2d, 0x9f, 0x89, 0x1c, 0xae, 0x98, 0x89, 0x75, + 0x4f, 0xf2, 0x86, 0x2a, 0x43, 0x56, 0x34, 0x34, 0xc7, 0xab, 0x1a, 0xba, 0x6e, 0x28, 0x46, 0xba, + 0x72, 0x93, 0x5d, 0xf5, 0x62, 0x1b, 0x49, 0x6f, 0xf9, 0x89, 0x35, 0x94, 0x9b, 0xa9, 0xbc, 0xa1, 0x0c, 0xaa, 0x68, 0x68, 0xd1, 0x5d, 0xac, 0x1b, 0xf2, 0x67, 0x5b, 0xde, 0x0d, 0x01, 0x56, 0x74, 0xe3, 0xe6, 0x7f, 0xb5, 0x7f, 0xfa, 0x7b, 0x61, 0x6b, 0xd7, 0x0b, 0x5b, 0xfb, 0xbb, 0xb0, 0xb5, 0x9f, 0x4b, 0x7b, 0xeb, 0x7a, 0x69, 0x6f, 0xfd, 0x59, 0xda, 0x5b, 0x5f, 0xdc, 0x30, 0xca, 0x2e, 0x66, 0x63, 0xd7, 0x4f, 0xa6, 0xbd, 0x6f, 0xc8, 0xff, 0x8e, 0x26, 0x67, 0x68, 0x4c, 0x7b, 0x82, 0xf3, 0xb9, 0xb8, 0x96, 0x5c, 0x89, 0x8b, 0xc9, 0x3c, 0xc5, 0x74, 0xdc, 0xe4, 0x97, 0x93, 0x97, - 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x39, 0xa3, 0x5a, 0xb9, 0x08, 0x00, 0x00, + 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x9c, 0x8a, 0xc6, 0xb9, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1247,7 +1247,7 @@ type MsgClient interface { CancelBid(ctx context.Context, in *MsgCancelBid, opts ...grpc.CallOption) (*MsgCancelBidResponse, error) List(ctx context.Context, in *MsgList, opts ...grpc.CallOption) (*MsgListResponse, error) Buy(ctx context.Context, in *MsgBuy, opts ...grpc.CallOption) (*MsgBuyResponse, error) - DeList(ctx context.Context, in *MsgDeList, opts ...grpc.CallOption) (*MsgDeListResponse, error) + Delist(ctx context.Context, in *MsgDelist, opts ...grpc.CallOption) (*MsgDelistResponse, error) Transfer(ctx context.Context, in *MsgTransfer, opts ...grpc.CallOption) (*MsgTransferResponse, error) AddRecord(ctx context.Context, in *MsgAddRecord, opts ...grpc.CallOption) (*MsgAddRecordResponse, error) DelRecord(ctx context.Context, in *MsgDelRecord, opts ...grpc.CallOption) (*MsgDelRecordResponse, error) @@ -1317,9 +1317,9 @@ func (c *msgClient) Buy(ctx context.Context, in *MsgBuy, opts ...grpc.CallOption return out, nil } -func (c *msgClient) DeList(ctx context.Context, in *MsgDeList, opts ...grpc.CallOption) (*MsgDeListResponse, error) { - out := new(MsgDeListResponse) - err := c.cc.Invoke(ctx, "/canine_chain.rns.Msg/DeList", in, out, opts...) +func (c *msgClient) Delist(ctx context.Context, in *MsgDelist, opts ...grpc.CallOption) (*MsgDelistResponse, error) { + out := new(MsgDelistResponse) + err := c.cc.Invoke(ctx, "/canine_chain.rns.Msg/Delist", in, out, opts...) if err != nil { return nil, err } @@ -1379,7 +1379,7 @@ type MsgServer interface { CancelBid(context.Context, *MsgCancelBid) (*MsgCancelBidResponse, error) List(context.Context, *MsgList) (*MsgListResponse, error) Buy(context.Context, *MsgBuy) (*MsgBuyResponse, error) - DeList(context.Context, *MsgDeList) (*MsgDeListResponse, error) + Delist(context.Context, *MsgDelist) (*MsgDelistResponse, error) Transfer(context.Context, *MsgTransfer) (*MsgTransferResponse, error) AddRecord(context.Context, *MsgAddRecord) (*MsgAddRecordResponse, error) DelRecord(context.Context, *MsgDelRecord) (*MsgDelRecordResponse, error) @@ -1409,8 +1409,8 @@ func (*UnimplementedMsgServer) List(ctx context.Context, req *MsgList) (*MsgList func (*UnimplementedMsgServer) Buy(ctx context.Context, req *MsgBuy) (*MsgBuyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Buy not implemented") } -func (*UnimplementedMsgServer) DeList(ctx context.Context, req *MsgDeList) (*MsgDeListResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeList not implemented") +func (*UnimplementedMsgServer) Delist(ctx context.Context, req *MsgDelist) (*MsgDelistResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delist not implemented") } func (*UnimplementedMsgServer) Transfer(ctx context.Context, req *MsgTransfer) (*MsgTransferResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Transfer not implemented") @@ -1540,20 +1540,20 @@ func _Msg_Buy_Handler(srv interface{}, ctx context.Context, dec func(interface{} return interceptor(ctx, in, info, handler) } -func _Msg_DeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgDeList) +func _Msg_Delist_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgDelist) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).DeList(ctx, in) + return srv.(MsgServer).Delist(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.rns.Msg/DeList", + FullMethod: "/canine_chain.rns.Msg/Delist", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).DeList(ctx, req.(*MsgDeList)) + return srv.(MsgServer).Delist(ctx, req.(*MsgDelist)) } return interceptor(ctx, in, info, handler) } @@ -1677,8 +1677,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_Buy_Handler, }, { - MethodName: "DeList", - Handler: _Msg_DeList_Handler, + MethodName: "Delist", + Handler: _Msg_Delist_Handler, }, { MethodName: "Transfer", @@ -2165,7 +2165,7 @@ func (m *MsgBuyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgDeList) Marshal() (dAtA []byte, err error) { +func (m *MsgDelist) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2175,12 +2175,12 @@ func (m *MsgDeList) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgDeList) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgDelist) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgDeList) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgDelist) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2202,7 +2202,7 @@ func (m *MsgDeList) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgDeListResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgDelistResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2212,12 +2212,12 @@ func (m *MsgDeListResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgDeListResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgDelistResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgDeListResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgDelistResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2702,7 +2702,7 @@ func (m *MsgBuyResponse) Size() (n int) { return n } -func (m *MsgDeList) Size() (n int) { +func (m *MsgDelist) Size() (n int) { if m == nil { return 0 } @@ -2719,7 +2719,7 @@ func (m *MsgDeList) Size() (n int) { return n } -func (m *MsgDeListResponse) Size() (n int) { +func (m *MsgDelistResponse) Size() (n int) { if m == nil { return 0 } @@ -4177,7 +4177,7 @@ func (m *MsgBuyResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgDeList) Unmarshal(dAtA []byte) error { +func (m *MsgDelist) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4200,10 +4200,10 @@ func (m *MsgDeList) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgDeList: wiretype end group for non-group") + return fmt.Errorf("proto: MsgDelist: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDeList: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgDelist: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4291,7 +4291,7 @@ func (m *MsgDeList) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgDeListResponse) Unmarshal(dAtA []byte) error { +func (m *MsgDelistResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4314,10 +4314,10 @@ func (m *MsgDeListResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgDeListResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgDelistResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDeListResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgDelistResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: diff --git a/x/storage/client/cli/tx_init_provider.go b/x/storage/client/cli/tx_init_provider.go index 3dfcc101c..9f444c742 100644 --- a/x/storage/client/cli/tx_init_provider.go +++ b/x/storage/client/cli/tx_init_provider.go @@ -21,7 +21,10 @@ func CmdInitProvider() *cobra.Command { argIP := args[0] argTotalSpace := args[1] argKeybase := args[2] - + space, err := strconv.ParseInt(argTotalSpace, 10, 64) + if err != nil { + return err + } clientCtx, err := client.GetClientTxContext(cmd) if err != nil { return err @@ -30,7 +33,7 @@ func CmdInitProvider() *cobra.Command { msg := types.NewMsgInitProvider( clientCtx.GetFromAddress().String(), argIP, - argTotalSpace, + space, argKeybase, ) if err := msg.ValidateBasic(); err != nil { diff --git a/x/storage/client/cli/tx_set_provider_totalspace.go b/x/storage/client/cli/tx_set_provider_totalspace.go index 67f14e6ca..2de63703a 100644 --- a/x/storage/client/cli/tx_set_provider_totalspace.go +++ b/x/storage/client/cli/tx_set_provider_totalspace.go @@ -18,6 +18,10 @@ func CmdSetProviderTotalSpace() *cobra.Command { Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) (err error) { argSpace := args[0] + space, err := strconv.ParseInt(argSpace, 10, 64) + if err != nil { + return err + } clientCtx, err := client.GetClientTxContext(cmd) if err != nil { @@ -26,7 +30,7 @@ func CmdSetProviderTotalSpace() *cobra.Command { msg := types.NewMsgSetProviderTotalSpace( clientCtx.GetFromAddress().String(), - argSpace, + space, ) if err := msg.ValidateBasic(); err != nil { return err diff --git a/x/storage/keeper/grpc_query_freespace.go b/x/storage/keeper/grpc_query_freespace.go index e291d2b48..3114a28a3 100644 --- a/x/storage/keeper/grpc_query_freespace.go +++ b/x/storage/keeper/grpc_query_freespace.go @@ -32,7 +32,7 @@ func (k Keeper) FreeSpace(goCtx context.Context, req *types.QueryFreeSpace) (*ty } return &types.QueryFreeSpaceResponse{ - Space: fmt.Sprintf("%d", space.Int64()-num), + Space: space.Int64() - num, }, nil } @@ -46,6 +46,6 @@ func (k Keeper) StoreCount(goCtx context.Context, req *types.QueryStoreCount) (* num := k.GetProviderDeals(ctx, req.Address) return &types.QueryStoreCountResponse{ - Count: fmt.Sprintf("%d", num), + Count: num, }, nil } diff --git a/x/storage/keeper/msg_server_init_provider.go b/x/storage/keeper/msg_server_init_provider.go index 6cf27ec81..171c44283 100644 --- a/x/storage/keeper/msg_server_init_provider.go +++ b/x/storage/keeper/msg_server_init_provider.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -40,7 +41,7 @@ func (k msgServer) InitProvider(goCtx context.Context, msg *types.MsgInitProvide provider := types.Providers{ Address: msg.Creator, Ip: msg.Ip, - Totalspace: msg.TotalSpace, + Totalspace: fmt.Sprintf("%d", msg.TotalSpace), Creator: msg.Creator, BurnedContracts: "0", KeybaseIdentity: msg.Keybase, diff --git a/x/storage/keeper/msg_server_proofs_test.go b/x/storage/keeper/msg_server_proofs_test.go index c228b66e6..880e8e50d 100644 --- a/x/storage/keeper/msg_server_proofs_test.go +++ b/x/storage/keeper/msg_server_proofs_test.go @@ -143,7 +143,7 @@ func (suite *KeeperTestSuite) TestPostProof() { _, err = msgSrvr.InitProvider(context, &types.MsgInitProvider{ Creator: testProvider.String(), Ip: "192.168.0.1", - TotalSpace: "1_000_000", + TotalSpace: 1_000_000, }) suite.Require().NoError(err) diff --git a/x/storage/keeper/msg_server_providers_test.go b/x/storage/keeper/msg_server_providers_test.go index 117f542ee..53eac5774 100644 --- a/x/storage/keeper/msg_server_providers_test.go +++ b/x/storage/keeper/msg_server_providers_test.go @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestMsgInitProvider() { return types.NewMsgInitProvider( user, "127.0.0.1", - "1000000000", + 1000000000, "test-key", ) }, @@ -156,7 +156,7 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { preRun: func() *types.MsgSetProviderTotalSpace { return types.NewMsgSetProviderTotalSpace( user, - "1000000", + 1000000, ) }, expErr: false, @@ -166,24 +166,13 @@ func (suite *KeeperTestSuite) TestMsgSetProviderTotalSpace() { preRun: func() *types.MsgSetProviderTotalSpace { return types.NewMsgSetProviderTotalSpace( "wrong address", - "1000000", + 1000000, ) }, expErr: true, expErrMsg: "provider not found please init your provider", name: "set provider total space fail", }, - { - preRun: func() *types.MsgSetProviderTotalSpace { - return types.NewMsgSetProviderTotalSpace( - user, - "9@!0", - ) - }, - expErr: true, - expErrMsg: "not valid total space please enter total number of bytes to provide", - name: "invalid space param", - }, } for _, tc := range cases { diff --git a/x/storage/keeper/msg_server_set_provider_totalspace.go b/x/storage/keeper/msg_server_set_provider_totalspace.go index b1c8b50fa..42d7849d9 100644 --- a/x/storage/keeper/msg_server_set_provider_totalspace.go +++ b/x/storage/keeper/msg_server_set_provider_totalspace.go @@ -2,7 +2,7 @@ package keeper import ( "context" - "strconv" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/jackalLabs/canine-chain/v3/x/storage/types" @@ -17,24 +17,9 @@ func (k msgServer) SetProviderTotalSpace(goCtx context.Context, msg *types.MsgSe return nil, types.ErrProviderNotFound } - validTotalSpace := isValidTotalSpace(msg.Space) - - if !validTotalSpace { - return nil, types.ErrNotValidTotalSpace - } - - provider.Totalspace = msg.Space + provider.Totalspace = fmt.Sprintf("%d", msg.Space) k.SetProviders(ctx, provider) return &types.MsgSetProviderTotalSpaceResponse{}, nil } - -func isValidTotalSpace(totalSpace string) bool { - var isNumber bool - - if _, err := strconv.Atoi(totalSpace); err == nil { - isNumber = true - } - return isNumber -} diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index bf2c0f558..2ca96c0ba 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -61,7 +61,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { Creator: user, Ip: "192.158.1.38", Keybase: "", - TotalSpace: "9000", + TotalSpace: 9000, } _, err = msgSrvr.InitProvider(ctx, &initMsg) diff --git a/x/storage/simulation/init_miner.go b/x/storage/simulation/init_miner.go index 0712e8a6d..80432da52 100644 --- a/x/storage/simulation/init_miner.go +++ b/x/storage/simulation/init_miner.go @@ -2,7 +2,6 @@ package simulation import ( "math/rand" - "strconv" "github.com/cosmos/cosmos-sdk/baseapp" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -40,7 +39,7 @@ func SimulateMsgInitProvider( msg := &types.MsgInitProvider{ Creator: simAccount.Address.String(), Ip: RandIPv4Url(r), - TotalSpace: strconv.Itoa(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), + TotalSpace: int64(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), Keybase: simtypes.RandStringOfLength(r, 10), } diff --git a/x/storage/simulation/set_miner_totalspace.go b/x/storage/simulation/set_miner_totalspace.go index eafcbba11..925b507e0 100644 --- a/x/storage/simulation/set_miner_totalspace.go +++ b/x/storage/simulation/set_miner_totalspace.go @@ -2,7 +2,6 @@ package simulation import ( "math/rand" - "strconv" "github.com/cosmos/cosmos-sdk/baseapp" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -33,7 +32,7 @@ func SimulateMsgSetProviderTotalSpace( msg := &types.MsgSetProviderTotalSpace{ Creator: provider.Creator, - Space: strconv.Itoa(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), + Space: int64(simtypes.RandIntBetween(r, 1_000_000_000, 1_000_000_000_000_000)), } spendable := bk.SpendableCoins(ctx, simAccount.Address) diff --git a/x/storage/types/message_init_miner.go b/x/storage/types/message_init_miner.go index 5c2d8e6fc..df10bb1dd 100644 --- a/x/storage/types/message_init_miner.go +++ b/x/storage/types/message_init_miner.go @@ -3,7 +3,6 @@ package types import ( fmt "fmt" "net/url" - "strconv" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/bech32" @@ -14,7 +13,7 @@ const TypeMsgInitProvider = "init_provider" var _ sdk.Msg = &MsgInitProvider{} -func NewMsgInitProvider(creator string, ip string, totalspace string, keybase string) *MsgInitProvider { +func NewMsgInitProvider(creator string, ip string, totalspace int64, keybase string) *MsgInitProvider { return &MsgInitProvider{ Creator: creator, Ip: ip, @@ -58,8 +57,5 @@ func (msg *MsgInitProvider) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "invalid provider ip (%s)", err) } - if _, err := strconv.Atoi(msg.TotalSpace); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot parse totalspace (%s)", err) - } return nil } diff --git a/x/storage/types/message_init_miner_test.go b/x/storage/types/message_init_miner_test.go index 700a8b994..583138d2b 100644 --- a/x/storage/types/message_init_miner_test.go +++ b/x/storage/types/message_init_miner_test.go @@ -18,7 +18,7 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "invalid_address", Ip: "http://localhost:3333", - TotalSpace: "1000000000", + TotalSpace: 1000000000, }, err: sdkerrors.ErrInvalidAddress, }, { @@ -26,15 +26,7 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "fake/localhost:3333", - TotalSpace: "1000000000", - }, - err: sdkerrors.ErrInvalidType, - }, { - name: "invalid totalspace", - msg: MsgInitProvider{ - Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", - Ip: "https://node.jackalprotocol.com", - TotalSpace: "abd", + TotalSpace: 1000000000, }, err: sdkerrors.ErrInvalidType, }, { @@ -42,14 +34,14 @@ func TestMsgInitProvider_ValidateBasic(t *testing.T) { msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "https://node.jackalprotocol.com", - TotalSpace: "1000000000", + TotalSpace: 1000000000, }, }, { name: "valid ip localhost", msg: MsgInitProvider{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", Ip: "localhost:3333", - TotalSpace: "1000000000", + TotalSpace: 1000000000, }, }, } diff --git a/x/storage/types/message_set_miner_totalspace.go b/x/storage/types/message_set_miner_totalspace.go index 1fce7c6e4..973375fdb 100644 --- a/x/storage/types/message_set_miner_totalspace.go +++ b/x/storage/types/message_set_miner_totalspace.go @@ -2,7 +2,6 @@ package types import ( fmt "fmt" - "strconv" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/bech32" @@ -13,7 +12,7 @@ const TypeMsgSetProviderTotalSpace = "set_provider_total_space" var _ sdk.Msg = &MsgSetProviderTotalSpace{} -func NewMsgSetProviderTotalSpace(creator string, space string) *MsgSetProviderTotalSpace { +func NewMsgSetProviderTotalSpace(creator string, space int64) *MsgSetProviderTotalSpace { return &MsgSetProviderTotalSpace{ Creator: creator, Space: space, @@ -50,8 +49,5 @@ func (msg *MsgSetProviderTotalSpace) ValidateBasic() error { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator prefix (%s)", fmt.Errorf("%s is not a valid prefix here. Expected `jkl`", prefix)) } - if _, err := strconv.Atoi(msg.Space); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot parse space (%s)", err) - } return nil } diff --git a/x/storage/types/message_set_miner_totalspace_test.go b/x/storage/types/message_set_miner_totalspace_test.go index 2e503ed90..66f9d5f75 100644 --- a/x/storage/types/message_set_miner_totalspace_test.go +++ b/x/storage/types/message_set_miner_totalspace_test.go @@ -17,21 +17,14 @@ func TestMsgSetProviderTotalSpace_ValidateBasic(t *testing.T) { name: "invalid address", msg: MsgSetProviderTotalSpace{ Creator: "invalid_address", - Space: "1000000000", + Space: 1000000000, }, err: sdkerrors.ErrInvalidAddress, - }, { - name: "invalid ip", - msg: MsgSetProviderTotalSpace{ - Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", - Space: "abd", - }, - err: sdkerrors.ErrInvalidType, }, { name: "valid ip", msg: MsgSetProviderTotalSpace{ Creator: "jkl1j3p63s42w7ywaczlju626st55mzu5z399f5n6n", - Space: "1000000000", + Space: 1000000000, }, }, } diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index f95856c21..94f047f8e 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -1271,7 +1271,7 @@ func (m *QueryStoreCount) GetAddress() string { } type QueryFreeSpaceResponse struct { - Space string `protobuf:"bytes,1,opt,name=space,proto3" json:"space,omitempty"` + Space int64 `protobuf:"varint,1,opt,name=space,proto3" json:"space,omitempty"` } func (m *QueryFreeSpaceResponse) Reset() { *m = QueryFreeSpaceResponse{} } @@ -1307,15 +1307,15 @@ func (m *QueryFreeSpaceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryFreeSpaceResponse proto.InternalMessageInfo -func (m *QueryFreeSpaceResponse) GetSpace() string { +func (m *QueryFreeSpaceResponse) GetSpace() int64 { if m != nil { return m.Space } - return "" + return 0 } type QueryStoreCountResponse struct { - Count string `protobuf:"bytes,1,opt,name=count,proto3" json:"count,omitempty"` + Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` } func (m *QueryStoreCountResponse) Reset() { *m = QueryStoreCountResponse{} } @@ -1351,11 +1351,11 @@ func (m *QueryStoreCountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryStoreCountResponse proto.InternalMessageInfo -func (m *QueryStoreCountResponse) GetCount() string { +func (m *QueryStoreCountResponse) GetCount() int64 { if m != nil { return m.Count } - return "" + return 0 } type QueryFindFile struct { @@ -2243,134 +2243,134 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/query.proto", fileDescriptor_9fe03bff51a37284) } var fileDescriptor_9fe03bff51a37284 = []byte{ - // 2019 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6f, 0x5b, 0x49, - 0x15, 0xef, 0xe4, 0x6b, 0xe3, 0xe3, 0x74, 0x5b, 0x66, 0xb3, 0x25, 0x58, 0x21, 0x49, 0xa7, 0xcd, - 0x47, 0xd3, 0xc6, 0xb7, 0x49, 0x29, 0x94, 0x76, 0x5b, 0x6d, 0x92, 0x92, 0x52, 0xb1, 0xdd, 0xa6, - 0x37, 0x2a, 0x88, 0x45, 0xe2, 0x32, 0xb1, 0x27, 0xee, 0x25, 0xce, 0xbd, 0x77, 0xef, 0xbd, 0x2e, - 0x58, 0x51, 0x5e, 0xe8, 0x0b, 0xbc, 0xad, 0x84, 0x8a, 0x60, 0x85, 0x84, 0x84, 0x2a, 0x60, 0xc5, - 0x3b, 0x20, 0xfe, 0x82, 0x7d, 0x63, 0x25, 0x5e, 0x10, 0x0f, 0x15, 0x6a, 0xe1, 0xff, 0x40, 0xf3, - 0x71, 0xc7, 0x63, 0xe7, 0x7a, 0xec, 0x20, 0xa3, 0x7d, 0x8a, 0x67, 0xfc, 0x3b, 0xe7, 0xfc, 0xce, - 0xc7, 0xcc, 0x9c, 0xe3, 0xc0, 0x5c, 0x85, 0x06, 0x7e, 0xc0, 0xbc, 0xca, 0x13, 0xea, 0x07, 0x4e, - 0x92, 0x86, 0x31, 0xad, 0x31, 0xe7, 0xc3, 0x06, 0x8b, 0x9b, 0xe5, 0x28, 0x0e, 0xd3, 0x10, 0x4f, - 0x9a, 0x88, 0xb2, 0x42, 0x94, 0x26, 0x6b, 0x61, 0x2d, 0x14, 0x00, 0x87, 0x7f, 0x92, 0xd8, 0xd2, - 0x74, 0x2d, 0x0c, 0x6b, 0x75, 0xe6, 0xd0, 0xc8, 0x77, 0x68, 0x10, 0x84, 0x29, 0x4d, 0xfd, 0x30, - 0x48, 0xd4, 0xb7, 0xcb, 0x95, 0x30, 0x39, 0x08, 0x13, 0x67, 0x97, 0x26, 0xca, 0x84, 0xf3, 0x74, - 0x75, 0x97, 0xa5, 0x74, 0xd5, 0x89, 0x68, 0xcd, 0x0f, 0x04, 0x58, 0x61, 0xcf, 0xe7, 0xf2, 0x8a, - 0x68, 0x4c, 0x0f, 0x32, 0x75, 0x8b, 0xb9, 0x10, 0x5a, 0x49, 0xfd, 0xa7, 0xcc, 0xab, 0x32, 0x5a, - 0xcf, 0x80, 0x17, 0xf3, 0x75, 0xc5, 0xe1, 0x53, 0xbf, 0xca, 0x62, 0xbb, 0xba, 0x88, 0x36, 0x0f, - 0x58, 0x90, 0x7a, 0x7e, 0xb0, 0xa7, 0x9c, 0x24, 0xa7, 0xa1, 0xf8, 0x88, 0x93, 0xdf, 0x16, 0x64, - 0xc8, 0x23, 0x78, 0xcb, 0x58, 0xba, 0x2c, 0x89, 0xc2, 0x20, 0x61, 0xf8, 0x26, 0x8c, 0x49, 0xb6, - 0x53, 0x68, 0x0e, 0x2d, 0x15, 0xd7, 0xa6, 0xcb, 0x79, 0x71, 0x2c, 0x4b, 0xa9, 0x8d, 0x91, 0x4f, - 0x5f, 0xce, 0x9e, 0x72, 0x95, 0x04, 0x39, 0x04, 0x90, 0x2a, 0xe3, 0x30, 0xdc, 0xc3, 0x97, 0xe0, - 0x6c, 0xc6, 0xd5, 0xa3, 0xd5, 0x6a, 0xcc, 0x12, 0xa9, 0xb3, 0xe0, 0x9e, 0xc9, 0xf6, 0xd7, 0xe5, - 0x36, 0x3e, 0x07, 0x63, 0x07, 0x2c, 0xde, 0xaf, 0xb3, 0xa9, 0xa1, 0x39, 0xb4, 0x34, 0xe1, 0xaa, - 0x15, 0x9e, 0x84, 0xd1, 0xf0, 0x47, 0x01, 0x8b, 0xa7, 0x86, 0x85, 0x9c, 0x5c, 0xf0, 0xdd, 0x24, - 0xa5, 0x71, 0x3a, 0x35, 0x32, 0x87, 0x96, 0x86, 0x5d, 0xb9, 0x20, 0x8f, 0x00, 0xb7, 0x8c, 0x6b, - 0x77, 0x6e, 0xc1, 0x68, 0xc4, 0x37, 0x94, 0x37, 0xb3, 0xf9, 0xde, 0x6c, 0xf9, 0x75, 0x26, 0xe4, - 0x94, 0x43, 0x52, 0x86, 0xfc, 0x0c, 0xc1, 0x64, 0x4b, 0x67, 0xb2, 0xd1, 0xcc, 0xf8, 0x9e, 0xc0, - 0xb5, 0x2d, 0x80, 0x56, 0x91, 0x08, 0xf7, 0x8a, 0x6b, 0x0b, 0x65, 0x59, 0x51, 0x65, 0x5e, 0x51, - 0x65, 0x59, 0xb4, 0xaa, 0xa2, 0xca, 0xdb, 0xb4, 0xc6, 0x5c, 0xf6, 0x61, 0x83, 0x25, 0xa9, 0x6b, - 0x48, 0x92, 0x17, 0x08, 0xa6, 0xf3, 0xb8, 0xe4, 0x79, 0x3a, 0x7c, 0x52, 0x4f, 0xf1, 0xbd, 0x1c, - 0x96, 0x8b, 0x3d, 0x59, 0x4a, 0xcb, 0x6d, 0x34, 0x1f, 0x42, 0x41, 0xb0, 0xe4, 0x76, 0x8c, 0xb4, - 0xa2, 0xfc, 0xb4, 0x0e, 0xe5, 0xa6, 0x75, 0xd8, 0x4c, 0xeb, 0x36, 0x7c, 0x41, 0x2b, 0x34, 0x7c, - 0x1d, 0xd9, 0xf3, 0x95, 0xda, 0xe2, 0xda, 0xf9, 0x7c, 0x57, 0x1f, 0x07, 0xfe, 0x9e, 0xcf, 0xaa, - 0x5c, 0x50, 0x39, 0x2b, 0x84, 0xc8, 0x77, 0xe0, 0xb4, 0xd0, 0xb8, 0x5e, 0xaf, 0xf3, 0xef, 0x3a, - 0x53, 0x84, 0xfe, 0xe7, 0x14, 0x3d, 0x43, 0xf0, 0xa6, 0xd0, 0xfc, 0x30, 0x62, 0x81, 0x54, 0xfd, - 0x39, 0x14, 0xca, 0x6f, 0x10, 0xbc, 0xdd, 0xe6, 0x9f, 0x8e, 0xda, 0x6d, 0x18, 0xe5, 0x01, 0x48, - 0x54, 0x85, 0xf4, 0x1d, 0x36, 0x29, 0x35, 0xb8, 0x1a, 0xb9, 0xa4, 0x12, 0xb0, 0xad, 0x22, 0x80, - 0xa7, 0xe0, 0x8d, 0xf6, 0xe0, 0x64, 0x4b, 0xf2, 0x81, 0xf2, 0x25, 0x83, 0x6a, 0x5f, 0xd6, 0x61, - 0x3c, 0x0b, 0xa0, 0xfd, 0x68, 0x67, 0x92, 0xd9, 0x5d, 0xa5, 0xc5, 0xc8, 0xf7, 0x54, 0x65, 0xad, - 0xd7, 0xeb, 0x1a, 0x34, 0xb0, 0x5a, 0xf8, 0x04, 0xc1, 0x97, 0x8e, 0x69, 0xd7, 0xec, 0x37, 0xa1, - 0xa0, 0xaf, 0x71, 0xfb, 0x79, 0xed, 0xa4, 0xdf, 0x92, 0x1b, 0x5c, 0x3e, 0x02, 0x38, 0x2b, 0xa9, - 0xa6, 0x29, 0x4b, 0xe4, 0xd3, 0xc7, 0x8f, 0x2e, 0xb7, 0xa4, 0xa2, 0x5b, 0x70, 0xd5, 0x6a, 0x20, - 0x37, 0xb5, 0x0f, 0x53, 0x9d, 0xf6, 0x74, 0x64, 0x1e, 0x40, 0x91, 0xb6, 0xb6, 0x55, 0x02, 0xe6, - 0xf3, 0x63, 0x63, 0xc8, 0x6f, 0x85, 0xf1, 0x81, 0x8a, 0x90, 0x29, 0x4f, 0xbe, 0xaf, 0x2e, 0xf0, - 0xf5, 0x7a, 0xdd, 0x40, 0x0f, 0x2e, 0xcd, 0x7f, 0xc9, 0x6e, 0xe5, 0x0e, 0x03, 0xda, 0x9f, 0x87, - 0x30, 0x61, 0xf0, 0xc9, 0x92, 0x7d, 0x22, 0x87, 0xda, 0x14, 0x0c, 0x2e, 0xeb, 0xbe, 0x6a, 0x07, - 0x5c, 0x16, 0x85, 0x71, 0xfa, 0x7f, 0x4d, 0xf8, 0x63, 0xd5, 0x6a, 0x48, 0x53, 0x3a, 0x36, 0x77, - 0x60, 0x2c, 0x16, 0x3b, 0x2a, 0x01, 0x73, 0xf9, 0x51, 0x91, 0x52, 0x46, 0x40, 0x94, 0x14, 0xf9, - 0x2e, 0x9c, 0xc9, 0x62, 0x2f, 0x31, 0x83, 0xcb, 0xeb, 0x0b, 0x04, 0x5f, 0xec, 0xd0, 0xad, 0x69, - 0xbf, 0x0b, 0x6f, 0x48, 0x02, 0x59, 0x36, 0xfb, 0xe5, 0x9d, 0x89, 0x0d, 0x2e, 0x87, 0xcb, 0xea, - 0xc1, 0xd9, 0x8a, 0x19, 0xdb, 0x89, 0x68, 0x85, 0x59, 0xae, 0xd2, 0xcb, 0x2a, 0x5a, 0x3b, 0x69, - 0x18, 0xb3, 0xcd, 0xb0, 0x11, 0xa4, 0x16, 0x70, 0x19, 0xce, 0xb5, 0x2b, 0xd6, 0xde, 0xf3, 0x0c, - 0xf3, 0x0d, 0x25, 0x21, 0x17, 0xc4, 0x51, 0xe1, 0x6a, 0x29, 0x37, 0x05, 0x2a, 0x7c, 0x23, 0x13, - 0x10, 0x0b, 0xb2, 0xa8, 0xde, 0x80, 0x2d, 0x3f, 0xa8, 0xda, 0x7a, 0x05, 0x72, 0x53, 0xbd, 0x00, - 0x19, 0x50, 0xeb, 0x3d, 0x0f, 0x13, 0xfa, 0x69, 0xf5, 0xa3, 0xcc, 0x83, 0x62, 0xb6, 0x77, 0x3f, - 0x4a, 0xc8, 0x55, 0x75, 0xfa, 0x37, 0xeb, 0x3e, 0x0b, 0xd2, 0x7e, 0x82, 0x74, 0x5b, 0x1d, 0xe7, - 0x0e, 0x09, 0x6d, 0xf4, 0xcb, 0x00, 0xbb, 0xcd, 0x94, 0x25, 0xde, 0x5e, 0xcc, 0x24, 0xd3, 0x61, - 0xb7, 0x20, 0x76, 0x38, 0x96, 0x2c, 0xc1, 0x84, 0xea, 0xa9, 0x9b, 0x77, 0x69, 0x4a, 0x2d, 0x86, - 0x76, 0xb2, 0xce, 0x52, 0x22, 0xb5, 0x81, 0x79, 0x78, 0x33, 0xf5, 0x0f, 0x98, 0x17, 0xb3, 0x03, - 0xea, 0x07, 0x7e, 0x50, 0x53, 0x46, 0x4e, 0xf3, 0x5d, 0x37, 0xdb, 0xe4, 0x41, 0x15, 0x56, 0x45, - 0xf1, 0x0c, 0xbb, 0x72, 0x41, 0xae, 0x19, 0x59, 0xa0, 0x35, 0xb6, 0x2d, 0x67, 0x80, 0xfb, 0xc1, - 0x5e, 0x68, 0x61, 0xf2, 0x0c, 0xc1, 0x6c, 0x17, 0x29, 0xcd, 0xea, 0x07, 0x30, 0xa9, 0xaa, 0xda, - 0x33, 0x07, 0x0b, 0x75, 0xc0, 0x96, 0xf2, 0xeb, 0xff, 0xb8, 0x3e, 0x75, 0x0e, 0x70, 0x72, 0xec, - 0x1b, 0x52, 0x85, 0x52, 0x76, 0xde, 0x72, 0xd8, 0x0f, 0xea, 0x58, 0xff, 0x0d, 0x01, 0xe9, 0x6e, - 0xa6, 0x0f, 0x77, 0x87, 0x07, 0xe3, 0xee, 0xe0, 0x6e, 0x80, 0x2d, 0x55, 0x47, 0xfc, 0x68, 0x3c, - 0x8e, 0xea, 0x21, 0xad, 0x6e, 0x3e, 0x61, 0x95, 0xfd, 0xee, 0xf9, 0xee, 0x52, 0x3a, 0x5f, 0x51, - 0x85, 0xdf, 0xa1, 0xc7, 0x3c, 0xc5, 0x4f, 0x69, 0xdd, 0xaf, 0x0a, 0x6d, 0xe3, 0xae, 0x5c, 0x90, - 0x4d, 0x75, 0xa7, 0x6c, 0xc7, 0x7e, 0x85, 0x49, 0xc3, 0x25, 0x18, 0xaf, 0x36, 0xe2, 0x56, 0xa2, - 0x0a, 0xae, 0x5e, 0x77, 0x31, 0x9d, 0xdd, 0x1d, 0x2d, 0x25, 0xa6, 0xd5, 0x88, 0xef, 0xaa, 0x43, - 0x20, 0x17, 0xe4, 0x5c, 0xf6, 0xa8, 0x8b, 0x91, 0x59, 0x77, 0x48, 0xc4, 0xcf, 0xde, 0xe2, 0xf6, - 0x7d, 0xad, 0xed, 0xfe, 0xf1, 0xae, 0xab, 0xdb, 0x43, 0xdc, 0xae, 0xe1, 0x58, 0xef, 0x45, 0xde, - 0x52, 0xbd, 0xa3, 0x4a, 0xfa, 0x4e, 0x4a, 0xd3, 0x84, 0xfc, 0x67, 0x48, 0xf5, 0x7c, 0xe6, 0xae, - 0xb6, 0x3e, 0x0d, 0x85, 0xa8, 0x11, 0x57, 0x9e, 0xd0, 0x84, 0xc9, 0x28, 0x8e, 0xb8, 0xad, 0x0d, - 0x8c, 0x61, 0xa4, 0xc1, 0xbf, 0x18, 0x12, 0x5f, 0x88, 0xcf, 0xf8, 0x01, 0x00, 0xff, 0xeb, 0x89, - 0xe8, 0x89, 0x77, 0x76, 0x62, 0xa3, 0xcc, 0x99, 0xfc, 0xf3, 0xe5, 0xec, 0x42, 0xcd, 0x4f, 0x9f, - 0x34, 0x76, 0xcb, 0x95, 0xf0, 0xc0, 0x51, 0x3f, 0x4f, 0xc8, 0x3f, 0x2b, 0x49, 0x75, 0xdf, 0x49, - 0x9b, 0x11, 0x4b, 0xca, 0x77, 0x59, 0xc5, 0x2d, 0x70, 0x0d, 0x2e, 0x57, 0xc0, 0x2f, 0x4c, 0xf5, - 0x23, 0x43, 0x23, 0xe1, 0x11, 0x18, 0x11, 0xa6, 0x8a, 0x72, 0xef, 0x31, 0xdf, 0xc2, 0x55, 0x38, - 0x2d, 0xbe, 0xf3, 0x76, 0x9b, 0x5e, 0x54, 0xa7, 0xc1, 0xd4, 0xa8, 0x88, 0xd2, 0xbb, 0xf9, 0x51, - 0xea, 0xea, 0x6b, 0x59, 0x68, 0xdb, 0x68, 0x6e, 0xd7, 0x69, 0xf0, 0x8d, 0x20, 0x8d, 0x9b, 0x6e, - 0xb1, 0xd1, 0xda, 0x29, 0xdd, 0x81, 0xb3, 0x9d, 0x00, 0x7c, 0x16, 0x86, 0xf7, 0x59, 0x53, 0xe5, - 0x99, 0x7f, 0x54, 0x15, 0xd7, 0x60, 0x59, 0xb1, 0x88, 0xc5, 0xcd, 0xa1, 0x1b, 0x68, 0xed, 0xf9, - 0x34, 0x8c, 0x0a, 0xdb, 0xf8, 0x19, 0x82, 0x31, 0xf9, 0x4b, 0x04, 0x3e, 0x6f, 0xe1, 0x28, 0x21, - 0xa5, 0x4b, 0x3d, 0x21, 0x99, 0x03, 0xe4, 0xf2, 0x4f, 0xfe, 0xfe, 0xef, 0x9f, 0x0f, 0xcd, 0xe3, - 0x0b, 0xce, 0x0f, 0x69, 0x65, 0x9f, 0xd6, 0x1d, 0x29, 0xb9, 0x92, 0xf7, 0xb3, 0x0e, 0x7e, 0x8e, - 0x60, 0x44, 0xbc, 0x61, 0xb3, 0x16, 0x03, 0x1c, 0x50, 0x5a, 0xec, 0x01, 0xd0, 0xf6, 0x37, 0x85, - 0xfd, 0xdb, 0xf8, 0x96, 0xd5, 0xbe, 0x98, 0xcb, 0x9c, 0x43, 0xf9, 0x52, 0x1e, 0x39, 0x87, 0xa2, - 0x07, 0x3b, 0x72, 0x0e, 0x45, 0xd7, 0x75, 0x84, 0x7f, 0x8a, 0x60, 0x5c, 0x0f, 0xb9, 0x17, 0x2c, - 0xa6, 0x33, 0x50, 0xe9, 0x72, 0x1f, 0x20, 0xcd, 0x71, 0x59, 0x70, 0xbc, 0x88, 0x49, 0x6f, 0x8e, - 0xf8, 0xb7, 0x08, 0x0a, 0xad, 0xa9, 0xf8, 0xa2, 0xc5, 0x8c, 0x46, 0x9d, 0x8c, 0xcc, 0x86, 0x20, - 0xf3, 0x0e, 0xbe, 0x69, 0x25, 0x13, 0x46, 0x2c, 0xf0, 0x54, 0xd4, 0x3a, 0xe7, 0xf2, 0x23, 0xfc, - 0x47, 0x04, 0xa3, 0xf2, 0xa7, 0xab, 0x39, 0x5b, 0xa5, 0x70, 0x44, 0x69, 0xa9, 0x17, 0x42, 0x33, - 0xfb, 0xb6, 0x60, 0xb6, 0x8d, 0xdf, 0xb7, 0x97, 0x12, 0x97, 0xc9, 0x21, 0xd5, 0x3d, 0xbb, 0xbf, - 0x40, 0x30, 0xae, 0x27, 0xe8, 0x0b, 0x76, 0x3a, 0x02, 0x64, 0x0d, 0x68, 0xe7, 0x80, 0x4d, 0x6e, - 0x08, 0xda, 0x6b, 0xf8, 0x6a, 0x2f, 0xda, 0xf2, 0x46, 0x74, 0x0e, 0x75, 0x18, 0x7f, 0x89, 0x60, - 0xa2, 0x6d, 0xa6, 0x5e, 0xb4, 0x27, 0x52, 0x03, 0x4b, 0x4e, 0x9f, 0x40, 0x4d, 0xb2, 0x2c, 0x48, - 0x2e, 0xe1, 0x85, 0xfe, 0x48, 0xe2, 0xbf, 0x22, 0x28, 0x9a, 0x53, 0xee, 0x82, 0xcd, 0x60, 0x0b, - 0x57, 0x2a, 0xf7, 0x87, 0xd3, 0xbc, 0x76, 0x04, 0xaf, 0x07, 0xf8, 0x5b, 0x56, 0x5e, 0xe6, 0x5c, - 0x27, 0x53, 0x2f, 0xf2, 0xdb, 0x2d, 0xe1, 0x2f, 0x10, 0x9c, 0xe9, 0x9c, 0x63, 0x97, 0xed, 0x11, - 0x33, 0xb1, 0xa5, 0xb5, 0xfe, 0xb1, 0xda, 0x91, 0x55, 0xe1, 0xc8, 0x65, 0x7c, 0xa9, 0x6f, 0x47, - 0xf0, 0xef, 0x10, 0x8c, 0xa9, 0x99, 0xd2, 0x76, 0x27, 0x4b, 0x88, 0xf5, 0x4e, 0x6e, 0x1f, 0x17, - 0xc9, 0xfb, 0x82, 0xcb, 0x37, 0xf1, 0x96, 0x95, 0x8b, 0x9a, 0xb1, 0xfa, 0x88, 0xe7, 0x47, 0x08, - 0xc0, 0x18, 0x1d, 0xe7, 0xed, 0xe1, 0x51, 0xb0, 0xd2, 0x4a, 0x5f, 0x30, 0x4d, 0xfa, 0x8a, 0x20, - 0xbd, 0x80, 0x2f, 0xf6, 0x43, 0x1a, 0x7f, 0x8c, 0xa0, 0xd0, 0x1a, 0x53, 0x6c, 0xd7, 0xa4, 0x46, - 0x95, 0xae, 0xf4, 0x83, 0xd2, 0x7c, 0xbe, 0x2e, 0xf8, 0x5c, 0xc3, 0xab, 0xf6, 0x4b, 0x3b, 0x66, - 0xcc, 0x13, 0x93, 0x9d, 0x71, 0xae, 0x3f, 0x46, 0x00, 0xc6, 0xf0, 0x38, 0xdf, 0xa3, 0x29, 0x90, - 0x30, 0x6b, 0xbc, 0x8e, 0x4f, 0x8b, 0xe4, 0xab, 0x82, 0xdf, 0x55, 0x5c, 0xb6, 0xf2, 0xe3, 0x7f, - 0xfd, 0xa0, 0x66, 0x90, 0x7b, 0x8e, 0x60, 0x5c, 0xcf, 0x92, 0x17, 0xac, 0xcf, 0xac, 0x04, 0x59, - 0x6f, 0xc3, 0xce, 0x61, 0x93, 0x7c, 0x4d, 0xd0, 0x5a, 0xc5, 0x4e, 0x8f, 0xb7, 0x2e, 0xa8, 0x8a, - 0xe7, 0x45, 0x17, 0x1d, 0xbf, 0x71, 0xf0, 0x3d, 0x96, 0x76, 0x4e, 0xa0, 0xb6, 0x73, 0xdb, 0x81, - 0xb5, 0x9e, 0xdb, 0x2e, 0x73, 0x2a, 0xb9, 0x2b, 0xf8, 0xde, 0xc1, 0xef, 0x58, 0xf9, 0xd6, 0x58, - 0xea, 0x55, 0x84, 0x06, 0x2f, 0x37, 0xe3, 0xbf, 0x42, 0x00, 0xf7, 0x58, 0x9a, 0x4d, 0xb3, 0xc4, - 0xda, 0x3f, 0x09, 0x4c, 0x69, 0xb9, 0x37, 0x46, 0x93, 0xbc, 0x25, 0x48, 0x5e, 0xc7, 0xd7, 0x7a, - 0x92, 0x8c, 0x68, 0xd3, 0xab, 0xd2, 0x94, 0x1a, 0xdc, 0xfe, 0x8c, 0x00, 0xe7, 0x4c, 0x8a, 0x2b, - 0xbd, 0x5b, 0x55, 0x03, 0x5e, 0xba, 0x7e, 0x22, 0xf8, 0x09, 0x99, 0x9b, 0xb3, 0xa3, 0xc1, 0xfc, - 0x4f, 0x08, 0xde, 0xce, 0x1f, 0x73, 0xaf, 0xda, 0xef, 0x96, 0x1c, 0xfe, 0x37, 0x4e, 0x2a, 0x71, - 0xc2, 0x9b, 0xdd, 0x74, 0x01, 0x7f, 0x82, 0xe0, 0x4c, 0xe7, 0x9c, 0xb9, 0xdc, 0xa3, 0xa3, 0x35, - 0xb0, 0xd6, 0x42, 0xee, 0x32, 0x77, 0xf6, 0x79, 0x1f, 0xf0, 0x33, 0xe7, 0x35, 0x84, 0xb8, 0x57, - 0x11, 0xbc, 0x7e, 0x8f, 0x00, 0x8c, 0xa9, 0x74, 0xde, 0xda, 0xfa, 0x64, 0x30, 0xeb, 0x65, 0x75, - 0x7c, 0x3c, 0xed, 0xb3, 0x4b, 0x17, 0x43, 0xab, 0xa4, 0xe5, 0x1c, 0x66, 0xb3, 0xf0, 0x91, 0x73, - 0x28, 0xa6, 0xdf, 0x23, 0xfc, 0x07, 0xfe, 0xac, 0xb7, 0xcf, 0x9b, 0xf6, 0x67, 0xbd, 0x1d, 0x6b, - 0x7f, 0xd6, 0xf3, 0x27, 0x61, 0x72, 0x5d, 0x10, 0x77, 0xf0, 0x8a, 0xfd, 0x59, 0x97, 0xd3, 0x62, - 0xab, 0x7d, 0xfa, 0x35, 0x82, 0x09, 0x73, 0xde, 0xb3, 0x76, 0x76, 0x26, 0xd0, 0xda, 0xd9, 0xe5, - 0x4d, 0x90, 0x64, 0x4d, 0x30, 0xbc, 0x82, 0x97, 0x7b, 0xbe, 0x03, 0xb4, 0xc6, 0x3c, 0xde, 0x7c, - 0x24, 0x1b, 0xef, 0x7d, 0xfa, 0x6a, 0x06, 0x7d, 0xf6, 0x6a, 0x06, 0xfd, 0xeb, 0xd5, 0x0c, 0xfa, - 0xe8, 0xf5, 0xcc, 0xa9, 0xcf, 0x5e, 0xcf, 0x9c, 0xfa, 0xc7, 0xeb, 0x99, 0x53, 0x1f, 0xac, 0x19, - 0xd3, 0xb2, 0xd4, 0xf7, 0x1e, 0xdd, 0x4d, 0xda, 0x75, 0xfe, 0x58, 0x6b, 0x15, 0xd3, 0xf3, 0xee, - 0x98, 0xf8, 0xaf, 0xf9, 0xb5, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x56, 0x8d, 0xfa, 0x65, 0x6a, - 0x20, 0x00, 0x00, + // 2021 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6f, 0x1c, 0x49, + 0x11, 0x4f, 0xfb, 0xeb, 0xbc, 0xb5, 0xce, 0x25, 0xf4, 0xf9, 0x82, 0x59, 0x19, 0xdb, 0xe9, 0xc4, + 0x1f, 0x71, 0xe2, 0x9d, 0xd8, 0x21, 0x10, 0x92, 0x4b, 0x74, 0xb6, 0x83, 0x43, 0xc4, 0xe5, 0xe2, + 0x8c, 0x15, 0x10, 0x87, 0xc4, 0xd0, 0xde, 0x6d, 0x6f, 0x06, 0xaf, 0x67, 0xe6, 0x66, 0x66, 0x03, + 0x2b, 0xcb, 0x2f, 0xe4, 0x05, 0xde, 0x4e, 0x42, 0x41, 0x70, 0x42, 0x42, 0x42, 0x11, 0x70, 0xe2, + 0x1d, 0x10, 0x7f, 0xc1, 0xbd, 0x71, 0x12, 0x2f, 0x88, 0x87, 0x08, 0x25, 0xf0, 0x7f, 0xa0, 0xfe, + 0x98, 0xde, 0xde, 0xf5, 0x6c, 0xef, 0x1a, 0x2d, 0xba, 0x27, 0x6f, 0xf7, 0xfe, 0xaa, 0xea, 0x57, + 0x55, 0xdd, 0xd5, 0x55, 0x6b, 0x98, 0xab, 0xd0, 0xc0, 0x0f, 0x98, 0x57, 0x79, 0x42, 0xfd, 0xc0, + 0x49, 0xd2, 0x30, 0xa6, 0x35, 0xe6, 0x7c, 0xd8, 0x60, 0x71, 0xb3, 0x1c, 0xc5, 0x61, 0x1a, 0xe2, + 0x49, 0x13, 0x51, 0x56, 0x88, 0xd2, 0x64, 0x2d, 0xac, 0x85, 0x02, 0xe0, 0xf0, 0x4f, 0x12, 0x5b, + 0x9a, 0xae, 0x85, 0x61, 0xad, 0xce, 0x1c, 0x1a, 0xf9, 0x0e, 0x0d, 0x82, 0x30, 0xa5, 0xa9, 0x1f, + 0x06, 0x89, 0xfa, 0x76, 0xb9, 0x12, 0x26, 0x07, 0x61, 0xe2, 0xec, 0xd2, 0x44, 0x99, 0x70, 0x9e, + 0xae, 0xee, 0xb2, 0x94, 0xae, 0x3a, 0x11, 0xad, 0xf9, 0x81, 0x00, 0x2b, 0xec, 0xf9, 0x5c, 0x5e, + 0x11, 0x8d, 0xe9, 0x41, 0xa6, 0x6e, 0x31, 0x17, 0x42, 0x2b, 0xa9, 0xff, 0x94, 0x79, 0x55, 0x46, + 0xeb, 0x19, 0xf0, 0x62, 0xbe, 0xae, 0x38, 0x7c, 0xea, 0x57, 0x59, 0x6c, 0x57, 0x17, 0xd1, 0xe6, + 0x01, 0x0b, 0x52, 0xcf, 0x0f, 0xf6, 0x94, 0x93, 0xe4, 0x34, 0x14, 0x1f, 0x71, 0xf2, 0xdb, 0x82, + 0x0c, 0x79, 0x04, 0x6f, 0x19, 0x4b, 0x97, 0x25, 0x51, 0x18, 0x24, 0x0c, 0xdf, 0x84, 0x31, 0xc9, + 0x76, 0x0a, 0xcd, 0xa1, 0xa5, 0xe2, 0xda, 0x74, 0x39, 0x2f, 0x8e, 0x65, 0x29, 0xb5, 0x31, 0xf2, + 0xe9, 0xcb, 0xd9, 0x53, 0xae, 0x92, 0x20, 0x87, 0x00, 0x52, 0x65, 0x1c, 0x86, 0x7b, 0xf8, 0x12, + 0x9c, 0xcd, 0xb8, 0x7a, 0xb4, 0x5a, 0x8d, 0x59, 0x22, 0x75, 0x16, 0xdc, 0x33, 0xd9, 0xfe, 0xba, + 0xdc, 0xc6, 0xe7, 0x60, 0xec, 0x80, 0xc5, 0xfb, 0x75, 0x36, 0x35, 0x34, 0x87, 0x96, 0x26, 0x5c, + 0xb5, 0xc2, 0x93, 0x30, 0x1a, 0xfe, 0x28, 0x60, 0xf1, 0xd4, 0xb0, 0x90, 0x93, 0x0b, 0xbe, 0x9b, + 0xa4, 0x34, 0x4e, 0xa7, 0x46, 0xe6, 0xd0, 0xd2, 0xb0, 0x2b, 0x17, 0xe4, 0x11, 0xe0, 0x96, 0x71, + 0xed, 0xce, 0x2d, 0x18, 0x8d, 0xf8, 0x86, 0xf2, 0x66, 0x36, 0xdf, 0x9b, 0x2d, 0xbf, 0xce, 0x84, + 0x9c, 0x72, 0x48, 0xca, 0x90, 0x9f, 0x21, 0x98, 0x6c, 0xe9, 0x4c, 0x36, 0x9a, 0x19, 0xdf, 0x13, + 0xb8, 0xb6, 0x05, 0xd0, 0x3a, 0x24, 0xc2, 0xbd, 0xe2, 0xda, 0x42, 0x59, 0x9e, 0xa8, 0x32, 0x3f, + 0x51, 0x65, 0x79, 0x68, 0xd5, 0x89, 0x2a, 0x6f, 0xd3, 0x1a, 0x73, 0xd9, 0x87, 0x0d, 0x96, 0xa4, + 0xae, 0x21, 0x49, 0x5e, 0x20, 0x98, 0xce, 0xe3, 0x92, 0xe7, 0xe9, 0xf0, 0x49, 0x3d, 0xc5, 0xf7, + 0x72, 0x58, 0x2e, 0xf6, 0x64, 0x29, 0x2d, 0xb7, 0xd1, 0x7c, 0x08, 0x05, 0xc1, 0x92, 0xdb, 0x31, + 0xd2, 0x8a, 0xf2, 0xd3, 0x3a, 0x94, 0x9b, 0xd6, 0x61, 0x33, 0xad, 0xdb, 0xf0, 0x05, 0xad, 0xd0, + 0xf0, 0x75, 0x64, 0xcf, 0x57, 0x6a, 0x8b, 0x6b, 0xe7, 0xf3, 0x5d, 0x7d, 0x1c, 0xf8, 0x7b, 0x3e, + 0xab, 0x72, 0x41, 0xe5, 0xac, 0x10, 0x22, 0xdf, 0x81, 0xd3, 0x42, 0xe3, 0x7a, 0xbd, 0xce, 0xbf, + 0xeb, 0x4c, 0x11, 0xfa, 0x9f, 0x53, 0xf4, 0x0c, 0xc1, 0x9b, 0x42, 0xf3, 0xc3, 0x88, 0x05, 0x52, + 0xf5, 0xe7, 0x70, 0x50, 0x7e, 0x83, 0xe0, 0xed, 0x36, 0xff, 0x74, 0xd4, 0x6e, 0xc3, 0x28, 0x0f, + 0x40, 0xa2, 0x4e, 0x48, 0xdf, 0x61, 0x93, 0x52, 0x83, 0x3b, 0x23, 0x97, 0x54, 0x02, 0xb6, 0x55, + 0x04, 0xf0, 0x14, 0xbc, 0xd1, 0x1e, 0x9c, 0x6c, 0x49, 0x3e, 0x50, 0xbe, 0x64, 0x50, 0xed, 0xcb, + 0x3a, 0x8c, 0x67, 0x01, 0xb4, 0x5f, 0xed, 0x4c, 0x32, 0xab, 0x55, 0x5a, 0x8c, 0x7c, 0x4f, 0x9d, + 0xac, 0xf5, 0x7a, 0x5d, 0x83, 0x06, 0x76, 0x16, 0x3e, 0x41, 0xf0, 0xa5, 0x63, 0xda, 0x35, 0xfb, + 0x4d, 0x28, 0xe8, 0x32, 0x6e, 0xbf, 0xaf, 0x9d, 0xf4, 0x5b, 0x72, 0x83, 0xcb, 0x47, 0x00, 0x67, + 0x25, 0xd5, 0x34, 0x65, 0x89, 0x7c, 0xfa, 0xf8, 0xd5, 0xe5, 0x96, 0x54, 0x74, 0x0b, 0xae, 0x5a, + 0x0d, 0xa4, 0x52, 0xfb, 0x30, 0xd5, 0x69, 0x4f, 0x47, 0xe6, 0x01, 0x14, 0x69, 0x6b, 0x5b, 0x25, + 0x60, 0x3e, 0x3f, 0x36, 0x86, 0xfc, 0x56, 0x18, 0x1f, 0xa8, 0x08, 0x99, 0xf2, 0xe4, 0xfb, 0xaa, + 0x80, 0xaf, 0xd7, 0xeb, 0x06, 0x7a, 0x70, 0x69, 0xfe, 0x4b, 0x56, 0x95, 0x3b, 0x0c, 0x68, 0x7f, + 0x1e, 0xc2, 0x84, 0xc1, 0x27, 0x4b, 0xf6, 0x89, 0x1c, 0x6a, 0x53, 0x30, 0xb8, 0xac, 0xfb, 0xaa, + 0x1d, 0x70, 0x59, 0x14, 0xc6, 0xe9, 0xff, 0x35, 0xe1, 0x8f, 0x55, 0xab, 0x21, 0x4d, 0xe9, 0xd8, + 0xdc, 0x81, 0xb1, 0x58, 0xec, 0xa8, 0x04, 0xcc, 0xe5, 0x47, 0x45, 0x4a, 0x19, 0x01, 0x51, 0x52, + 0xe4, 0xbb, 0x70, 0x26, 0x8b, 0xbd, 0xc4, 0x0c, 0x2e, 0xaf, 0x2f, 0x10, 0x7c, 0xb1, 0x43, 0xb7, + 0xa6, 0xfd, 0x2e, 0xbc, 0x21, 0x09, 0x64, 0xd9, 0xec, 0x97, 0x77, 0x26, 0x36, 0xb8, 0x1c, 0x2e, + 0xab, 0x07, 0x67, 0x2b, 0x66, 0x6c, 0x27, 0xa2, 0x15, 0x66, 0x29, 0xa5, 0x97, 0x55, 0xb4, 0x76, + 0xd2, 0x30, 0x66, 0x9b, 0x61, 0x23, 0x48, 0x2d, 0xe0, 0x32, 0x9c, 0x6b, 0x57, 0xac, 0xbd, 0xe7, + 0x19, 0xe6, 0x1b, 0x42, 0x82, 0x67, 0x98, 0x2f, 0x88, 0xa3, 0xc2, 0xd5, 0x52, 0x6e, 0x0a, 0x54, + 0xf8, 0x46, 0x26, 0x20, 0x16, 0x64, 0x51, 0xbd, 0x01, 0x5b, 0x7e, 0x50, 0xb5, 0xf5, 0x0a, 0xe4, + 0xa6, 0x7a, 0x01, 0x32, 0xa0, 0xd6, 0x7b, 0x1e, 0x26, 0xf4, 0xd3, 0xea, 0x47, 0x99, 0x07, 0xc5, + 0x6c, 0xef, 0x7e, 0x94, 0x90, 0xab, 0xea, 0xf6, 0x6f, 0xd6, 0x7d, 0x16, 0xa4, 0xfd, 0x04, 0xe9, + 0xb6, 0xba, 0xce, 0x1d, 0x12, 0xda, 0xe8, 0x97, 0x01, 0x76, 0x9b, 0x29, 0x4b, 0xbc, 0xbd, 0x98, + 0x65, 0x21, 0x28, 0x88, 0x1d, 0x8e, 0x25, 0x4b, 0x30, 0xa1, 0x7a, 0xea, 0xe6, 0x5d, 0x9a, 0x52, + 0x8b, 0xa1, 0x9d, 0xac, 0xb3, 0x94, 0x48, 0x6d, 0x60, 0x1e, 0xde, 0x4c, 0xfd, 0x03, 0xe6, 0xc5, + 0xec, 0x80, 0xfa, 0x81, 0x1f, 0xd4, 0x94, 0x91, 0xd3, 0x7c, 0xd7, 0xcd, 0x36, 0x79, 0x50, 0x85, + 0x55, 0x71, 0x78, 0x86, 0x5d, 0xb9, 0x20, 0xd7, 0x8c, 0x2c, 0xd0, 0x1a, 0xdb, 0x96, 0x33, 0xc0, + 0xfd, 0x60, 0x2f, 0xb4, 0x30, 0x79, 0x86, 0x60, 0xb6, 0x8b, 0x94, 0x66, 0xf5, 0x03, 0x98, 0x54, + 0xa7, 0xda, 0x33, 0x07, 0x0b, 0x75, 0xc1, 0x96, 0xf2, 0xcf, 0xff, 0x71, 0x7d, 0xea, 0x1e, 0xe0, + 0xe4, 0xd8, 0x37, 0xa4, 0x0a, 0xa5, 0xec, 0xbe, 0xe5, 0xb0, 0x1f, 0xd4, 0xb5, 0xfe, 0x1b, 0x02, + 0xd2, 0xdd, 0x4c, 0x1f, 0xee, 0x0e, 0x0f, 0xc6, 0xdd, 0xc1, 0x55, 0x80, 0x2d, 0x75, 0x8e, 0xf8, + 0xd5, 0x78, 0x1c, 0xd5, 0x43, 0x5a, 0xdd, 0x7c, 0xc2, 0x2a, 0xfb, 0xdd, 0xf3, 0xdd, 0xe5, 0xe8, + 0x7c, 0x45, 0x1d, 0xfc, 0x0e, 0x3d, 0xe6, 0x2d, 0x7e, 0x4a, 0xeb, 0x7e, 0x55, 0x68, 0x1b, 0x77, + 0xe5, 0x82, 0x6c, 0xaa, 0x9a, 0xb2, 0x1d, 0xfb, 0x15, 0x26, 0x0d, 0x97, 0x60, 0xbc, 0xda, 0x88, + 0x5b, 0x89, 0x2a, 0xb8, 0x7a, 0xdd, 0xc5, 0x74, 0x56, 0x3b, 0x5a, 0x4a, 0x4c, 0xab, 0x11, 0xdf, + 0xcd, 0x6a, 0x87, 0x58, 0x90, 0x73, 0xd9, 0xa3, 0x2e, 0x46, 0x66, 0xdd, 0x21, 0x11, 0x3f, 0x7b, + 0x8b, 0xdb, 0xf7, 0xb5, 0xb6, 0xfb, 0xc7, 0xbb, 0xae, 0x6e, 0x0f, 0x71, 0xbb, 0x86, 0x63, 0xbd, + 0x17, 0x79, 0x4b, 0xf5, 0x8e, 0x2a, 0xe9, 0x3b, 0x29, 0x4d, 0x13, 0xf2, 0x9f, 0x21, 0xd5, 0xf3, + 0x99, 0xbb, 0xda, 0xfa, 0x34, 0x14, 0xa2, 0x46, 0x5c, 0x79, 0x42, 0x13, 0x26, 0xa3, 0x38, 0xe2, + 0xb6, 0x36, 0x30, 0x86, 0x91, 0x06, 0xff, 0x62, 0x48, 0x7c, 0x21, 0x3e, 0xe3, 0x07, 0x00, 0xfc, + 0xaf, 0x27, 0xa2, 0x27, 0xde, 0xd9, 0x89, 0x8d, 0x32, 0x67, 0xf2, 0xcf, 0x97, 0xb3, 0x0b, 0x35, + 0x3f, 0x7d, 0xd2, 0xd8, 0x2d, 0x57, 0xc2, 0x03, 0x47, 0xfd, 0x3c, 0x21, 0xff, 0xac, 0x24, 0xd5, + 0x7d, 0x27, 0x6d, 0x46, 0x2c, 0x29, 0xdf, 0x65, 0x15, 0xb7, 0xc0, 0x35, 0xb8, 0x5c, 0x01, 0x2f, + 0x98, 0xea, 0x47, 0x86, 0x46, 0xc2, 0x23, 0x30, 0x22, 0x4c, 0x15, 0xe5, 0xde, 0x63, 0xbe, 0x85, + 0xab, 0x70, 0x5a, 0x7c, 0xe7, 0xed, 0x36, 0xbd, 0xa8, 0x4e, 0x83, 0xa9, 0x51, 0x11, 0xa5, 0x77, + 0xf3, 0xa3, 0xd4, 0xd5, 0xd7, 0xb2, 0xd0, 0xb6, 0xd1, 0xdc, 0xae, 0xd3, 0xe0, 0x1b, 0x41, 0x1a, + 0x37, 0xdd, 0x62, 0xa3, 0xb5, 0x53, 0xba, 0x03, 0x67, 0x3b, 0x01, 0xf8, 0x2c, 0x0c, 0xef, 0xb3, + 0xa6, 0xca, 0x33, 0xff, 0xa8, 0x4e, 0x5c, 0x83, 0x65, 0x87, 0x45, 0x2c, 0x6e, 0x0e, 0xdd, 0x40, + 0x6b, 0xcf, 0xa7, 0x61, 0x54, 0xd8, 0xc6, 0xcf, 0x10, 0x8c, 0xc9, 0x5f, 0x22, 0xf0, 0x79, 0x0b, + 0x47, 0x09, 0x29, 0x5d, 0xea, 0x09, 0xc9, 0x1c, 0x20, 0x97, 0x7f, 0xf2, 0xf7, 0x7f, 0xff, 0x7c, + 0x68, 0x1e, 0x5f, 0x70, 0x7e, 0x48, 0x2b, 0xfb, 0xb4, 0xee, 0x48, 0xc9, 0x95, 0xbc, 0x9f, 0x75, + 0xf0, 0x73, 0x04, 0x23, 0xe2, 0x0d, 0x9b, 0xb5, 0x18, 0xe0, 0x80, 0xd2, 0x62, 0x0f, 0x80, 0xb6, + 0xbf, 0x29, 0xec, 0xdf, 0xc6, 0xb7, 0xac, 0xf6, 0xc5, 0x5c, 0xe6, 0x1c, 0xca, 0x97, 0xf2, 0xc8, + 0x39, 0x14, 0x3d, 0xd8, 0x91, 0x73, 0x28, 0xba, 0xae, 0x23, 0xfc, 0x53, 0x04, 0xe3, 0x7a, 0xc8, + 0xbd, 0x60, 0x31, 0x9d, 0x81, 0x4a, 0x97, 0xfb, 0x00, 0x69, 0x8e, 0xcb, 0x82, 0xe3, 0x45, 0x4c, + 0x7a, 0x73, 0xc4, 0xbf, 0x45, 0x50, 0x68, 0x4d, 0xc5, 0x17, 0x2d, 0x66, 0x34, 0xea, 0x64, 0x64, + 0x36, 0x04, 0x99, 0x77, 0xf0, 0x4d, 0x2b, 0x99, 0x30, 0x62, 0x81, 0xa7, 0xa2, 0xd6, 0x39, 0x97, + 0x1f, 0xe1, 0x3f, 0x22, 0x18, 0x95, 0x3f, 0x5d, 0xcd, 0xd9, 0x4e, 0x0a, 0x47, 0x94, 0x96, 0x7a, + 0x21, 0x34, 0xb3, 0x6f, 0x0b, 0x66, 0xdb, 0xf8, 0x7d, 0xfb, 0x51, 0xe2, 0x32, 0x39, 0xa4, 0xba, + 0x67, 0xf7, 0x17, 0x08, 0xc6, 0xf5, 0x04, 0x7d, 0xc1, 0x4e, 0x47, 0x80, 0xac, 0x01, 0xed, 0x1c, + 0xb0, 0xc9, 0x0d, 0x41, 0x7b, 0x0d, 0x5f, 0xed, 0x45, 0x5b, 0x56, 0x44, 0xe7, 0x50, 0x87, 0xf1, + 0x97, 0x08, 0x26, 0xda, 0x66, 0xea, 0x45, 0x7b, 0x22, 0x35, 0xb0, 0xe4, 0xf4, 0x09, 0xd4, 0x24, + 0xcb, 0x82, 0xe4, 0x12, 0x5e, 0xe8, 0x8f, 0x24, 0xfe, 0x2b, 0x82, 0xa2, 0x39, 0xe5, 0x2e, 0xd8, + 0x0c, 0xb6, 0x70, 0xa5, 0x72, 0x7f, 0x38, 0xcd, 0x6b, 0x47, 0xf0, 0x7a, 0x80, 0xbf, 0x65, 0xe5, + 0x65, 0xce, 0x75, 0x32, 0xf5, 0x22, 0xbf, 0xdd, 0x12, 0xfe, 0x02, 0xc1, 0x99, 0xce, 0x39, 0x76, + 0xd9, 0x1e, 0x31, 0x13, 0x5b, 0x5a, 0xeb, 0x1f, 0xab, 0x1d, 0x59, 0x15, 0x8e, 0x5c, 0xc6, 0x97, + 0xfa, 0x76, 0x04, 0xff, 0x0e, 0xc1, 0x98, 0x9a, 0x29, 0x6d, 0x35, 0x59, 0x42, 0xac, 0x35, 0xb9, + 0x7d, 0x5c, 0x24, 0xef, 0x0b, 0x2e, 0xdf, 0xc4, 0x5b, 0x56, 0x2e, 0x6a, 0xc6, 0xea, 0x23, 0x9e, + 0x1f, 0x21, 0x00, 0x63, 0x74, 0x9c, 0xb7, 0x87, 0x47, 0xc1, 0x4a, 0x2b, 0x7d, 0xc1, 0x34, 0xe9, + 0x2b, 0x82, 0xf4, 0x02, 0xbe, 0xd8, 0x0f, 0x69, 0xfc, 0x31, 0x82, 0x42, 0x6b, 0x4c, 0xb1, 0x95, + 0x49, 0x8d, 0x2a, 0x5d, 0xe9, 0x07, 0xa5, 0xf9, 0x7c, 0x5d, 0xf0, 0xb9, 0x86, 0x57, 0xed, 0x45, + 0x3b, 0x66, 0xcc, 0x13, 0x93, 0x9d, 0x71, 0xaf, 0x3f, 0x46, 0x00, 0xc6, 0xf0, 0x38, 0xdf, 0xa3, + 0x29, 0x90, 0x30, 0x6b, 0xbc, 0x8e, 0x4f, 0x8b, 0xe4, 0xab, 0x82, 0xdf, 0x55, 0x5c, 0xb6, 0xf2, + 0xe3, 0x7f, 0xfd, 0xa0, 0x66, 0x90, 0x7b, 0x8e, 0x60, 0x5c, 0xcf, 0x92, 0x17, 0xac, 0xcf, 0xac, + 0x04, 0x59, 0xab, 0x61, 0xe7, 0xb0, 0x49, 0xbe, 0x26, 0x68, 0xad, 0x62, 0xa7, 0xc7, 0x5b, 0x17, + 0x54, 0xc5, 0xf3, 0xa2, 0x0f, 0x1d, 0xaf, 0x38, 0xf8, 0x1e, 0x4b, 0x3b, 0x27, 0x50, 0xdb, 0xbd, + 0xed, 0xc0, 0x5a, 0xef, 0x6d, 0x97, 0x39, 0x95, 0xdc, 0x15, 0x7c, 0xef, 0xe0, 0x77, 0xac, 0x7c, + 0x6b, 0x2c, 0xf5, 0x2a, 0x42, 0x83, 0x97, 0x9b, 0xf1, 0x5f, 0x21, 0x80, 0x7b, 0x2c, 0xcd, 0xa6, + 0x59, 0x62, 0xed, 0x9f, 0x04, 0xa6, 0xb4, 0xdc, 0x1b, 0xa3, 0x49, 0xde, 0x12, 0x24, 0xaf, 0xe3, + 0x6b, 0x3d, 0x49, 0x46, 0xb4, 0xe9, 0x55, 0x69, 0x4a, 0x0d, 0x6e, 0x7f, 0x46, 0x80, 0x73, 0x26, + 0xc5, 0x95, 0xde, 0xad, 0xaa, 0x01, 0x2f, 0x5d, 0x3f, 0x11, 0xfc, 0x84, 0xcc, 0xcd, 0xd9, 0xd1, + 0x60, 0xfe, 0x27, 0x04, 0x6f, 0xe7, 0x8f, 0xb9, 0x57, 0xed, 0xb5, 0x25, 0x87, 0xff, 0x8d, 0x93, + 0x4a, 0x9c, 0xb0, 0xb2, 0x9b, 0x2e, 0xe0, 0x4f, 0x10, 0x9c, 0xe9, 0x9c, 0x33, 0x97, 0x7b, 0x74, + 0xb4, 0x06, 0xd6, 0x7a, 0x90, 0xbb, 0xcc, 0x9d, 0x7d, 0xd6, 0x03, 0x7e, 0xe7, 0xbc, 0x86, 0x10, + 0xf7, 0x2a, 0x82, 0xd7, 0xef, 0x11, 0x80, 0x31, 0x95, 0xce, 0x5b, 0x5b, 0x9f, 0x0c, 0x66, 0x2d, + 0x56, 0xc7, 0xc7, 0xd3, 0x3e, 0xbb, 0x74, 0x31, 0xb4, 0x4a, 0x5a, 0xce, 0x61, 0x36, 0x0b, 0x1f, + 0x39, 0x87, 0x62, 0xfa, 0x3d, 0xc2, 0x7f, 0xe0, 0xcf, 0x7a, 0xfb, 0xbc, 0x69, 0x7f, 0xd6, 0xdb, + 0xb1, 0xf6, 0x67, 0x3d, 0x7f, 0x12, 0x26, 0xd7, 0x05, 0x71, 0x07, 0xaf, 0xd8, 0x9f, 0x75, 0x39, + 0x2d, 0xb6, 0xda, 0xa7, 0x5f, 0x23, 0x98, 0x30, 0xe7, 0x3d, 0x6b, 0x67, 0x67, 0x02, 0xad, 0x9d, + 0x5d, 0xde, 0x04, 0x49, 0xd6, 0x04, 0xc3, 0x2b, 0x78, 0xb9, 0xe7, 0x3b, 0x40, 0x6b, 0xcc, 0xe3, + 0xcd, 0x47, 0xb2, 0xf1, 0xde, 0xa7, 0xaf, 0x66, 0xd0, 0x67, 0xaf, 0x66, 0xd0, 0xbf, 0x5e, 0xcd, + 0xa0, 0x8f, 0x5e, 0xcf, 0x9c, 0xfa, 0xec, 0xf5, 0xcc, 0xa9, 0x7f, 0xbc, 0x9e, 0x39, 0xf5, 0xc1, + 0x9a, 0x31, 0x2d, 0x4b, 0x7d, 0xef, 0xd1, 0xdd, 0xa4, 0x5d, 0xe7, 0x8f, 0xb5, 0x56, 0x31, 0x3d, + 0xef, 0x8e, 0x89, 0xff, 0x9a, 0x5f, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0x71, 0x89, + 0x57, 0x6a, 0x20, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4242,12 +4242,10 @@ func (m *QueryFreeSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.Space) > 0 { - i -= len(m.Space) - copy(dAtA[i:], m.Space) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Space))) + if m.Space != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Space)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -4272,12 +4270,10 @@ func (m *QueryStoreCountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.Count) > 0 { - i -= len(m.Count) - copy(dAtA[i:], m.Count) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Count))) + if m.Count != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Count)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -5291,9 +5287,8 @@ func (m *QueryFreeSpaceResponse) Size() (n int) { } var l int _ = l - l = len(m.Space) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.Space != 0 { + n += 1 + sovQuery(uint64(m.Space)) } return n } @@ -5304,9 +5299,8 @@ func (m *QueryStoreCountResponse) Size() (n int) { } var l int _ = l - l = len(m.Count) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.Count != 0 { + n += 1 + sovQuery(uint64(m.Count)) } return n } @@ -8209,10 +8203,10 @@ func (m *QueryFreeSpaceResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Space", wireType) } - var stringLen uint64 + m.Space = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8222,24 +8216,11 @@ func (m *QueryFreeSpaceResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Space |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Space = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -8291,10 +8272,10 @@ func (m *QueryStoreCountResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) } - var stringLen uint64 + m.Count = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8304,24 +8285,11 @@ func (m *QueryStoreCountResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Count |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Count = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/x/storage/types/tx.pb.go b/x/storage/types/tx.pb.go index d30d14323..d9df204fa 100644 --- a/x/storage/types/tx.pb.go +++ b/x/storage/types/tx.pb.go @@ -589,7 +589,7 @@ var xxx_messageInfo_MsgSetProviderKeybaseResponse proto.InternalMessageInfo type MsgSetProviderTotalSpace struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - Space string `protobuf:"bytes,2,opt,name=space,proto3" json:"space,omitempty"` + Space int64 `protobuf:"varint,2,opt,name=space,proto3" json:"space,omitempty"` } func (m *MsgSetProviderTotalSpace) Reset() { *m = MsgSetProviderTotalSpace{} } @@ -632,11 +632,11 @@ func (m *MsgSetProviderTotalSpace) GetCreator() string { return "" } -func (m *MsgSetProviderTotalSpace) GetSpace() string { +func (m *MsgSetProviderTotalSpace) GetSpace() int64 { if m != nil { return m.Space } - return "" + return 0 } type MsgSetProviderTotalSpaceResponse struct { @@ -855,7 +855,7 @@ type MsgInitProvider struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` Keybase string `protobuf:"bytes,3,opt,name=keybase,proto3" json:"keybase,omitempty"` - TotalSpace string `protobuf:"bytes,4,opt,name=total_space,json=totalSpace,proto3" json:"total_space,omitempty"` + TotalSpace int64 `protobuf:"varint,4,opt,name=total_space,json=totalSpace,proto3" json:"total_space,omitempty"` } func (m *MsgInitProvider) Reset() { *m = MsgInitProvider{} } @@ -912,11 +912,11 @@ func (m *MsgInitProvider) GetKeybase() string { return "" } -func (m *MsgInitProvider) GetTotalSpace() string { +func (m *MsgInitProvider) GetTotalSpace() int64 { if m != nil { return m.TotalSpace } - return "" + return 0 } type MsgInitProviderResponse struct { @@ -1883,85 +1883,85 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/tx.proto", fileDescriptor_2194ba0b2c3d6a97) } var fileDescriptor_2194ba0b2c3d6a97 = []byte{ - // 1240 bytes of a gzipped FileDescriptorProto + // 1242 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6e, 0xdb, 0xc6, 0x13, 0x0e, 0x2d, 0xd9, 0x96, 0xc6, 0x92, 0x7f, 0x0e, 0x63, 0x27, 0x0c, 0x1d, 0xcb, 0x36, 0x8d, 0xfc, 0xe2, 0x26, 0x88, 0x84, 0x3a, 0x40, 0x7b, 0xe9, 0xc5, 0x6e, 0x10, 0xc0, 0x8d, 0x55, 0xb8, - 0x54, 0x82, 0xfe, 0x45, 0x85, 0x95, 0xb8, 0x96, 0x19, 0x4b, 0x5c, 0x66, 0x77, 0xe5, 0x58, 0xb9, - 0x14, 0xed, 0xb9, 0x87, 0xbe, 0x40, 0x0e, 0x3d, 0xf4, 0x5d, 0x7a, 0xcc, 0xb1, 0xc7, 0xc2, 0x7e, - 0x80, 0xbe, 0x42, 0xc1, 0xe5, 0x72, 0x45, 0xc9, 0x24, 0x25, 0x07, 0x0d, 0xda, 0x9b, 0x76, 0xf6, - 0xdb, 0x99, 0xef, 0x9b, 0x59, 0xed, 0x0c, 0x08, 0x6b, 0x6d, 0xe4, 0xb9, 0x1e, 0x6e, 0xb6, 0x8f, - 0x91, 0xeb, 0xd5, 0x18, 0x27, 0x14, 0x75, 0x70, 0x8d, 0x9f, 0x55, 0x7d, 0x4a, 0x38, 0xd1, 0x97, - 0xe3, 0xdb, 0x55, 0xb9, 0x6d, 0xfd, 0xa5, 0xc1, 0x42, 0x9d, 0x75, 0x0e, 0x09, 0xe3, 0x4f, 0xdc, - 0x2e, 0xd6, 0x0d, 0x98, 0x6f, 0x53, 0x8c, 0x38, 0xa1, 0x86, 0xb6, 0xa1, 0x6d, 0x17, 0xed, 0x68, - 0xa9, 0xdf, 0x84, 0xb9, 0x1e, 0xa6, 0x27, 0x5d, 0x6c, 0xcc, 0x6c, 0x68, 0xdb, 0x25, 0x5b, 0xae, - 0xf4, 0x55, 0x28, 0x1e, 0xb9, 0x5d, 0xdc, 0x64, 0xee, 0x6b, 0x6c, 0xe4, 0x36, 0xb4, 0xed, 0x9c, - 0x5d, 0x08, 0x0c, 0x0d, 0xf7, 0x35, 0xd6, 0xef, 0xc2, 0xa2, 0x4f, 0x09, 0x39, 0x6a, 0xba, 0x1e, - 0xc7, 0xf4, 0x14, 0x75, 0x8d, 0xbc, 0x40, 0x94, 0x85, 0x75, 0x5f, 0x1a, 0xf5, 0x35, 0x80, 0x10, - 0xc6, 0x07, 0x3e, 0x36, 0x66, 0x05, 0xa4, 0x28, 0x2c, 0xcf, 0x06, 0x3e, 0x0e, 0xb6, 0x7b, 0xe8, - 0xac, 0x29, 0x0c, 0xcc, 0x98, 0x0b, 0xb7, 0x7b, 0xe8, 0xec, 0x50, 0x18, 0x02, 0xce, 0xf8, 0xcc, - 0x77, 0x29, 0x66, 0xc6, 0xbc, 0xd8, 0x8b, 0x96, 0xba, 0x0e, 0x79, 0x8f, 0x70, 0x6c, 0x14, 0x84, - 0x14, 0xf1, 0xdb, 0xfa, 0x1a, 0x6e, 0xc4, 0x04, 0xdb, 0x98, 0xf9, 0xc4, 0x63, 0x58, 0xdf, 0x84, - 0x92, 0x4f, 0xc9, 0xa9, 0xeb, 0x60, 0xda, 0x74, 0x7d, 0x66, 0x68, 0x1b, 0xb9, 0xed, 0xa2, 0xbd, - 0x10, 0xd9, 0xf6, 0x7d, 0xa6, 0xaf, 0xc3, 0x02, 0xe3, 0x88, 0xf2, 0x66, 0xab, 0x4b, 0xda, 0x27, - 0x22, 0x0d, 0x39, 0x1b, 0x84, 0x69, 0x2f, 0xb0, 0x58, 0x6f, 0x34, 0x28, 0x49, 0xdf, 0x82, 0x5a, - 0x46, 0x36, 0x75, 0xc8, 0xbb, 0x1c, 0xf7, 0x64, 0x2e, 0xc5, 0xef, 0x20, 0x93, 0xc7, 0x88, 0x1d, - 0x37, 0xbb, 0x2e, 0xe3, 0x22, 0x93, 0x25, 0xbb, 0x10, 0x18, 0x0e, 0x5c, 0xc6, 0x63, 0xe9, 0xcf, - 0x8f, 0xa4, 0x7f, 0x19, 0x66, 0xc9, 0x2b, 0x0f, 0x53, 0x91, 0xb5, 0xa2, 0x1d, 0x2e, 0x02, 0xab, - 0xe0, 0x25, 0x93, 0x15, 0x2e, 0xac, 0xe7, 0xb0, 0x1c, 0xa7, 0xa7, 0xb4, 0x1b, 0x30, 0xcf, 0xfa, - 0xed, 0x36, 0x66, 0x4c, 0xd0, 0x2c, 0xd8, 0xd1, 0x52, 0xdf, 0x82, 0x32, 0xa6, 0x94, 0xd0, 0x66, - 0x0f, 0x33, 0x86, 0x3a, 0x61, 0xed, 0x8b, 0x76, 0x49, 0x18, 0xeb, 0xa1, 0xcd, 0xfa, 0x12, 0xca, - 0x75, 0xd6, 0x79, 0x8c, 0xbb, 0x98, 0xe3, 0x77, 0xbc, 0x44, 0x8a, 0x6f, 0x2e, 0xce, 0xf7, 0x16, - 0xac, 0x8c, 0x38, 0x8e, 0x08, 0x5b, 0x9f, 0xc0, 0x52, 0x9d, 0x75, 0x1a, 0x38, 0xd0, 0x11, 0x96, - 0xe7, 0x30, 0x23, 0xe8, 0x22, 0xcc, 0xb8, 0xbe, 0x64, 0x3e, 0xe3, 0xfa, 0x96, 0x09, 0xc6, 0xf8, - 0x69, 0xe5, 0xf9, 0xa9, 0x08, 0x19, 0xdb, 0x7b, 0x8a, 0x07, 0x2d, 0xc4, 0xb2, 0x34, 0x19, 0x30, - 0x7f, 0x12, 0x82, 0x64, 0x8c, 0x68, 0x69, 0xad, 0xc3, 0x5a, 0xa2, 0x33, 0x15, 0xed, 0xb3, 0x71, - 0x26, 0xcf, 0x08, 0x47, 0xdd, 0x86, 0x8f, 0xda, 0x59, 0x01, 0x83, 0x64, 0x05, 0x10, 0x19, 0x2e, - 0x5c, 0x58, 0x16, 0x6c, 0xa4, 0xf9, 0x52, 0xf1, 0x3e, 0x17, 0x95, 0xda, 0x75, 0x9c, 0x4f, 0xbb, - 0xc8, 0xed, 0x61, 0x9a, 0x11, 0x64, 0x0b, 0xca, 0xed, 0x00, 0xd4, 0x44, 0x8e, 0x43, 0x83, 0x9b, - 0x21, 0x2b, 0x2f, 0x8c, 0xbb, 0xa1, 0x4d, 0x16, 0x68, 0xe8, 0x4f, 0x05, 0xfa, 0x42, 0x14, 0xc8, - 0xc6, 0x3d, 0x72, 0x8a, 0xff, 0xa1, 0x58, 0x61, 0xd5, 0x46, 0x5c, 0xaa, 0x70, 0xa7, 0xf0, 0xbf, - 0x3a, 0xeb, 0xec, 0x7b, 0xae, 0x12, 0x3f, 0xfd, 0x75, 0x88, 0xd7, 0x2f, 0x37, 0x52, 0xbf, 0xe0, - 0x0f, 0xcf, 0x83, 0x24, 0x36, 0xc3, 0x74, 0xe7, 0xc5, 0x2e, 0x70, 0x95, 0x57, 0xeb, 0x36, 0xdc, - 0x1a, 0x8b, 0xab, 0x28, 0xd5, 0xc4, 0x33, 0xd3, 0x38, 0xee, 0x73, 0x87, 0xbc, 0xf2, 0x26, 0xd3, - 0xb2, 0xd6, 0x60, 0x35, 0xe1, 0x80, 0xf2, 0xf7, 0xab, 0x26, 0x6a, 0xb7, 0xd7, 0x1f, 0x34, 0xc2, - 0xa7, 0x3b, 0x43, 0xe1, 0x3a, 0x2c, 0x1c, 0x11, 0x3a, 0x96, 0x4d, 0x38, 0x22, 0x54, 0xe6, 0x52, - 0x37, 0xa1, 0xe0, 0xf4, 0x29, 0xe2, 0x2e, 0xf1, 0xa4, 0x66, 0xb5, 0x0e, 0x6e, 0x57, 0x6b, 0xc0, - 0x31, 0x93, 0x72, 0xc3, 0x45, 0x50, 0x22, 0x1f, 0x0d, 0x7a, 0xd8, 0xe3, 0x4d, 0x07, 0x7b, 0xa4, - 0x27, 0x9f, 0x9b, 0x92, 0x34, 0x3e, 0x0e, 0x6c, 0xf2, 0x3a, 0x0c, 0x29, 0x2a, 0xf2, 0xdf, 0x09, - 0xee, 0xa2, 0x6a, 0x0d, 0x4e, 0xd1, 0x20, 0x83, 0xfb, 0x12, 0xe4, 0xda, 0xae, 0x23, 0x39, 0x07, - 0x3f, 0xc7, 0xd5, 0xe4, 0xc6, 0xd5, 0xc8, 0xb0, 0x43, 0xef, 0x2a, 0xec, 0x6f, 0x1a, 0x5c, 0xaf, - 0xb3, 0xce, 0x73, 0xbf, 0x43, 0x91, 0x83, 0xff, 0xbb, 0x79, 0x5b, 0x85, 0xdb, 0x97, 0x68, 0x2a, - 0x11, 0x03, 0xb1, 0x69, 0xe3, 0x97, 0x7d, 0xcc, 0xf8, 0x2e, 0xe7, 0x98, 0x71, 0x11, 0xf0, 0x09, - 0xa1, 0xbd, 0x77, 0x7b, 0x69, 0xc3, 0x7e, 0x91, 0x4b, 0xec, 0x17, 0xf9, 0xf8, 0xfb, 0xfb, 0x12, - 0x36, 0x53, 0x43, 0xab, 0xe6, 0x71, 0x07, 0x8a, 0x51, 0x93, 0x8c, 0xba, 0xe6, 0xd0, 0x10, 0x6f, - 0x2d, 0x33, 0xa3, 0xad, 0x65, 0x19, 0x66, 0x45, 0x17, 0x89, 0x88, 0x88, 0x85, 0xf5, 0xa3, 0x06, - 0xc5, 0xe0, 0x49, 0x11, 0xc1, 0xb2, 0xe5, 0x05, 0x41, 0x30, 0x95, 0x55, 0x92, 0xab, 0x98, 0xec, - 0x5c, 0xb2, 0xec, 0x7c, 0xa2, 0xec, 0xd9, 0xb8, 0xec, 0x1b, 0xe2, 0xd6, 0x84, 0x14, 0x54, 0x19, - 0x7e, 0xd6, 0x44, 0xf3, 0x94, 0xc9, 0xb0, 0xb1, 0x4f, 0x28, 0x9f, 0x5c, 0x82, 0xf7, 0xc6, 0xb1, - 0x0b, 0x77, 0x92, 0xd8, 0xbc, 0xdf, 0xaa, 0x84, 0x71, 0xfe, 0xd5, 0xaa, 0x84, 0x14, 0x22, 0x99, - 0x3b, 0x6f, 0xca, 0x90, 0xab, 0xb3, 0x8e, 0xfe, 0x15, 0x14, 0xd4, 0x08, 0xbb, 0x59, 0x4d, 0x9a, - 0x74, 0xab, 0xb1, 0xa1, 0xcf, 0xfc, 0x60, 0x22, 0x44, 0x25, 0xf2, 0x5b, 0x28, 0x0e, 0xe7, 0x39, - 0x2b, 0xf3, 0x9c, 0xc0, 0x98, 0xf7, 0x27, 0x63, 0x94, 0xf3, 0xef, 0x01, 0x62, 0x63, 0xd3, 0x56, - 0xea, 0xc9, 0x21, 0xc8, 0x7c, 0x30, 0x05, 0x48, 0xf9, 0xef, 0x40, 0x79, 0x74, 0x48, 0xfa, 0x7f, - 0xea, 0xe9, 0x11, 0x9c, 0x59, 0x9d, 0x0e, 0xa7, 0x02, 0x9d, 0x82, 0x9e, 0x30, 0x33, 0x3d, 0x98, - 0xc6, 0x8b, 0x04, 0x9b, 0x8f, 0xae, 0x00, 0x56, 0x71, 0x7f, 0x80, 0x95, 0xe4, 0xe9, 0x69, 0x2a, - 0x01, 0x43, 0xbc, 0xf9, 0xd1, 0xd5, 0xf0, 0x8a, 0x80, 0x03, 0xa5, 0x91, 0xb1, 0xe3, 0x6e, 0xaa, - 0x9f, 0x38, 0xcc, 0x7c, 0x38, 0x15, 0x4c, 0x45, 0xf1, 0x61, 0xe9, 0xd2, 0x24, 0x91, 0x7e, 0x87, - 0xc7, 0xa1, 0xe6, 0x87, 0x53, 0x43, 0xe3, 0x37, 0x33, 0x36, 0x6a, 0xa4, 0xdf, 0xcc, 0x21, 0x28, - 0xe3, 0x66, 0x5e, 0x9e, 0x08, 0xf4, 0x17, 0xb0, 0x38, 0xd6, 0x96, 0xef, 0xa5, 0x1e, 0x1f, 0x05, - 0x9a, 0xb5, 0x29, 0x81, 0x2a, 0xd6, 0x11, 0xe8, 0xbb, 0x8e, 0x13, 0x49, 0x8c, 0xc6, 0xd1, 0x74, - 0x4d, 0xc3, 0x79, 0x36, 0x43, 0xd3, 0xe5, 0xa1, 0x57, 0x27, 0xb0, 0x12, 0x8e, 0xa7, 0xe3, 0xa1, - 0xd2, 0xff, 0x75, 0x23, 0xe3, 0x6c, 0xc6, 0xbf, 0x2e, 0x71, 0xec, 0xd5, 0x7f, 0xd2, 0xe0, 0x66, - 0xca, 0x60, 0x50, 0xcb, 0x70, 0x95, 0x74, 0xc0, 0xfc, 0xf8, 0x8a, 0x07, 0x14, 0x09, 0x1b, 0xe6, - 0x64, 0xb7, 0x5e, 0x4f, 0x4f, 0x96, 0x00, 0x98, 0xf7, 0x26, 0x00, 0x94, 0x4f, 0x06, 0xd7, 0x2f, - 0x37, 0xda, 0xfb, 0x93, 0x18, 0x0e, 0xb1, 0xe6, 0xce, 0xf4, 0xd8, 0xb8, 0x10, 0xd9, 0xe0, 0xd6, - 0x33, 0x4e, 0x07, 0x80, 0x0c, 0x21, 0xa3, 0xfd, 0x69, 0xef, 0xe0, 0xf7, 0xf3, 0x8a, 0xf6, 0xf6, - 0xbc, 0xa2, 0xfd, 0x79, 0x5e, 0xd1, 0x7e, 0xb9, 0xa8, 0x5c, 0x7b, 0x7b, 0x51, 0xb9, 0xf6, 0xc7, - 0x45, 0xe5, 0xda, 0x37, 0x3b, 0x1d, 0x97, 0x1f, 0xf7, 0x5b, 0xd5, 0x36, 0xe9, 0xd5, 0x5e, 0xa0, - 0xf6, 0x09, 0xea, 0x1e, 0xa0, 0x16, 0xab, 0x85, 0x7e, 0x1f, 0x86, 0xdf, 0x70, 0xce, 0x86, 0x5f, - 0x71, 0x06, 0x3e, 0x66, 0xad, 0x39, 0xf1, 0x25, 0xe7, 0xd1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xf8, 0xd1, 0xc2, 0xf3, 0xea, 0x11, 0x00, 0x00, + 0x54, 0x82, 0xfe, 0x45, 0x05, 0x4a, 0x5c, 0xcb, 0x8c, 0x25, 0x2e, 0xb3, 0xbb, 0x72, 0xac, 0x5c, + 0x8a, 0xf6, 0xdc, 0x43, 0x5f, 0x20, 0x87, 0x1e, 0xfa, 0x2e, 0x3d, 0xe6, 0xd8, 0x63, 0x61, 0x3f, + 0x40, 0x5f, 0xa1, 0xe0, 0xee, 0x72, 0x45, 0xc9, 0x24, 0x25, 0x07, 0x0d, 0xda, 0x9b, 0x76, 0xf6, + 0xdb, 0x99, 0xef, 0x9b, 0x59, 0xed, 0x0c, 0x08, 0x6b, 0x6d, 0xc7, 0xf7, 0x7c, 0xd4, 0x6c, 0x1f, + 0x3b, 0x9e, 0x5f, 0xa3, 0x0c, 0x13, 0xa7, 0x83, 0x6a, 0xec, 0xac, 0x1a, 0x10, 0xcc, 0xb0, 0xbe, + 0x1c, 0xdf, 0xae, 0xca, 0x6d, 0xeb, 0x2f, 0x0d, 0x16, 0xea, 0xb4, 0x73, 0x88, 0x29, 0x7b, 0xe2, + 0x75, 0x91, 0x6e, 0xc0, 0x7c, 0x9b, 0x20, 0x87, 0x61, 0x62, 0x68, 0x1b, 0xda, 0x76, 0xd1, 0x8e, + 0x96, 0xfa, 0x4d, 0x98, 0xeb, 0x21, 0x72, 0xd2, 0x45, 0xc6, 0xcc, 0x86, 0xb6, 0x5d, 0xb2, 0xe5, + 0x4a, 0x5f, 0x85, 0xe2, 0x91, 0xd7, 0x45, 0x4d, 0xea, 0xbd, 0x46, 0x46, 0x6e, 0x43, 0xdb, 0xce, + 0xd9, 0x85, 0xd0, 0xd0, 0xf0, 0x5e, 0x23, 0xfd, 0x2e, 0x2c, 0x06, 0x04, 0xe3, 0xa3, 0xa6, 0xe7, + 0x33, 0x44, 0x4e, 0x9d, 0xae, 0x91, 0xe7, 0x88, 0x32, 0xb7, 0xee, 0x4b, 0xa3, 0xbe, 0x06, 0x20, + 0x60, 0x6c, 0x10, 0x20, 0x63, 0x96, 0x43, 0x8a, 0xdc, 0xf2, 0x6c, 0x10, 0xa0, 0x70, 0xbb, 0xe7, + 0x9c, 0x35, 0xb9, 0x81, 0x1a, 0x73, 0x62, 0xbb, 0xe7, 0x9c, 0x1d, 0x72, 0x43, 0xc8, 0x19, 0x9d, + 0x05, 0x1e, 0x41, 0xd4, 0x98, 0xe7, 0x7b, 0xd1, 0x52, 0xd7, 0x21, 0xef, 0x63, 0x86, 0x8c, 0x02, + 0x97, 0xc2, 0x7f, 0x5b, 0x5f, 0xc3, 0x8d, 0x98, 0x60, 0x1b, 0xd1, 0x00, 0xfb, 0x14, 0xe9, 0x9b, + 0x50, 0x0a, 0x08, 0x3e, 0xf5, 0x5c, 0x44, 0x9a, 0x5e, 0x40, 0x0d, 0x6d, 0x23, 0xb7, 0x5d, 0xb4, + 0x17, 0x22, 0xdb, 0x7e, 0x40, 0xf5, 0x75, 0x58, 0xa0, 0xcc, 0x21, 0xac, 0xd9, 0xea, 0xe2, 0xf6, + 0x09, 0x4f, 0x43, 0xce, 0x06, 0x6e, 0xda, 0x0b, 0x2d, 0xd6, 0x1b, 0x0d, 0x4a, 0xd2, 0x37, 0xa7, + 0x96, 0x91, 0x4d, 0x1d, 0xf2, 0x1e, 0x43, 0x3d, 0x99, 0x4b, 0xfe, 0x3b, 0xcc, 0xe4, 0xb1, 0x43, + 0x8f, 0x9b, 0x5d, 0x8f, 0x32, 0x9e, 0xc9, 0x92, 0x5d, 0x08, 0x0d, 0x07, 0x1e, 0x65, 0xb1, 0xf4, + 0xe7, 0x47, 0xd2, 0xbf, 0x0c, 0xb3, 0xf8, 0x95, 0x8f, 0x08, 0xcf, 0x5a, 0xd1, 0x16, 0x8b, 0xd0, + 0xca, 0x79, 0xc9, 0x64, 0x89, 0x85, 0xf5, 0x1c, 0x96, 0xe3, 0xf4, 0x94, 0x76, 0x03, 0xe6, 0x69, + 0xbf, 0xdd, 0x46, 0x94, 0x72, 0x9a, 0x05, 0x3b, 0x5a, 0xea, 0x5b, 0x50, 0x46, 0x84, 0x60, 0xd2, + 0xec, 0x21, 0x4a, 0x9d, 0x8e, 0xa8, 0x7d, 0xd1, 0x2e, 0x71, 0x63, 0x5d, 0xd8, 0xac, 0x2f, 0xa1, + 0x5c, 0xa7, 0x9d, 0xc7, 0xa8, 0x8b, 0x18, 0x7a, 0xc7, 0x4b, 0xa4, 0xf8, 0xe6, 0xe2, 0x7c, 0x6f, + 0xc1, 0xca, 0x88, 0xe3, 0x88, 0xb0, 0xf5, 0x09, 0x2c, 0xd5, 0x69, 0xa7, 0x81, 0x42, 0x1d, 0xa2, + 0x3c, 0x87, 0x19, 0x41, 0x17, 0x61, 0xc6, 0x0b, 0x24, 0xf3, 0x19, 0x2f, 0xb0, 0x4c, 0x30, 0xc6, + 0x4f, 0x2b, 0xcf, 0x4f, 0x79, 0xc8, 0xd8, 0xde, 0x53, 0x34, 0x68, 0x39, 0x34, 0x4b, 0x93, 0x01, + 0xf3, 0x27, 0x02, 0x24, 0x63, 0x44, 0x4b, 0x6b, 0x1d, 0xd6, 0x12, 0x9d, 0xa9, 0x68, 0x9f, 0x8d, + 0x33, 0x79, 0x86, 0x99, 0xd3, 0x6d, 0x04, 0x4e, 0x3b, 0x2b, 0x60, 0x98, 0xac, 0x10, 0x22, 0x6f, + 0xa0, 0x58, 0x58, 0x16, 0x6c, 0xa4, 0xf9, 0x52, 0xf1, 0x3e, 0xe7, 0x95, 0xda, 0x75, 0xdd, 0x4f, + 0xbb, 0x8e, 0xd7, 0x43, 0x24, 0x23, 0xc8, 0x16, 0x94, 0xdb, 0x21, 0xa8, 0xe9, 0xb8, 0x2e, 0x09, + 0x6f, 0x86, 0xac, 0x3c, 0x37, 0xee, 0x0a, 0x9b, 0x2c, 0xd0, 0xd0, 0x9f, 0x0a, 0xf4, 0x05, 0x2f, + 0x90, 0x8d, 0x7a, 0xf8, 0x14, 0xfd, 0x43, 0xb1, 0x44, 0xd5, 0x46, 0x5c, 0xaa, 0x70, 0xa7, 0xf0, + 0xbf, 0x3a, 0xed, 0xec, 0xfb, 0x9e, 0x12, 0x3f, 0xfd, 0x75, 0x88, 0xd7, 0x2f, 0x37, 0x52, 0xbf, + 0xf0, 0x0f, 0xcf, 0xc2, 0x24, 0x36, 0x45, 0xba, 0xc5, 0xd3, 0x05, 0x4c, 0xe5, 0xd5, 0xba, 0x0d, + 0xb7, 0xc6, 0xe2, 0x2a, 0x4a, 0x35, 0xfe, 0xcc, 0x34, 0x8e, 0xfb, 0xcc, 0xc5, 0xaf, 0xfc, 0xc9, + 0xb4, 0xac, 0x35, 0x58, 0x4d, 0x38, 0xa0, 0xfc, 0xfd, 0xaa, 0xf1, 0xda, 0xed, 0xf5, 0x07, 0x0d, + 0xf1, 0x74, 0x67, 0x28, 0x5c, 0x87, 0x85, 0x23, 0x4c, 0xc6, 0xb2, 0x09, 0x47, 0x98, 0xc8, 0x5c, + 0xea, 0x26, 0x14, 0xdc, 0x3e, 0x71, 0x98, 0x87, 0x7d, 0xa9, 0x59, 0xad, 0xc3, 0xdb, 0xd5, 0x1a, + 0x30, 0x44, 0xb9, 0xdc, 0xa2, 0x2d, 0x16, 0x61, 0x89, 0x02, 0x67, 0xd0, 0x43, 0x3e, 0x6b, 0xba, + 0xc8, 0xc7, 0x3d, 0xf9, 0xdc, 0x94, 0xa4, 0xf1, 0x71, 0x68, 0x93, 0xd7, 0x61, 0x48, 0x51, 0x91, + 0xff, 0x8e, 0x73, 0xe7, 0x55, 0x6b, 0x30, 0xe2, 0x0c, 0x32, 0xb8, 0x2f, 0x41, 0xae, 0xed, 0xb9, + 0x92, 0x73, 0xf8, 0x73, 0x5c, 0x4d, 0x6e, 0x5c, 0x8d, 0x0c, 0x3b, 0xf4, 0xae, 0xc2, 0xfe, 0xa6, + 0xc1, 0xf5, 0x3a, 0xed, 0x3c, 0x0f, 0x3a, 0xc4, 0x71, 0xd1, 0x7f, 0x37, 0x6f, 0xab, 0x70, 0xfb, + 0x12, 0x4d, 0x25, 0x62, 0xc0, 0x37, 0x6d, 0xf4, 0xb2, 0x8f, 0x28, 0xdb, 0x65, 0x0c, 0x51, 0xc6, + 0x03, 0x3e, 0xc1, 0xa4, 0xf7, 0x6e, 0x2f, 0xad, 0xe8, 0x17, 0xb9, 0xc4, 0x7e, 0x91, 0x8f, 0xbf, + 0xbf, 0x2f, 0x61, 0x33, 0x35, 0xb4, 0x6a, 0x1e, 0x77, 0xa0, 0x18, 0x35, 0xc9, 0xa8, 0x6b, 0x0e, + 0x0d, 0xf1, 0xd6, 0x32, 0x33, 0xda, 0x5a, 0x96, 0x61, 0x96, 0x77, 0x91, 0x88, 0x08, 0x5f, 0x58, + 0x3f, 0x6a, 0x50, 0x0c, 0x9f, 0x14, 0x1e, 0x2c, 0x5b, 0x5e, 0x18, 0x04, 0x11, 0x59, 0x25, 0xb9, + 0x8a, 0xc9, 0xce, 0x25, 0xcb, 0xce, 0x27, 0xca, 0x9e, 0x8d, 0xcb, 0xbe, 0xc1, 0x6f, 0x8d, 0xa0, + 0xa0, 0xca, 0xf0, 0xb3, 0xc6, 0x9b, 0xa7, 0x4c, 0x86, 0x8d, 0x02, 0x4c, 0xd8, 0xe4, 0x12, 0xbc, + 0x37, 0x8e, 0x5d, 0xb8, 0x93, 0xc4, 0xe6, 0xfd, 0x56, 0x45, 0xc4, 0xf9, 0x57, 0xab, 0x22, 0x28, + 0x44, 0x32, 0x77, 0xde, 0x94, 0x21, 0x57, 0xa7, 0x1d, 0xfd, 0x2b, 0x28, 0xa8, 0x11, 0x76, 0xb3, + 0x9a, 0x34, 0xe9, 0x56, 0x63, 0x43, 0x9f, 0xf9, 0xc1, 0x44, 0x88, 0x4a, 0xe4, 0xb7, 0x50, 0x1c, + 0xce, 0x73, 0x56, 0xe6, 0x39, 0x8e, 0x31, 0xef, 0x4f, 0xc6, 0x28, 0xe7, 0xdf, 0x03, 0xc4, 0xc6, + 0xa6, 0xad, 0xd4, 0x93, 0x43, 0x90, 0xf9, 0x60, 0x0a, 0x90, 0xf2, 0xdf, 0x81, 0xf2, 0xe8, 0x90, + 0xf4, 0xff, 0xd4, 0xd3, 0x23, 0x38, 0xb3, 0x3a, 0x1d, 0x4e, 0x05, 0x3a, 0x05, 0x3d, 0x61, 0x66, + 0x7a, 0x30, 0x8d, 0x17, 0x09, 0x36, 0x1f, 0x5d, 0x01, 0xac, 0xe2, 0xfe, 0x00, 0x2b, 0xc9, 0xd3, + 0xd3, 0x54, 0x02, 0x86, 0x78, 0xf3, 0xa3, 0xab, 0xe1, 0x15, 0x01, 0x17, 0x4a, 0x23, 0x63, 0xc7, + 0xdd, 0x54, 0x3f, 0x71, 0x98, 0xf9, 0x70, 0x2a, 0x98, 0x8a, 0x12, 0xc0, 0xd2, 0xa5, 0x49, 0x22, + 0xfd, 0x0e, 0x8f, 0x43, 0xcd, 0x0f, 0xa7, 0x86, 0xc6, 0x6f, 0x66, 0x6c, 0xd4, 0x48, 0xbf, 0x99, + 0x43, 0x50, 0xc6, 0xcd, 0xbc, 0x3c, 0x11, 0xe8, 0x2f, 0x60, 0x71, 0xac, 0x2d, 0xdf, 0x4b, 0x3d, + 0x3e, 0x0a, 0x34, 0x6b, 0x53, 0x02, 0x55, 0xac, 0x23, 0xd0, 0x77, 0x5d, 0x37, 0x92, 0x18, 0x8d, + 0xa3, 0xe9, 0x9a, 0x86, 0xf3, 0x6c, 0x86, 0xa6, 0xcb, 0x43, 0xaf, 0x8e, 0x61, 0x45, 0x8c, 0xa7, + 0xe3, 0xa1, 0xd2, 0xff, 0x75, 0x23, 0xe3, 0x6c, 0xc6, 0xbf, 0x2e, 0x71, 0xec, 0xd5, 0x7f, 0xd2, + 0xe0, 0x66, 0xca, 0x60, 0x50, 0xcb, 0x70, 0x95, 0x74, 0xc0, 0xfc, 0xf8, 0x8a, 0x07, 0x14, 0x09, + 0x1b, 0xe6, 0x64, 0xb7, 0x5e, 0x4f, 0x4f, 0x16, 0x07, 0x98, 0xf7, 0x26, 0x00, 0x94, 0x4f, 0x0a, + 0xd7, 0x2f, 0x37, 0xda, 0xfb, 0x93, 0x18, 0x0e, 0xb1, 0xe6, 0xce, 0xf4, 0xd8, 0xb8, 0x10, 0xd9, + 0xe0, 0xd6, 0x33, 0x4e, 0x87, 0x80, 0x0c, 0x21, 0xa3, 0xfd, 0x69, 0xef, 0xe0, 0xf7, 0xf3, 0x8a, + 0xf6, 0xf6, 0xbc, 0xa2, 0xfd, 0x79, 0x5e, 0xd1, 0x7e, 0xb9, 0xa8, 0x5c, 0x7b, 0x7b, 0x51, 0xb9, + 0xf6, 0xc7, 0x45, 0xe5, 0xda, 0x37, 0x3b, 0x1d, 0x8f, 0x1d, 0xf7, 0x5b, 0xd5, 0x36, 0xee, 0xd5, + 0x5e, 0x38, 0xed, 0x13, 0xa7, 0x7b, 0xe0, 0xb4, 0x68, 0x4d, 0xf8, 0x7d, 0x28, 0xbe, 0xe1, 0x9c, + 0x0d, 0xbf, 0xe2, 0x0c, 0x02, 0x44, 0x5b, 0x73, 0xfc, 0x4b, 0xce, 0xa3, 0xbf, 0x03, 0x00, 0x00, + 0xff, 0xff, 0xdc, 0xba, 0x8b, 0x54, 0xea, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2998,12 +2998,10 @@ func (m *MsgSetProviderTotalSpace) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if len(m.Space) > 0 { - i -= len(m.Space) - copy(dAtA[i:], m.Space) - i = encodeVarintTx(dAtA, i, uint64(len(m.Space))) + if m.Space != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Space)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } if len(m.Creator) > 0 { i -= len(m.Creator) @@ -3178,12 +3176,10 @@ func (m *MsgInitProvider) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.TotalSpace) > 0 { - i -= len(m.TotalSpace) - copy(dAtA[i:], m.TotalSpace) - i = encodeVarintTx(dAtA, i, uint64(len(m.TotalSpace))) + if m.TotalSpace != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.TotalSpace)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x20 } if len(m.Keybase) > 0 { i -= len(m.Keybase) @@ -4079,9 +4075,8 @@ func (m *MsgSetProviderTotalSpace) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Space) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.Space != 0 { + n += 1 + sovTx(uint64(m.Space)) } return n } @@ -4165,9 +4160,8 @@ func (m *MsgInitProvider) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.TotalSpace) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.TotalSpace != 0 { + n += 1 + sovTx(uint64(m.TotalSpace)) } return n } @@ -5741,10 +5735,10 @@ func (m *MsgSetProviderTotalSpace) Unmarshal(dAtA []byte) error { m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Space", wireType) } - var stringLen uint64 + m.Space = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -5754,24 +5748,11 @@ func (m *MsgSetProviderTotalSpace) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Space |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Space = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -6297,10 +6278,10 @@ func (m *MsgInitProvider) Unmarshal(dAtA []byte) error { m.Keybase = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TotalSpace", wireType) } - var stringLen uint64 + m.TotalSpace = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -6310,24 +6291,11 @@ func (m *MsgInitProvider) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.TotalSpace |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TotalSpace = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) From c25f033e02a05d9d60889cc42433a3c8c0d76a11 Mon Sep 17 00:00:00 2001 From: marston Date: Thu, 9 Nov 2023 10:54:41 -0500 Subject: [PATCH 10/14] fix tests --- x/storage/keeper/providers_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 2ca96c0ba..3ec994b6b 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" testutil "github.com/jackalLabs/canine-chain/v3/testutil" "github.com/jackalLabs/canine-chain/v3/x/storage/types" @@ -75,7 +76,7 @@ func (suite *KeeperTestSuite) TestInitProviders() { suite.Require().NoError(err) suite.Require().Equal(res.Provider.Address, user) suite.Require().Equal(res.Provider.Ip, initMsg.Ip) - suite.Require().Equal(res.Provider.Totalspace, initMsg.TotalSpace) + suite.Require().Equal(res.Provider.Totalspace, fmt.Sprintf("%d", initMsg.TotalSpace)) suite.Require().Equal(res.Provider.BurnedContracts, "0") suite.Require().Equal(res.Provider.Creator, initMsg.Creator) From 8c0850adcbee954531c9729fdab0d3ec216e771f Mon Sep 17 00:00:00 2001 From: marston Date: Thu, 9 Nov 2023 15:34:59 -0500 Subject: [PATCH 11/14] fumpt --- x/storage/keeper/providers_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/storage/keeper/providers_test.go b/x/storage/keeper/providers_test.go index 3ec994b6b..6cb052cec 100644 --- a/x/storage/keeper/providers_test.go +++ b/x/storage/keeper/providers_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" testutil "github.com/jackalLabs/canine-chain/v3/testutil" "github.com/jackalLabs/canine-chain/v3/x/storage/types" From 8f211f3441f95321f849b6c827b18ef5223fcd78 Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 10 Nov 2023 10:20:21 -0500 Subject: [PATCH 12/14] fixing some comments --- proto/canine_chain/storage/query.proto | 10 ++++------ x/storage/types/query.pb.go | 16 ++++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index 433f75f2e..b9a294370 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -9,8 +9,6 @@ import "canine_chain/storage/active_deals.proto"; import "canine_chain/storage/providers.proto"; import "canine_chain/storage/payment_info.proto"; -// this line is used by starport scaffolding # 1 - option go_package = "github.com/jackalLabs/canine-chain/x/storage/types"; // Query defines the gRPC querier service. @@ -33,14 +31,14 @@ service Query { "/jackal/canine-chain/storage/files"; } - // Queries a list of File items. + // Queries a list of open files. rpc OpenFiles(QueryOpenFiles) returns (QueryAllFilesResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/open_files/{provider_address}"; } - // Queries a list of File items. + // Queries a list of Proofs. rpc Proof(QueryProof) returns (QueryProofResponse) { option (google.api.http).get = @@ -89,13 +87,13 @@ service Query { "/jackal/canine-chain/storage/free_space/{address}"; } - // Queries a list of FreeSpace items. + // Queries how many files a provider is storing. rpc StoreCount(QueryStoreCount) returns (QueryStoreCountResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/storing/{address}"; } - // Queries a list of FindFile items. + // Queries where a file is located. rpc FindFile(QueryFindFile) returns (QueryFindFileResponse) { option (google.api.http).get = "/jackal/canine-chain/storage/find_file/{merkle}"; diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index 94f047f8e..c6a26a5cf 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -2391,9 +2391,9 @@ type QueryClient interface { File(ctx context.Context, in *QueryFile, opts ...grpc.CallOption) (*QueryFileResponse, error) // Queries a list of File items. AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) - // Queries a list of File items. + // Queries a list of open files. OpenFiles(ctx context.Context, in *QueryOpenFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) - // Queries a list of File items. + // Queries a list of Proofs. Proof(ctx context.Context, in *QueryProof, opts ...grpc.CallOption) (*QueryProofResponse, error) // Queries a Providers by index. Provider(ctx context.Context, in *QueryProvider, opts ...grpc.CallOption) (*QueryProviderResponse, error) @@ -2409,9 +2409,9 @@ type QueryClient interface { AllReports(ctx context.Context, in *QueryAllReports, opts ...grpc.CallOption) (*QueryAllReportsResponse, error) // Queries a list of FreeSpace items. FreeSpace(ctx context.Context, in *QueryFreeSpace, opts ...grpc.CallOption) (*QueryFreeSpaceResponse, error) - // Queries a list of FreeSpace items. + // Queries how many files a provider is storing. StoreCount(ctx context.Context, in *QueryStoreCount, opts ...grpc.CallOption) (*QueryStoreCountResponse, error) - // Queries a list of FindFile items. + // Queries where a file is located. FindFile(ctx context.Context, in *QueryFindFile, opts ...grpc.CallOption) (*QueryFindFileResponse, error) // Queries a list of GetClientFreeSpace items. GetClientFreeSpace(ctx context.Context, in *QueryClientFreeSpace, opts ...grpc.CallOption) (*QueryClientFreeSpaceResponse, error) @@ -2645,9 +2645,9 @@ type QueryServer interface { File(context.Context, *QueryFile) (*QueryFileResponse, error) // Queries a list of File items. AllFiles(context.Context, *QueryAllFiles) (*QueryAllFilesResponse, error) - // Queries a list of File items. + // Queries a list of open files. OpenFiles(context.Context, *QueryOpenFiles) (*QueryAllFilesResponse, error) - // Queries a list of File items. + // Queries a list of Proofs. Proof(context.Context, *QueryProof) (*QueryProofResponse, error) // Queries a Providers by index. Provider(context.Context, *QueryProvider) (*QueryProviderResponse, error) @@ -2663,9 +2663,9 @@ type QueryServer interface { AllReports(context.Context, *QueryAllReports) (*QueryAllReportsResponse, error) // Queries a list of FreeSpace items. FreeSpace(context.Context, *QueryFreeSpace) (*QueryFreeSpaceResponse, error) - // Queries a list of FreeSpace items. + // Queries how many files a provider is storing. StoreCount(context.Context, *QueryStoreCount) (*QueryStoreCountResponse, error) - // Queries a list of FindFile items. + // Queries where a file is located. FindFile(context.Context, *QueryFindFile) (*QueryFindFileResponse, error) // Queries a list of GetClientFreeSpace items. GetClientFreeSpace(context.Context, *QueryClientFreeSpace) (*QueryClientFreeSpaceResponse, error) From 1fd0bb86bf9dd6e3ffdf173d72e64951db683acb Mon Sep 17 00:00:00 2001 From: marston Date: Fri, 10 Nov 2023 13:49:02 -0500 Subject: [PATCH 13/14] fixing make root name --- proto/canine_chain/filetree/tx.proto | 6 +- x/filetree/client/cli/tx_make_root.go | 6 +- x/filetree/handler.go | 4 +- x/filetree/keeper/msg_server_make_root.go | 4 +- .../keeper/msg_server_make_root_test.go | 8 +- x/filetree/types/codec.go | 4 +- x/filetree/types/message_make_rootv2.go | 20 +- x/filetree/types/test_helpers.go | 4 +- x/filetree/types/tx.pb.go | 228 +++++++++--------- 9 files changed, 142 insertions(+), 142 deletions(-) diff --git a/proto/canine_chain/filetree/tx.proto b/proto/canine_chain/filetree/tx.proto index d5db66523..ab8b10bb6 100644 --- a/proto/canine_chain/filetree/tx.proto +++ b/proto/canine_chain/filetree/tx.proto @@ -10,7 +10,7 @@ service Msg { rpc PostKey(MsgPostKey) returns (MsgPostKeyResponse); rpc DeleteFile(MsgDeleteFile) returns (MsgDeleteFileResponse); rpc RemoveViewers(MsgRemoveViewers) returns (MsgRemoveViewersResponse); - rpc MakeRootV2(MsgMakeRootV2) returns (MsgMakeRootResponse); + rpc ProvisionFileTree(MsgProvisionFileTree) returns (MsgProvisionFileTreeResponse); rpc AddEditors(MsgAddEditors) returns (MsgAddEditorsResponse); rpc RemoveEditors(MsgRemoveEditors) returns (MsgRemoveEditorsResponse); @@ -67,9 +67,9 @@ message MsgRemoveViewers { message MsgRemoveViewersResponse {} -message MsgMakeRootResponse {} +message MsgProvisionFileTreeResponse {} -message MsgMakeRootV2 { +message MsgProvisionFileTree { string creator = 1; string editors = 2; string viewers = 3; diff --git a/x/filetree/client/cli/tx_make_root.go b/x/filetree/client/cli/tx_make_root.go index 54e393e33..ff44c0df4 100644 --- a/x/filetree/client/cli/tx_make_root.go +++ b/x/filetree/client/cli/tx_make_root.go @@ -18,8 +18,8 @@ var _ = strconv.Itoa(0) func CmdMakeRootV2() *cobra.Command { cmd := &cobra.Command{ - Use: "make-root-v2", - Short: "Broadcast message make root", + Use: "provision", + Short: "Provision your file tree", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) (err error) { if err != nil { @@ -51,7 +51,7 @@ func CmdMakeRootV2() *cobra.Command { return err } - msg := types.NewMsgMakeRootV2( + msg := types.NewMsgProvisionFileTree( clientCtx.GetFromAddress().String(), string(jsonEditors), "Viewers", diff --git a/x/filetree/handler.go b/x/filetree/handler.go index f490e8fc4..7c28df66b 100644 --- a/x/filetree/handler.go +++ b/x/filetree/handler.go @@ -32,8 +32,8 @@ func NewHandler(k keeper.Keeper) sdk.Handler { case *types.MsgRemoveViewers: res, err := msgServer.RemoveViewers(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgMakeRootV2: - res, err := msgServer.MakeRootV2(sdk.WrapSDKContext(ctx), msg) + case *types.MsgProvisionFileTree: + res, err := msgServer.ProvisionFileTree(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) case *types.MsgAddEditors: res, err := msgServer.AddEditors(sdk.WrapSDKContext(ctx), msg) diff --git a/x/filetree/keeper/msg_server_make_root.go b/x/filetree/keeper/msg_server_make_root.go index 78668867a..4c86618fe 100644 --- a/x/filetree/keeper/msg_server_make_root.go +++ b/x/filetree/keeper/msg_server_make_root.go @@ -32,10 +32,10 @@ func (k msgServer) MakeRootFolder(ctx sdk.Context, creator string, viewers strin k.SetFiles(ctx, file) } -func (k msgServer) MakeRootV2(goCtx context.Context, msg *types.MsgMakeRootV2) (*types.MsgMakeRootResponse, error) { +func (k msgServer) ProvisionFileTree(goCtx context.Context, msg *types.MsgProvisionFileTree) (*types.MsgProvisionFileTreeResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) k.MakeRootFolder(ctx, msg.Creator, msg.Viewers, msg.Editors, msg.TrackingNumber) - return &types.MsgMakeRootResponse{}, nil + return &types.MsgProvisionFileTreeResponse{}, nil } diff --git a/x/filetree/keeper/msg_server_make_root_test.go b/x/filetree/keeper/msg_server_make_root_test.go index 07e44a6cf..b417dd44a 100644 --- a/x/filetree/keeper/msg_server_make_root_test.go +++ b/x/filetree/keeper/msg_server_make_root_test.go @@ -18,13 +18,13 @@ func (suite *KeeperTestSuite) TestMsgMakeRoot() { suite.Require().NoError(err) cases := []struct { - preRun func() *types.MsgMakeRootV2 + preRun func() *types.MsgProvisionFileTree expErr bool expErrMsg string name string }{ { - preRun: func() *types.MsgMakeRootV2 { + preRun: func() *types.MsgProvisionFileTree { return msg }, expErr: false, @@ -36,13 +36,13 @@ func (suite *KeeperTestSuite) TestMsgMakeRoot() { suite.Run(tc.name, func() { msg := tc.preRun() suite.Require().NoError(err) - res, err := msgSrvr.MakeRootV2(context, msg) + res, err := msgSrvr.ProvisionFileTree(context, msg) if tc.expErr { suite.Require().Error(err) suite.Require().Contains(err.Error(), tc.expErrMsg) } else { suite.Require().NoError(err) - suite.Require().EqualValues(types.MsgMakeRootResponse{}, *res) + suite.Require().EqualValues(types.MsgProvisionFileTreeResponse{}, *res) } }) diff --git a/x/filetree/types/codec.go b/x/filetree/types/codec.go index 0e44bc4e5..350f16b66 100644 --- a/x/filetree/types/codec.go +++ b/x/filetree/types/codec.go @@ -14,7 +14,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgPostKey{}, "filetree/PostKey", nil) cdc.RegisterConcrete(&MsgDeleteFile{}, "filetree/DeleteFile", nil) cdc.RegisterConcrete(&MsgRemoveViewers{}, "filetree/RemoveViewers", nil) - cdc.RegisterConcrete(&MsgMakeRootV2{}, "filetree/MakeRoot", nil) + cdc.RegisterConcrete(&MsgProvisionFileTree{}, "filetree/ProvisionFileTree", nil) cdc.RegisterConcrete(&MsgAddEditors{}, "filetree/AddEditors", nil) cdc.RegisterConcrete(&MsgRemoveEditors{}, "filetree/RemoveEditors", nil) cdc.RegisterConcrete(&MsgResetEditors{}, "filetree/ResetEditors", nil) @@ -39,7 +39,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgRemoveViewers{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgMakeRootV2{}, + &MsgProvisionFileTree{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), &MsgAddEditors{}, diff --git a/x/filetree/types/message_make_rootv2.go b/x/filetree/types/message_make_rootv2.go index 22aa41792..cce4d0bfc 100644 --- a/x/filetree/types/message_make_rootv2.go +++ b/x/filetree/types/message_make_rootv2.go @@ -5,12 +5,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -const TypeMsgMakeRootV2 = "make_root_v2" +const TypeMsgProvisionFileTree = "provision_file_tree" -var _ sdk.Msg = &MsgMakeRootV2{} +var _ sdk.Msg = &MsgProvisionFileTree{} -func NewMsgMakeRootV2(creator string, editors string, viewers string, trackingNumber string) *MsgMakeRootV2 { - return &MsgMakeRootV2{ +func NewMsgProvisionFileTree(creator string, editors string, viewers string, trackingNumber string) *MsgProvisionFileTree { + return &MsgProvisionFileTree{ Creator: creator, Editors: editors, Viewers: viewers, @@ -18,15 +18,15 @@ func NewMsgMakeRootV2(creator string, editors string, viewers string, trackingNu } } -func (msg *MsgMakeRootV2) Route() string { +func (msg *MsgProvisionFileTree) Route() string { return RouterKey } -func (msg *MsgMakeRootV2) Type() string { - return TypeMsgMakeRootV2 +func (msg *MsgProvisionFileTree) Type() string { + return TypeMsgProvisionFileTree } -func (msg *MsgMakeRootV2) GetSigners() []sdk.AccAddress { +func (msg *MsgProvisionFileTree) GetSigners() []sdk.AccAddress { creator, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { panic(err) @@ -34,12 +34,12 @@ func (msg *MsgMakeRootV2) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{creator} } -func (msg *MsgMakeRootV2) GetSignBytes() []byte { +func (msg *MsgProvisionFileTree) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(msg) return sdk.MustSortJSON(bz) } -func (msg *MsgMakeRootV2) ValidateBasic() error { +func (msg *MsgProvisionFileTree) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) diff --git a/x/filetree/types/test_helpers.go b/x/filetree/types/test_helpers.go index c842ea3f9..c2036aed8 100644 --- a/x/filetree/types/test_helpers.go +++ b/x/filetree/types/test_helpers.go @@ -40,7 +40,7 @@ func MakePrivateKey(fromName string) (*eciesgo.PrivateKey, error) { return newKey, nil } -func CreateMsgMakeRoot(creator string) (*MsgMakeRootV2, error) { +func CreateMsgMakeRoot(creator string) (*MsgProvisionFileTree, error) { trackingNumber := uuid.NewString() editorIds := strings.Split(creator, ",") @@ -49,7 +49,7 @@ func CreateMsgMakeRoot(creator string) (*MsgMakeRootV2, error) { return nil, err } - msg := NewMsgMakeRootV2( + msg := NewMsgProvisionFileTree( creator, string(jsonEditors), "Viewers", diff --git a/x/filetree/types/tx.pb.go b/x/filetree/types/tx.pb.go index 7648ef2eb..02e7b941c 100644 --- a/x/filetree/types/tx.pb.go +++ b/x/filetree/types/tx.pb.go @@ -571,21 +571,21 @@ func (m *MsgRemoveViewersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveViewersResponse proto.InternalMessageInfo -type MsgMakeRootResponse struct { +type MsgProvisionFileTreeResponse struct { } -func (m *MsgMakeRootResponse) Reset() { *m = MsgMakeRootResponse{} } -func (m *MsgMakeRootResponse) String() string { return proto.CompactTextString(m) } -func (*MsgMakeRootResponse) ProtoMessage() {} -func (*MsgMakeRootResponse) Descriptor() ([]byte, []int) { +func (m *MsgProvisionFileTreeResponse) Reset() { *m = MsgProvisionFileTreeResponse{} } +func (m *MsgProvisionFileTreeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgProvisionFileTreeResponse) ProtoMessage() {} +func (*MsgProvisionFileTreeResponse) Descriptor() ([]byte, []int) { return fileDescriptor_e5756d04c34e5a81, []int{10} } -func (m *MsgMakeRootResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgProvisionFileTreeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgMakeRootResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgProvisionFileTreeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgMakeRootResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgProvisionFileTreeResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -595,37 +595,37 @@ func (m *MsgMakeRootResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgMakeRootResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgMakeRootResponse.Merge(m, src) +func (m *MsgProvisionFileTreeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgProvisionFileTreeResponse.Merge(m, src) } -func (m *MsgMakeRootResponse) XXX_Size() int { +func (m *MsgProvisionFileTreeResponse) XXX_Size() int { return m.Size() } -func (m *MsgMakeRootResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgMakeRootResponse.DiscardUnknown(m) +func (m *MsgProvisionFileTreeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgProvisionFileTreeResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgMakeRootResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgProvisionFileTreeResponse proto.InternalMessageInfo -type MsgMakeRootV2 struct { +type MsgProvisionFileTree struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Editors string `protobuf:"bytes,2,opt,name=editors,proto3" json:"editors,omitempty"` Viewers string `protobuf:"bytes,3,opt,name=viewers,proto3" json:"viewers,omitempty"` TrackingNumber string `protobuf:"bytes,4,opt,name=tracking_number,json=trackingNumber,proto3" json:"tracking_number,omitempty"` } -func (m *MsgMakeRootV2) Reset() { *m = MsgMakeRootV2{} } -func (m *MsgMakeRootV2) String() string { return proto.CompactTextString(m) } -func (*MsgMakeRootV2) ProtoMessage() {} -func (*MsgMakeRootV2) Descriptor() ([]byte, []int) { +func (m *MsgProvisionFileTree) Reset() { *m = MsgProvisionFileTree{} } +func (m *MsgProvisionFileTree) String() string { return proto.CompactTextString(m) } +func (*MsgProvisionFileTree) ProtoMessage() {} +func (*MsgProvisionFileTree) Descriptor() ([]byte, []int) { return fileDescriptor_e5756d04c34e5a81, []int{11} } -func (m *MsgMakeRootV2) XXX_Unmarshal(b []byte) error { +func (m *MsgProvisionFileTree) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgMakeRootV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgProvisionFileTree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgMakeRootV2.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgProvisionFileTree.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -635,40 +635,40 @@ func (m *MsgMakeRootV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *MsgMakeRootV2) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgMakeRootV2.Merge(m, src) +func (m *MsgProvisionFileTree) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgProvisionFileTree.Merge(m, src) } -func (m *MsgMakeRootV2) XXX_Size() int { +func (m *MsgProvisionFileTree) XXX_Size() int { return m.Size() } -func (m *MsgMakeRootV2) XXX_DiscardUnknown() { - xxx_messageInfo_MsgMakeRootV2.DiscardUnknown(m) +func (m *MsgProvisionFileTree) XXX_DiscardUnknown() { + xxx_messageInfo_MsgProvisionFileTree.DiscardUnknown(m) } -var xxx_messageInfo_MsgMakeRootV2 proto.InternalMessageInfo +var xxx_messageInfo_MsgProvisionFileTree proto.InternalMessageInfo -func (m *MsgMakeRootV2) GetCreator() string { +func (m *MsgProvisionFileTree) GetCreator() string { if m != nil { return m.Creator } return "" } -func (m *MsgMakeRootV2) GetEditors() string { +func (m *MsgProvisionFileTree) GetEditors() string { if m != nil { return m.Editors } return "" } -func (m *MsgMakeRootV2) GetViewers() string { +func (m *MsgProvisionFileTree) GetViewers() string { if m != nil { return m.Viewers } return "" } -func (m *MsgMakeRootV2) GetTrackingNumber() string { +func (m *MsgProvisionFileTree) GetTrackingNumber() string { if m != nil { return m.TrackingNumber } @@ -1198,8 +1198,8 @@ func init() { proto.RegisterType((*MsgDeleteFileResponse)(nil), "canine_chain.filetree.MsgDeleteFileResponse") proto.RegisterType((*MsgRemoveViewers)(nil), "canine_chain.filetree.MsgRemoveViewers") proto.RegisterType((*MsgRemoveViewersResponse)(nil), "canine_chain.filetree.MsgRemoveViewersResponse") - proto.RegisterType((*MsgMakeRootResponse)(nil), "canine_chain.filetree.MsgMakeRootResponse") - proto.RegisterType((*MsgMakeRootV2)(nil), "canine_chain.filetree.MsgMakeRootV2") + proto.RegisterType((*MsgProvisionFileTreeResponse)(nil), "canine_chain.filetree.MsgProvisionFileTreeResponse") + proto.RegisterType((*MsgProvisionFileTree)(nil), "canine_chain.filetree.MsgProvisionFileTree") proto.RegisterType((*MsgAddEditors)(nil), "canine_chain.filetree.MsgAddEditors") proto.RegisterType((*MsgAddEditorsResponse)(nil), "canine_chain.filetree.MsgAddEditorsResponse") proto.RegisterType((*MsgRemoveEditors)(nil), "canine_chain.filetree.MsgRemoveEditors") @@ -1215,59 +1215,59 @@ func init() { func init() { proto.RegisterFile("canine_chain/filetree/tx.proto", fileDescriptor_e5756d04c34e5a81) } var fileDescriptor_e5756d04c34e5a81 = []byte{ - // 819 bytes of a gzipped FileDescriptorProto + // 824 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xd3, 0x48, - 0x14, 0xae, 0x9b, 0x6c, 0x9b, 0xbc, 0x6e, 0x7f, 0xc8, 0xbb, 0xdd, 0x7a, 0xbd, 0x6a, 0x76, 0x37, - 0x02, 0x4a, 0x11, 0x4d, 0xa4, 0xf6, 0xc2, 0x15, 0x0a, 0x48, 0xa8, 0x04, 0xaa, 0x1c, 0x8a, 0xd4, - 0x03, 0xa9, 0x63, 0xbf, 0xda, 0x26, 0xa9, 0x1d, 0x79, 0xa6, 0x4d, 0x73, 0xe3, 0x80, 0x38, 0xf3, - 0x37, 0xf0, 0xd7, 0x20, 0x71, 0xe9, 0x91, 0x23, 0x6a, 0xff, 0x0b, 0x4e, 0xc8, 0x9e, 0x19, 0x7b, - 0xec, 0x26, 0x76, 0xa4, 0x96, 0x5b, 0xe6, 0xbd, 0xcf, 0xf3, 0x7d, 0xf3, 0xde, 0x37, 0x6f, 0x02, - 0x35, 0xd3, 0xf0, 0x5c, 0x0f, 0x3b, 0xa6, 0x63, 0xb8, 0x5e, 0xf3, 0xd8, 0xed, 0x23, 0x0d, 0x10, - 0x9b, 0xf4, 0xbc, 0x31, 0x08, 0x7c, 0xea, 0xab, 0xab, 0x72, 0xbe, 0x21, 0xf2, 0xf5, 0x1f, 0x0a, - 0x2c, 0xb4, 0x88, 0xbd, 0xef, 0x13, 0xfa, 0xdc, 0xed, 0xa3, 0xaa, 0xc1, 0xbc, 0x19, 0xa0, 0x41, - 0xfd, 0x40, 0x53, 0xfe, 0x53, 0xee, 0x57, 0xdb, 0x62, 0x19, 0x66, 0x0c, 0xd3, 0xf4, 0x4f, 0x3d, - 0xaa, 0xcd, 0xb2, 0x0c, 0x5f, 0xaa, 0xff, 0xc2, 0x82, 0x63, 0x10, 0xa7, 0x33, 0x30, 0x02, 0xf4, - 0xa8, 0x56, 0x8a, 0xb2, 0x10, 0x86, 0xf6, 0xa3, 0x88, 0xba, 0x0e, 0xd1, 0xaa, 0x63, 0x3a, 0x6e, - 0xdf, 0xd2, 0xca, 0x51, 0xbe, 0x1a, 0x46, 0x76, 0xc3, 0x80, 0xaa, 0x43, 0xc5, 0xf4, 0x3d, 0x8a, - 0x1e, 0x25, 0xda, 0x6f, 0x51, 0x32, 0x5e, 0x87, 0xac, 0x67, 0x2e, 0x0e, 0x31, 0x20, 0xda, 0x1c, - 0x63, 0xe5, 0xcb, 0x30, 0x83, 0x96, 0x4b, 0xfd, 0x80, 0x68, 0xf3, 0x2c, 0xc3, 0x97, 0xea, 0x06, - 0x2c, 0xd3, 0xc0, 0x30, 0x7b, 0xae, 0x67, 0x77, 0xbc, 0xd3, 0x93, 0x2e, 0x06, 0x5a, 0x25, 0x42, - 0x2c, 0x89, 0xf0, 0xab, 0x28, 0x5a, 0xdf, 0x84, 0x3f, 0xa4, 0xb3, 0xb7, 0x91, 0x0c, 0x7c, 0x8f, - 0xa0, 0xaa, 0x42, 0x79, 0x60, 0x50, 0x87, 0x17, 0x20, 0xfa, 0x5d, 0xff, 0xac, 0xc0, 0x62, 0x8b, - 0xd8, 0x8f, 0x2d, 0xeb, 0x20, 0xe1, 0x9f, 0x50, 0xa9, 0x75, 0x00, 0x26, 0xb2, 0xe3, 0x5a, 0x84, - 0x17, 0xab, 0xca, 0x22, 0x2f, 0x2c, 0x12, 0x96, 0x8b, 0xa7, 0x7b, 0x38, 0x22, 0xa2, 0x5c, 0x2c, - 0xb4, 0x87, 0xa3, 0x68, 0x67, 0xc3, 0xb2, 0x02, 0x24, 0x84, 0xd7, 0x4a, 0x2c, 0xc3, 0x9d, 0xc3, - 0xce, 0x75, 0xfc, 0xa1, 0x87, 0x01, 0xaf, 0x55, 0x35, 0x8c, 0xbc, 0x0e, 0x03, 0xf5, 0x35, 0x58, - 0x4d, 0x69, 0x14, 0x27, 0xaa, 0x3f, 0x02, 0xe0, 0x07, 0xdd, 0xc3, 0x51, 0x8e, 0xf2, 0x15, 0x28, - 0xf5, 0x70, 0xc4, 0x25, 0x87, 0x3f, 0xeb, 0x7f, 0x82, 0x9a, 0x7c, 0x19, 0xef, 0x77, 0x14, 0x15, - 0xe3, 0x29, 0xf6, 0x91, 0x62, 0x81, 0x6d, 0xfe, 0x81, 0x2a, 0x37, 0x07, 0x75, 0xf8, 0xc6, 0x15, - 0x66, 0x0d, 0xea, 0xc8, 0x9e, 0x2a, 0xa5, 0x3c, 0xc5, 0x8f, 0x92, 0x30, 0xc4, 0xd4, 0x1f, 0x14, - 0x58, 0x69, 0x11, 0xbb, 0x8d, 0x27, 0xfe, 0x19, 0xde, 0xb8, 0x17, 0x52, 0xa9, 0x4b, 0x79, 0xa5, - 0x2e, 0x67, 0x4b, 0xad, 0x83, 0x96, 0x55, 0x11, 0x4b, 0x5c, 0x8d, 0x6c, 0xd5, 0x32, 0x7a, 0xd8, - 0xf6, 0x7d, 0x1a, 0x87, 0x3f, 0x32, 0x0b, 0x89, 0xf8, 0xc1, 0x76, 0xfe, 0x65, 0x13, 0xe6, 0x9e, - 0x4d, 0x9b, 0x5b, 0xba, 0x10, 0xa5, 0xf4, 0x85, 0x18, 0x63, 0xfb, 0xf2, 0x58, 0xdb, 0x27, 0x5e, - 0x7e, 0x96, 0x6c, 0x3a, 0xb9, 0x7e, 0x8c, 0x59, 0xae, 0x1f, 0x8b, 0x70, 0x2f, 0xf3, 0xb4, 0xec, - 0x65, 0x16, 0xba, 0x25, 0x2f, 0x73, 0x8d, 0xe3, 0x0d, 0x70, 0xe3, 0x03, 0xdc, 0x8a, 0x01, 0xb2, - 0x12, 0x2d, 0x58, 0x8e, 0x72, 0x04, 0x69, 0xb1, 0x40, 0x49, 0xc1, 0x6c, 0x9e, 0x82, 0x52, 0x56, - 0xc1, 0xdf, 0xb0, 0x96, 0x61, 0x19, 0x27, 0xa0, 0xf8, 0x8a, 0xdc, 0x86, 0x80, 0xec, 0x15, 0x78, - 0xaf, 0xc0, 0x52, 0x8b, 0xd8, 0xbb, 0x8e, 0xe1, 0xd9, 0x0c, 0xfd, 0x0b, 0x04, 0x84, 0xb3, 0xc5, - 0xc3, 0x61, 0xaa, 0x43, 0x15, 0x0f, 0x87, 0x4c, 0x9d, 0x06, 0x7f, 0xa5, 0x15, 0x08, 0x71, 0xdb, - 0x5f, 0x2b, 0x50, 0x6a, 0x11, 0x5b, 0x3d, 0x84, 0x4a, 0xfc, 0xee, 0xd5, 0x1b, 0x63, 0xdf, 0xc7, - 0x86, 0xf4, 0x3e, 0xe8, 0x0f, 0x8a, 0x31, 0xf1, 0x1b, 0x72, 0x04, 0x20, 0xbd, 0x15, 0x77, 0x26, - 0x7f, 0x99, 0xa0, 0xf4, 0x87, 0xd3, 0xa0, 0x62, 0x86, 0x37, 0x30, 0x2f, 0x06, 0xfa, 0xff, 0xf9, - 0xc2, 0xf6, 0x70, 0xa4, 0x6f, 0x16, 0x42, 0x64, 0xe9, 0xd2, 0x64, 0xcf, 0x91, 0x9e, 0xa0, 0xf2, - 0xa4, 0x5f, 0x9f, 0xe1, 0xaa, 0x0b, 0x8b, 0xe9, 0xf9, 0xbd, 0x31, 0xf9, 0xf3, 0x14, 0x50, 0x6f, - 0x4e, 0x09, 0x8c, 0xa9, 0xde, 0x02, 0x48, 0x03, 0x37, 0xe7, 0x30, 0x09, 0x2a, 0xaf, 0xcf, 0xd9, - 0xa1, 0xce, 0xfb, 0x2c, 0x6e, 0x79, 0x7e, 0x9f, 0x39, 0xaa, 0xa0, 0xcf, 0x99, 0xbb, 0x9c, 0x14, - 0x4b, 0x90, 0x14, 0x16, 0x4b, 0xf0, 0x34, 0xa7, 0x04, 0xc6, 0x54, 0xc7, 0xf0, 0x7b, 0x6a, 0x68, - 0xdd, 0xcb, 0xdb, 0x20, 0xc1, 0xe9, 0x8d, 0xe9, 0x70, 0xd7, 0x78, 0x44, 0xfb, 0x8b, 0x78, 0x44, - 0xf7, 0x1b, 0xd3, 0xe1, 0x62, 0x1e, 0x13, 0x16, 0xe4, 0x09, 0x74, 0x77, 0xf2, 0xe7, 0x12, 0x4c, - 0xdf, 0x9a, 0x0a, 0x26, 0x48, 0x9e, 0xb4, 0xbe, 0x5c, 0xd6, 0x94, 0x8b, 0xcb, 0x9a, 0xf2, 0xfd, - 0xb2, 0xa6, 0x7c, 0xba, 0xaa, 0xcd, 0x5c, 0x5c, 0xd5, 0x66, 0xbe, 0x5d, 0xd5, 0x66, 0x0e, 0x77, - 0x6c, 0x97, 0x3a, 0xa7, 0xdd, 0x86, 0xe9, 0x9f, 0x34, 0xdf, 0x19, 0x66, 0xcf, 0xe8, 0xbf, 0x34, - 0xba, 0xa4, 0xc9, 0x76, 0xdf, 0x62, 0x7f, 0xd4, 0xcf, 0xa5, 0xbf, 0xea, 0xa3, 0x01, 0x92, 0xee, - 0x5c, 0xf4, 0x77, 0x7d, 0xe7, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x75, 0xf6, 0x78, 0xa7, 0xd0, - 0x0b, 0x00, 0x00, + 0x14, 0xae, 0x9b, 0x6c, 0x9b, 0xbc, 0x6e, 0x7f, 0xac, 0xb7, 0xdd, 0x7a, 0xbd, 0x5b, 0xef, 0x12, + 0x01, 0xa5, 0x40, 0x13, 0x89, 0x5e, 0xb8, 0x42, 0x01, 0x09, 0x95, 0x40, 0x55, 0x21, 0x90, 0x7a, + 0x49, 0x1d, 0xfb, 0xd5, 0x36, 0x49, 0xed, 0xc8, 0x33, 0x69, 0x9a, 0x1b, 0x07, 0xae, 0x48, 0xfc, + 0x0d, 0xfc, 0x35, 0x1c, 0x7b, 0xe4, 0x88, 0xd2, 0xff, 0x82, 0x13, 0xb2, 0x3d, 0x63, 0x8f, 0xdd, + 0xc4, 0x0e, 0x6a, 0xb9, 0x79, 0xde, 0xfb, 0x66, 0xbe, 0x6f, 0xbe, 0x79, 0x6f, 0xc6, 0xa0, 0x19, + 0xba, 0xeb, 0xb8, 0xd8, 0x32, 0x6c, 0xdd, 0x71, 0x1b, 0xc7, 0x4e, 0x17, 0xa9, 0x8f, 0xd8, 0xa0, + 0x67, 0xf5, 0x9e, 0xef, 0x51, 0x4f, 0x5e, 0x13, 0xf3, 0x75, 0x9e, 0xaf, 0x7d, 0x97, 0x60, 0xa1, + 0x49, 0xac, 0x7d, 0x8f, 0xd0, 0x67, 0x4e, 0x17, 0x65, 0x05, 0xe6, 0x0d, 0x1f, 0x75, 0xea, 0xf9, + 0x8a, 0xf4, 0xbf, 0x74, 0xa7, 0x7a, 0xc0, 0x87, 0x41, 0x46, 0x37, 0x0c, 0xaf, 0xef, 0x52, 0x65, + 0x36, 0xca, 0xb0, 0xa1, 0xfc, 0x1f, 0x2c, 0xd8, 0x3a, 0xb1, 0x5b, 0x3d, 0xdd, 0x47, 0x97, 0x2a, + 0xa5, 0x30, 0x0b, 0x41, 0x68, 0x3f, 0x8c, 0xc8, 0x1b, 0x10, 0x8e, 0x5a, 0x86, 0xed, 0x74, 0x4d, + 0xa5, 0x1c, 0xe6, 0xab, 0x41, 0x64, 0x37, 0x08, 0xc8, 0x2a, 0x54, 0x0c, 0xcf, 0xa5, 0xe8, 0x52, + 0xa2, 0xfc, 0x16, 0x26, 0xe3, 0x71, 0xc0, 0x7a, 0xea, 0xe0, 0x00, 0x7d, 0xa2, 0xcc, 0x45, 0xac, + 0x6c, 0x18, 0x64, 0xd0, 0x74, 0xa8, 0xe7, 0x13, 0x65, 0x3e, 0xca, 0xb0, 0xa1, 0xbc, 0x09, 0xcb, + 0xd4, 0xd7, 0x8d, 0x8e, 0xe3, 0x5a, 0x2d, 0xb7, 0x7f, 0xd2, 0x46, 0x5f, 0xa9, 0x84, 0x88, 0x25, + 0x1e, 0x7e, 0x19, 0x46, 0x6b, 0x5b, 0xf0, 0xa7, 0xb0, 0xf7, 0x03, 0x24, 0x3d, 0xcf, 0x25, 0x28, + 0xcb, 0x50, 0xee, 0xe9, 0xd4, 0x66, 0x06, 0x84, 0xdf, 0xb5, 0xcf, 0x12, 0x2c, 0x36, 0x89, 0xf5, + 0xc8, 0x34, 0xdf, 0x24, 0xfc, 0x13, 0x9c, 0xda, 0x00, 0x88, 0x44, 0xb6, 0x1c, 0x93, 0x30, 0xb3, + 0xaa, 0x51, 0xe4, 0xb9, 0x49, 0x02, 0xbb, 0x58, 0xba, 0x83, 0x43, 0xc2, 0xed, 0x8a, 0x42, 0x7b, + 0x38, 0x0c, 0x57, 0xd6, 0x4d, 0xd3, 0x47, 0x42, 0x98, 0x57, 0x7c, 0x18, 0xac, 0x1c, 0x9c, 0x5c, + 0xcb, 0x1b, 0xb8, 0xe8, 0x33, 0xaf, 0xaa, 0x41, 0xe4, 0x55, 0x10, 0xa8, 0xad, 0xc3, 0x5a, 0x4a, + 0x23, 0xdf, 0x51, 0xed, 0x21, 0x00, 0xdb, 0xe8, 0x1e, 0x0e, 0x73, 0x94, 0xaf, 0x40, 0xa9, 0x83, + 0x43, 0x26, 0x39, 0xf8, 0xac, 0xad, 0x82, 0x9c, 0xcc, 0x8c, 0xd7, 0x3b, 0x0a, 0xcd, 0x78, 0x82, + 0x5d, 0xa4, 0x58, 0x50, 0x36, 0xff, 0x40, 0x95, 0x15, 0x07, 0xb5, 0xd9, 0xc2, 0x95, 0xa8, 0x34, + 0xa8, 0x2d, 0xd6, 0x54, 0x29, 0x55, 0x53, 0x6c, 0x2b, 0x09, 0x43, 0x4c, 0xfd, 0x41, 0x82, 0x95, + 0x26, 0xb1, 0x0e, 0xf0, 0xc4, 0x3b, 0xc5, 0x2b, 0x9f, 0x85, 0x60, 0x75, 0x29, 0xcf, 0xea, 0x72, + 0xd6, 0x6a, 0x15, 0x94, 0xac, 0x8a, 0x58, 0xa2, 0x06, 0xff, 0x06, 0x9e, 0xf9, 0xde, 0xa9, 0x43, + 0x1c, 0xcf, 0x0d, 0xe4, 0xbf, 0xf6, 0x31, 0xd9, 0xc2, 0x47, 0x09, 0x56, 0xc7, 0x01, 0xf2, 0x9b, + 0x8f, 0x17, 0xfb, 0x6c, 0xba, 0xd8, 0x85, 0x06, 0x29, 0xa5, 0x1b, 0x64, 0x4c, 0x1b, 0x94, 0xc7, + 0xb6, 0x41, 0x52, 0xdb, 0x4f, 0x93, 0x45, 0x27, 0xfb, 0x19, 0x31, 0x8b, 0x7e, 0x46, 0x11, 0x56, + 0xdb, 0x2c, 0x2d, 0xd6, 0x76, 0x14, 0xba, 0xa6, 0xda, 0x66, 0x1a, 0xc7, 0x17, 0xc4, 0x95, 0x37, + 0x70, 0x2d, 0x05, 0x91, 0x95, 0x68, 0xc2, 0x72, 0x98, 0x23, 0x48, 0x8b, 0x05, 0x0a, 0x0a, 0x66, + 0xf3, 0x14, 0x94, 0xb2, 0x0a, 0xfe, 0x86, 0xf5, 0x0c, 0xcb, 0x38, 0x01, 0xc5, 0x2d, 0x73, 0x1d, + 0x02, 0xb2, 0x2d, 0xf1, 0x5e, 0x82, 0xa5, 0x26, 0xb1, 0x76, 0x6d, 0xdd, 0xb5, 0x22, 0xf4, 0x2f, + 0x10, 0x10, 0xdc, 0x35, 0x2e, 0x0e, 0x52, 0x27, 0x54, 0x71, 0x71, 0x10, 0xa9, 0x53, 0xe0, 0xaf, + 0xb4, 0x02, 0x2e, 0xee, 0xc1, 0xa8, 0x02, 0xa5, 0x26, 0xb1, 0xe4, 0x43, 0xa8, 0xc4, 0xef, 0x60, + 0xad, 0x3e, 0xf6, 0xbd, 0xac, 0x0b, 0xef, 0x85, 0x7a, 0xb7, 0x18, 0x13, 0xbf, 0x29, 0x47, 0x00, + 0xc2, 0xdb, 0x71, 0x73, 0xf2, 0xcc, 0x04, 0xa5, 0xde, 0x9f, 0x06, 0x15, 0x33, 0xbc, 0x85, 0x79, + 0x7e, 0xc1, 0xdf, 0xc8, 0x17, 0xb6, 0x87, 0x43, 0x75, 0xab, 0x10, 0x22, 0x4a, 0x17, 0x6e, 0xfa, + 0x1c, 0xe9, 0x09, 0x2a, 0x4f, 0xfa, 0xe5, 0x3b, 0x5d, 0x76, 0x60, 0x31, 0x7d, 0x9f, 0x6f, 0x4e, + 0x9e, 0x9e, 0x02, 0xaa, 0x8d, 0x29, 0x81, 0x31, 0x55, 0x1f, 0xfe, 0xb8, 0x7c, 0xef, 0xde, 0xcb, + 0x31, 0x23, 0x0b, 0x56, 0x77, 0x7e, 0x02, 0x9c, 0x39, 0x7e, 0xde, 0xfc, 0xf9, 0xc7, 0xcf, 0x50, + 0x05, 0xc7, 0x9f, 0x69, 0xf1, 0xc4, 0x43, 0x4e, 0x52, 0xe8, 0x21, 0xe7, 0x69, 0x4c, 0x09, 0x8c, + 0xa9, 0x8e, 0xe1, 0xf7, 0xd4, 0x5d, 0x76, 0x3b, 0x6f, 0x81, 0x04, 0xa7, 0xd6, 0xa7, 0xc3, 0x5d, + 0xe2, 0xe1, 0x55, 0x51, 0xc4, 0xc3, 0x8b, 0xa2, 0x3e, 0x1d, 0x2e, 0xe6, 0x31, 0x60, 0x41, 0xbc, + 0x98, 0x6e, 0x4d, 0x9e, 0x2e, 0xc0, 0xd4, 0xed, 0xa9, 0x60, 0x9c, 0xe4, 0x71, 0xf3, 0xcb, 0x48, + 0x93, 0xce, 0x47, 0x9a, 0xf4, 0x6d, 0xa4, 0x49, 0x9f, 0x2e, 0xb4, 0x99, 0xf3, 0x0b, 0x6d, 0xe6, + 0xeb, 0x85, 0x36, 0x73, 0xb8, 0x63, 0x39, 0xd4, 0xee, 0xb7, 0xeb, 0x86, 0x77, 0xd2, 0x78, 0xa7, + 0x1b, 0x1d, 0xbd, 0xfb, 0x42, 0x6f, 0x93, 0x46, 0xb4, 0xfa, 0x76, 0xf4, 0x3f, 0x7f, 0x26, 0xfc, + 0xd1, 0x0f, 0x7b, 0x48, 0xda, 0x73, 0xe1, 0x5f, 0xfd, 0xce, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xe9, 0x77, 0x6a, 0x76, 0xf7, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1287,7 +1287,7 @@ type MsgClient interface { PostKey(ctx context.Context, in *MsgPostKey, opts ...grpc.CallOption) (*MsgPostKeyResponse, error) DeleteFile(ctx context.Context, in *MsgDeleteFile, opts ...grpc.CallOption) (*MsgDeleteFileResponse, error) RemoveViewers(ctx context.Context, in *MsgRemoveViewers, opts ...grpc.CallOption) (*MsgRemoveViewersResponse, error) - MakeRootV2(ctx context.Context, in *MsgMakeRootV2, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) + ProvisionFileTree(ctx context.Context, in *MsgProvisionFileTree, opts ...grpc.CallOption) (*MsgProvisionFileTreeResponse, error) AddEditors(ctx context.Context, in *MsgAddEditors, opts ...grpc.CallOption) (*MsgAddEditorsResponse, error) RemoveEditors(ctx context.Context, in *MsgRemoveEditors, opts ...grpc.CallOption) (*MsgRemoveEditorsResponse, error) ResetEditors(ctx context.Context, in *MsgResetEditors, opts ...grpc.CallOption) (*MsgResetEditorsResponse, error) @@ -1348,9 +1348,9 @@ func (c *msgClient) RemoveViewers(ctx context.Context, in *MsgRemoveViewers, opt return out, nil } -func (c *msgClient) MakeRootV2(ctx context.Context, in *MsgMakeRootV2, opts ...grpc.CallOption) (*MsgMakeRootResponse, error) { - out := new(MsgMakeRootResponse) - err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/MakeRootV2", in, out, opts...) +func (c *msgClient) ProvisionFileTree(ctx context.Context, in *MsgProvisionFileTree, opts ...grpc.CallOption) (*MsgProvisionFileTreeResponse, error) { + out := new(MsgProvisionFileTreeResponse) + err := c.cc.Invoke(ctx, "/canine_chain.filetree.Msg/ProvisionFileTree", in, out, opts...) if err != nil { return nil, err } @@ -1409,7 +1409,7 @@ type MsgServer interface { PostKey(context.Context, *MsgPostKey) (*MsgPostKeyResponse, error) DeleteFile(context.Context, *MsgDeleteFile) (*MsgDeleteFileResponse, error) RemoveViewers(context.Context, *MsgRemoveViewers) (*MsgRemoveViewersResponse, error) - MakeRootV2(context.Context, *MsgMakeRootV2) (*MsgMakeRootResponse, error) + ProvisionFileTree(context.Context, *MsgProvisionFileTree) (*MsgProvisionFileTreeResponse, error) AddEditors(context.Context, *MsgAddEditors) (*MsgAddEditorsResponse, error) RemoveEditors(context.Context, *MsgRemoveEditors) (*MsgRemoveEditorsResponse, error) ResetEditors(context.Context, *MsgResetEditors) (*MsgResetEditorsResponse, error) @@ -1436,8 +1436,8 @@ func (*UnimplementedMsgServer) DeleteFile(ctx context.Context, req *MsgDeleteFil func (*UnimplementedMsgServer) RemoveViewers(ctx context.Context, req *MsgRemoveViewers) (*MsgRemoveViewersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveViewers not implemented") } -func (*UnimplementedMsgServer) MakeRootV2(ctx context.Context, req *MsgMakeRootV2) (*MsgMakeRootResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method MakeRootV2 not implemented") +func (*UnimplementedMsgServer) ProvisionFileTree(ctx context.Context, req *MsgProvisionFileTree) (*MsgProvisionFileTreeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ProvisionFileTree not implemented") } func (*UnimplementedMsgServer) AddEditors(ctx context.Context, req *MsgAddEditors) (*MsgAddEditorsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AddEditors not implemented") @@ -1549,20 +1549,20 @@ func _Msg_RemoveViewers_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Msg_MakeRootV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgMakeRootV2) +func _Msg_ProvisionFileTree_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgProvisionFileTree) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).MakeRootV2(ctx, in) + return srv.(MsgServer).ProvisionFileTree(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/canine_chain.filetree.Msg/MakeRootV2", + FullMethod: "/canine_chain.filetree.Msg/ProvisionFileTree", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).MakeRootV2(ctx, req.(*MsgMakeRootV2)) + return srv.(MsgServer).ProvisionFileTree(ctx, req.(*MsgProvisionFileTree)) } return interceptor(ctx, in, info, handler) } @@ -1682,8 +1682,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_RemoveViewers_Handler, }, { - MethodName: "MakeRootV2", - Handler: _Msg_MakeRootV2_Handler, + MethodName: "ProvisionFileTree", + Handler: _Msg_ProvisionFileTree_Handler, }, { MethodName: "AddEditors", @@ -2101,7 +2101,7 @@ func (m *MsgRemoveViewersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *MsgMakeRootResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgProvisionFileTreeResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2111,12 +2111,12 @@ func (m *MsgMakeRootResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgMakeRootResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgProvisionFileTreeResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgMakeRootResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgProvisionFileTreeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2124,7 +2124,7 @@ func (m *MsgMakeRootResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgMakeRootV2) Marshal() (dAtA []byte, err error) { +func (m *MsgProvisionFileTree) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2134,12 +2134,12 @@ func (m *MsgMakeRootV2) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgMakeRootV2) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgProvisionFileTree) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgMakeRootV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgProvisionFileTree) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2731,7 +2731,7 @@ func (m *MsgRemoveViewersResponse) Size() (n int) { return n } -func (m *MsgMakeRootResponse) Size() (n int) { +func (m *MsgProvisionFileTreeResponse) Size() (n int) { if m == nil { return 0 } @@ -2740,7 +2740,7 @@ func (m *MsgMakeRootResponse) Size() (n int) { return n } -func (m *MsgMakeRootV2) Size() (n int) { +func (m *MsgProvisionFileTree) Size() (n int) { if m == nil { return 0 } @@ -4173,7 +4173,7 @@ func (m *MsgRemoveViewersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgMakeRootResponse) Unmarshal(dAtA []byte) error { +func (m *MsgProvisionFileTreeResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4196,10 +4196,10 @@ func (m *MsgMakeRootResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgMakeRootResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgProvisionFileTreeResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgMakeRootResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgProvisionFileTreeResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -4223,7 +4223,7 @@ func (m *MsgMakeRootResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgMakeRootV2) Unmarshal(dAtA []byte) error { +func (m *MsgProvisionFileTree) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4246,10 +4246,10 @@ func (m *MsgMakeRootV2) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgMakeRootV2: wiretype end group for non-group") + return fmt.Errorf("proto: MsgProvisionFileTree: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgMakeRootV2: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgProvisionFileTree: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: From 97430e98d09baf48aea2be343f503db4a10a3070 Mon Sep 17 00:00:00 2001 From: marston Date: Tue, 14 Nov 2023 11:41:02 -0500 Subject: [PATCH 14/14] erin suggestions again :p --- proto/canine_chain/filetree/query.proto | 4 +- proto/canine_chain/rns/query.proto | 8 +- proto/canine_chain/storage/query.proto | 29 +- x/filetree/types/query.pb.go | 86 +- x/filetree/types/query.pb.gw.go | 4 +- x/rns/client/cli/query_bids.go | 2 +- x/rns/client/cli/query_names.go | 2 +- x/rns/keeper/bidding_test.go | 6 +- x/rns/keeper/grpc_query_bids.go | 2 +- x/rns/keeper/grpc_query_names.go | 2 +- x/rns/keeper/keeper_test.go | 10 +- x/rns/keeper/register_test.go | 2 +- x/rns/keeper/transfer_test.go | 2 +- x/rns/types/query.pb.go | 161 ++-- x/rns/types/query.pb.gw.go | 36 +- x/storage/keeper/grpc_query_active_deals.go | 31 +- x/storage/types/query.pb.go | 861 ++++++++++++++++---- x/storage/types/query.pb.gw.go | 204 ++++- 18 files changed, 1102 insertions(+), 350 deletions(-) diff --git a/proto/canine_chain/filetree/query.proto b/proto/canine_chain/filetree/query.proto index dfef7ec35..8b9413310 100644 --- a/proto/canine_chain/filetree/query.proto +++ b/proto/canine_chain/filetree/query.proto @@ -31,12 +31,12 @@ service Query { // Queries a Pubkey by index. rpc PubKey(QueryPubKey) returns (QueryPubKeyResponse) { option (google.api.http).get = - "/jackal/canine-chain/filetree/pubkeys/{address}"; + "/jackal/canine-chain/filetree/pub_keys/{address}"; } // Queries a list of Pubkey items. rpc AllPubKeys(QueryAllPubKeys) returns (QueryAllPubKeysResponse) { - option (google.api.http).get = "/jackal/canine-chain/filetree/pubkeys"; + option (google.api.http).get = "/jackal/canine-chain/filetree/pub_keys"; } } diff --git a/proto/canine_chain/rns/query.proto b/proto/canine_chain/rns/query.proto index 49f3a26b0..b7317562d 100644 --- a/proto/canine_chain/rns/query.proto +++ b/proto/canine_chain/rns/query.proto @@ -22,7 +22,7 @@ service Query { // Queries a Name by index. rpc Name(QueryName) returns (QueryNameResponse) { - option (google.api.http).get = "/jackal/canine-chain/rns/names/{index}"; + option (google.api.http).get = "/jackal/canine-chain/rns/names/{name}"; } // Queries a list of Names. @@ -32,7 +32,7 @@ service Query { // Queries a Bid by index. rpc Bid(QueryBid) returns (QueryBidResponse) { - option (google.api.http).get = "/jackal/canine-chain/rns/bids/{index}"; + option (google.api.http).get = "/jackal/canine-chain/rns/bids/{name}"; } // Queries a list of Bids. @@ -79,7 +79,7 @@ message QueryParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } -message QueryName { string index = 1; } +message QueryName { string name = 1; } message QueryNameResponse { Names name = 1 [ (gogoproto.nullable) = false ]; } // TODO: Check if this breaks everything to change it to Name @@ -92,7 +92,7 @@ message QueryAllNamesResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryBid { string index = 1; } +message QueryBid { string name = 1; } message QueryBidResponse { Bids bids = 1 [ (gogoproto.nullable) = false ]; } diff --git a/proto/canine_chain/storage/query.proto b/proto/canine_chain/storage/query.proto index b9a294370..a2c47aad2 100644 --- a/proto/canine_chain/storage/query.proto +++ b/proto/canine_chain/storage/query.proto @@ -38,11 +38,25 @@ service Query { "/jackal/canine-chain/storage/open_files/{provider_address}"; } - // Queries a list of Proofs. + // Queries a Proof. rpc Proof(QueryProof) returns (QueryProofResponse) { option (google.api.http).get = - "/jackal/canine-chain/storage/proof/{provider_address}/{merkle}/{owner}/{start}"; + "/jackal/canine-chain/storage/proofs/{provider_address}/{merkle}/{owner}/{start}"; + } + + // Queries a list of Proofs. + rpc AllProofs(QueryAllProofs) + returns (QueryAllProofsResponse) { + option (google.api.http).get = + "/jackal/canine-chain/storage/proofs"; + } + + // Queries a list of Proofs. + rpc ProofsByAddress(QueryProofsByAddress) + returns (QueryProofsByAddressResponse) { + option (google.api.http).get = + "/jackal/canine-chain/storage/proofs/{provider_address}"; } // Queries a Providers by index. @@ -177,7 +191,16 @@ message QueryProofsByAddress { } message QueryProofsByAddressResponse { - repeated FileProof proof = 1 [ (gogoproto.nullable) = false ]; + repeated FileProof proofs = 1 [ (gogoproto.nullable) = false ]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllProofs { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllProofsResponse { + repeated FileProof proofs = 1 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/x/filetree/types/query.pb.go b/x/filetree/types/query.pb.go index 81763c58e..347169f2c 100644 --- a/x/filetree/types/query.pb.go +++ b/x/filetree/types/query.pb.go @@ -505,49 +505,49 @@ func init() { func init() { proto.RegisterFile("canine_chain/filetree/query.proto", fileDescriptor_f2d116acb9d238bd) } var fileDescriptor_f2d116acb9d238bd = []byte{ - // 660 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x6b, 0xd4, 0x4e, - 0x18, 0xc7, 0x77, 0xfa, 0xf7, 0xd7, 0xe9, 0xaf, 0x88, 0xa3, 0xc5, 0x12, 0x6a, 0x5c, 0xa7, 0x76, - 0xb7, 0x54, 0x9b, 0x61, 0x5b, 0x50, 0x41, 0x45, 0x5a, 0xb0, 0x82, 0x55, 0xa8, 0xf1, 0x20, 0x7a, - 0x59, 0x26, 0xdb, 0x31, 0x8d, 0x9b, 0xcd, 0xa4, 0xf9, 0xa3, 0x2e, 0xa5, 0x20, 0x5e, 0xbd, 0x28, - 0x3d, 0xe9, 0xc9, 0x97, 0xd3, 0x63, 0xc1, 0x8b, 0xa7, 0x22, 0xbb, 0xbe, 0x10, 0xc9, 0x4c, 0x92, - 0x26, 0x65, 0x77, 0xb3, 0x42, 0x6f, 0x49, 0xe6, 0xfb, 0x7c, 0x9f, 0xcf, 0xcc, 0xf3, 0x3c, 0x13, - 0x78, 0xbd, 0x41, 0x1d, 0xcb, 0x61, 0xf5, 0xc6, 0x2e, 0xb5, 0x1c, 0xf2, 0xc6, 0xb2, 0x59, 0xe0, - 0x31, 0x46, 0xf6, 0x42, 0xe6, 0xb5, 0x35, 0xd7, 0xe3, 0x01, 0x47, 0xb3, 0x59, 0x89, 0x96, 0x48, - 0x94, 0xcb, 0x26, 0x37, 0xb9, 0x50, 0x90, 0xe8, 0x49, 0x8a, 0x95, 0x79, 0x93, 0x73, 0xd3, 0x66, - 0x84, 0xba, 0x16, 0xa1, 0x8e, 0xc3, 0x03, 0x1a, 0x58, 0xdc, 0xf1, 0xe3, 0xd5, 0xe5, 0x06, 0xf7, - 0x5b, 0xdc, 0x27, 0x06, 0xf5, 0xe3, 0x1c, 0xe4, 0x5d, 0xcd, 0x60, 0x01, 0xad, 0x11, 0x97, 0x9a, - 0x96, 0x23, 0xc4, 0xb1, 0x16, 0xf7, 0x26, 0x73, 0xa9, 0x47, 0x5b, 0x89, 0x5f, 0x1f, 0xfa, 0xe8, - 0xc1, 0x2f, 0xb0, 0x09, 0x8d, 0x26, 0x8b, 0x77, 0x88, 0x67, 0xe0, 0xf4, 0xf3, 0x08, 0x66, 0x5b, - 0x78, 0x63, 0x1d, 0x5e, 0xca, 0xbc, 0xea, 0xcc, 0x77, 0xb9, 0xe3, 0x33, 0x74, 0x0f, 0x4e, 0xc8, - 0xe4, 0x73, 0xa0, 0x0c, 0x96, 0xa6, 0x57, 0xaf, 0x6a, 0x3d, 0x0f, 0x46, 0x93, 0x61, 0x1b, 0x63, - 0x47, 0x27, 0xd7, 0x4a, 0x7a, 0x1c, 0x82, 0x9f, 0xc0, 0x29, 0xe1, 0xb9, 0x69, 0xd9, 0x0c, 0xcd, - 0xc1, 0x49, 0xba, 0xb3, 0xe3, 0x31, 0x5f, 0x5a, 0x4d, 0xe9, 0xc9, 0x2b, 0x5a, 0x80, 0x33, 0xfc, - 0xbd, 0xc3, 0xbc, 0x7a, 0xb2, 0x3e, 0x22, 0xd6, 0xff, 0x17, 0x1f, 0xd7, 0xe5, 0x37, 0xbc, 0x05, - 0x2f, 0xa6, 0x5e, 0x29, 0xdd, 0x6d, 0x38, 0x16, 0x11, 0xc4, 0x6c, 0xf3, 0x7d, 0xd8, 0xa2, 0x90, - 0x04, 0x4d, 0xe8, 0xf1, 0x4b, 0x38, 0x23, 0xcc, 0xd6, 0x6d, 0x5b, 0x2c, 0xa2, 0x4d, 0x08, 0x4f, - 0x6b, 0x11, 0xdb, 0x55, 0x34, 0x59, 0x38, 0x2d, 0x2a, 0x9c, 0x26, 0x9b, 0x23, 0x2e, 0x9c, 0xb6, - 0x4d, 0x4d, 0xa6, 0xb3, 0xbd, 0x90, 0xf9, 0x81, 0x9e, 0x89, 0xc4, 0xdf, 0x01, 0x9c, 0xcd, 0x39, - 0xa7, 0xa8, 0x77, 0xe1, 0xb8, 0xa8, 0xd0, 0x1c, 0x28, 0x8f, 0x0e, 0xc9, 0x2a, 0x03, 0xd0, 0xe3, - 0x1c, 0xdb, 0x88, 0x60, 0xab, 0x16, 0xb2, 0xc9, 0xb4, 0x39, 0xb8, 0x6a, 0x52, 0xf1, 0xd0, 0xd8, - 0x62, 0xed, 0xfe, 0x05, 0xc1, 0x2f, 0x92, 0x5e, 0x10, 0xc2, 0x74, 0x0b, 0xf7, 0xe1, 0xa4, 0x1b, - 0x1a, 0xf5, 0x26, 0x6b, 0x17, 0x35, 0x83, 0xe8, 0xb3, 0xb4, 0x19, 0x84, 0x0b, 0x7e, 0x05, 0x2f, - 0x24, 0x27, 0x23, 0x7d, 0xcf, 0xef, 0xd4, 0x7f, 0x00, 0x78, 0xe5, 0x8c, 0x77, 0x6f, 0xe8, 0xd1, - 0x7f, 0x84, 0x3e, 0xb7, 0xb3, 0x5f, 0x3d, 0x19, 0x87, 0xe3, 0x02, 0x11, 0x7d, 0x04, 0x70, 0x42, - 0x4e, 0x0b, 0xc2, 0x7d, 0x50, 0x32, 0x83, 0xa8, 0x2c, 0x17, 0x6b, 0x92, 0x84, 0xb8, 0xf2, 0xe9, - 0xe7, 0x9f, 0xc3, 0x91, 0x32, 0x52, 0xc9, 0x5b, 0xda, 0x68, 0x52, 0x9b, 0xc8, 0xd0, 0xb3, 0xf7, - 0x08, 0xfa, 0x06, 0xe0, 0x98, 0x98, 0xc9, 0xf2, 0x20, 0xf3, 0x48, 0xa1, 0x2c, 0x15, 0x29, 0xd2, - 0xe4, 0x8f, 0x44, 0xf2, 0x87, 0xe8, 0x41, 0x3e, 0xf9, 0x4a, 0xaf, 0x6b, 0x8a, 0xec, 0xc7, 0xad, - 0x76, 0x40, 0xf6, 0x73, 0xa3, 0x7f, 0x80, 0x3e, 0x03, 0xf8, 0x5f, 0x3a, 0x96, 0x37, 0x06, 0x65, - 0x4f, 0x54, 0xca, 0xad, 0x61, 0x54, 0x29, 0xe7, 0x4d, 0xc1, 0xb9, 0x88, 0x16, 0x86, 0xe0, 0x44, - 0x5f, 0xa3, 0x62, 0xc9, 0x56, 0x18, 0x5c, 0x2c, 0xa1, 0x29, 0x28, 0x56, 0x6e, 0x9a, 0xf0, 0x1d, - 0xc1, 0x51, 0x43, 0x64, 0x30, 0x87, 0xbc, 0xb3, 0x33, 0x27, 0x86, 0x0e, 0x01, 0x84, 0x99, 0x21, - 0xaa, 0x14, 0xec, 0x3e, 0xd6, 0x29, 0xda, 0x70, 0xba, 0x94, 0x6f, 0x45, 0xf0, 0x55, 0xd1, 0xe2, - 0x50, 0x7c, 0x1b, 0xcf, 0x8e, 0x3a, 0x2a, 0x38, 0xee, 0xa8, 0xe0, 0x77, 0x47, 0x05, 0x5f, 0xba, - 0x6a, 0xe9, 0xb8, 0xab, 0x96, 0x7e, 0x75, 0xd5, 0xd2, 0xeb, 0x35, 0xd3, 0x0a, 0x76, 0x43, 0x43, - 0x6b, 0xf0, 0x56, 0x6c, 0xf5, 0x94, 0x1a, 0x7e, 0xde, 0xee, 0xc3, 0xa9, 0x61, 0xd0, 0x76, 0x99, - 0x6f, 0x4c, 0x88, 0x9f, 0xd4, 0xda, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x0d, 0xa7, 0x03, - 0xab, 0x07, 0x00, 0x00, + // 657 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x6b, 0xd4, 0x40, + 0x18, 0xc7, 0x77, 0xfa, 0x6a, 0xa7, 0x16, 0x71, 0xb4, 0x58, 0x42, 0x8d, 0xeb, 0x54, 0xb7, 0xa5, + 0x6a, 0xc6, 0xb6, 0x20, 0x05, 0x15, 0x69, 0xc1, 0x0a, 0x56, 0xa1, 0xc6, 0x83, 0xe8, 0xa5, 0x4c, + 0xb6, 0x63, 0x1a, 0x9b, 0xcd, 0xa4, 0x79, 0x51, 0x97, 0x52, 0x10, 0xaf, 0x5e, 0x44, 0xbd, 0xe8, + 0xc9, 0x8f, 0xd3, 0x63, 0xc1, 0x8b, 0x27, 0x29, 0xbb, 0x7e, 0x10, 0xc9, 0xcc, 0x24, 0x4d, 0xca, + 0xee, 0x66, 0x85, 0xde, 0x36, 0x99, 0xff, 0xf3, 0x7f, 0x7e, 0xf3, 0xbc, 0x64, 0xe1, 0xd5, 0x3a, + 0xf5, 0x1c, 0x8f, 0x6d, 0xd6, 0xb7, 0xa9, 0xe3, 0x91, 0xd7, 0x8e, 0xcb, 0xa2, 0x80, 0x31, 0xb2, + 0x1b, 0xb3, 0xa0, 0x69, 0xf8, 0x01, 0x8f, 0x38, 0x9a, 0xcc, 0x4b, 0x8c, 0x54, 0xa2, 0x5d, 0xb4, + 0xb9, 0xcd, 0x85, 0x82, 0x24, 0xbf, 0xa4, 0x58, 0x9b, 0xb6, 0x39, 0xb7, 0x5d, 0x46, 0xa8, 0xef, + 0x10, 0xea, 0x79, 0x3c, 0xa2, 0x91, 0xc3, 0xbd, 0x50, 0x9d, 0xce, 0xd7, 0x79, 0xd8, 0xe0, 0x21, + 0xb1, 0x68, 0xa8, 0x72, 0x90, 0xb7, 0x0b, 0x16, 0x8b, 0xe8, 0x02, 0xf1, 0xa9, 0xed, 0x78, 0x42, + 0xac, 0xb4, 0xb8, 0x33, 0x99, 0x4f, 0x03, 0xda, 0x48, 0xfd, 0xba, 0xd0, 0x27, 0x3f, 0xc2, 0x12, + 0x9b, 0xd8, 0xda, 0x61, 0xea, 0x86, 0x78, 0x02, 0x8e, 0x3f, 0x4b, 0x60, 0x36, 0x84, 0x37, 0x36, + 0xe1, 0x85, 0xdc, 0xa3, 0xc9, 0x42, 0x9f, 0x7b, 0x21, 0x43, 0x77, 0xe1, 0x88, 0x4c, 0x3e, 0x05, + 0xaa, 0x60, 0x6e, 0x7c, 0xf1, 0xb2, 0xd1, 0xb1, 0x30, 0x86, 0x0c, 0x5b, 0x1d, 0x3a, 0xf8, 0x73, + 0xa5, 0x62, 0xaa, 0x10, 0xfc, 0x18, 0x8e, 0x09, 0xcf, 0x35, 0xc7, 0x65, 0x68, 0x0a, 0x8e, 0xd2, + 0xad, 0xad, 0x80, 0x85, 0xd2, 0x6a, 0xcc, 0x4c, 0x1f, 0xd1, 0x0c, 0x9c, 0xe0, 0xef, 0x3c, 0x16, + 0x6c, 0xa6, 0xe7, 0x03, 0xe2, 0xfc, 0xac, 0x78, 0xb9, 0x22, 0xdf, 0xe1, 0x75, 0x78, 0x3e, 0xf3, + 0xca, 0xe8, 0xee, 0xc0, 0xa1, 0x84, 0x40, 0xb1, 0x4d, 0x77, 0x61, 0x4b, 0x42, 0x52, 0x34, 0xa1, + 0xc7, 0x2f, 0xe0, 0x84, 0x30, 0x5b, 0x71, 0x5d, 0x71, 0x88, 0xd6, 0x20, 0x3c, 0xee, 0x85, 0xb2, + 0xab, 0x19, 0xb2, 0x71, 0x46, 0xd2, 0x38, 0x43, 0x0e, 0x87, 0x6a, 0x9c, 0xb1, 0x41, 0x6d, 0x66, + 0xb2, 0xdd, 0x98, 0x85, 0x91, 0x99, 0x8b, 0xc4, 0x3f, 0x00, 0x9c, 0x2c, 0x38, 0x67, 0xa8, 0xcb, + 0x70, 0x58, 0x74, 0x68, 0x0a, 0x54, 0x07, 0xfb, 0x64, 0x95, 0x01, 0xe8, 0x51, 0x81, 0x6d, 0x40, + 0xb0, 0xcd, 0x96, 0xb2, 0xc9, 0xb4, 0x05, 0xb8, 0xd9, 0xb4, 0xe3, 0xb1, 0xb5, 0xce, 0x9a, 0xdd, + 0x1b, 0x82, 0x9f, 0xa7, 0xb3, 0x20, 0x84, 0xd9, 0x15, 0xee, 0xc1, 0x51, 0x3f, 0xb6, 0x36, 0x77, + 0x58, 0xb3, 0x6c, 0x18, 0xc4, 0x9c, 0x65, 0xc3, 0x20, 0x5c, 0xf0, 0x4b, 0x78, 0x2e, 0xad, 0x8c, + 0xf4, 0x3d, 0xbd, 0xaa, 0xff, 0x04, 0xf0, 0xd2, 0x09, 0xef, 0xce, 0xd0, 0x83, 0xff, 0x09, 0x7d, + 0x6a, 0xb5, 0x5f, 0x3c, 0x1a, 0x86, 0xc3, 0x02, 0x11, 0x7d, 0x00, 0x70, 0x44, 0x6e, 0x0b, 0xc2, + 0x5d, 0x50, 0x72, 0x8b, 0xa8, 0xcd, 0x97, 0x6b, 0xd2, 0x84, 0xb8, 0xf6, 0xf1, 0xd7, 0xdf, 0xaf, + 0x03, 0x55, 0xa4, 0x93, 0x37, 0xb4, 0xbe, 0x43, 0x5d, 0x22, 0x43, 0x4f, 0x7e, 0x47, 0xd0, 0x77, + 0x00, 0x87, 0xc4, 0x4e, 0x56, 0x7b, 0x99, 0x27, 0x0a, 0x6d, 0xae, 0x4c, 0x91, 0x25, 0x7f, 0x28, + 0x92, 0x3f, 0x40, 0xf7, 0x8b, 0xc9, 0x6f, 0x75, 0xfa, 0x4c, 0x91, 0x3d, 0x35, 0x6a, 0xfb, 0x64, + 0xaf, 0xb0, 0xfa, 0xfb, 0xe8, 0x13, 0x80, 0x67, 0xb2, 0xb5, 0xbc, 0xd6, 0x2b, 0x7b, 0xaa, 0xd2, + 0x6e, 0xf6, 0xa3, 0xca, 0x38, 0x6f, 0x08, 0xce, 0xeb, 0x68, 0xa6, 0x0f, 0x4e, 0xf4, 0x25, 0x69, + 0x96, 0x1c, 0x85, 0xde, 0xcd, 0x12, 0x9a, 0x92, 0x66, 0x15, 0xb6, 0x09, 0x2f, 0x0b, 0x8e, 0x45, + 0x74, 0xbb, 0x37, 0x87, 0x1a, 0xde, 0x5c, 0xc9, 0xd0, 0x37, 0x00, 0x61, 0x6e, 0x8b, 0x6a, 0x25, + 0xd7, 0x57, 0x3a, 0xcd, 0xe8, 0x4f, 0x97, 0x01, 0x1a, 0x02, 0x70, 0x0e, 0xd5, 0xfa, 0x03, 0x5c, + 0x7d, 0x7a, 0xd0, 0xd2, 0xc1, 0x61, 0x4b, 0x07, 0x47, 0x2d, 0x1d, 0x7c, 0x6e, 0xeb, 0x95, 0xc3, + 0xb6, 0x5e, 0xf9, 0xdd, 0xd6, 0x2b, 0xaf, 0x96, 0x6c, 0x27, 0xda, 0x8e, 0x2d, 0xa3, 0xce, 0x1b, + 0xca, 0xeb, 0x09, 0xb5, 0xc2, 0xa2, 0xdf, 0xfb, 0x63, 0xc7, 0xa8, 0xe9, 0xb3, 0xd0, 0x1a, 0x11, + 0x7f, 0x53, 0x4b, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xca, 0x86, 0xf8, 0x0c, 0xad, 0x07, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/filetree/types/query.pb.gw.go b/x/filetree/types/query.pb.gw.go index e0c12b404..0f498972a 100644 --- a/x/filetree/types/query.pb.gw.go +++ b/x/filetree/types/query.pb.gw.go @@ -525,9 +525,9 @@ var ( pattern_Query_AllFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "filetree", "files"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_PubKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "filetree", "pubkeys", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PubKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "filetree", "pub_keys", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AllPubKeys_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "filetree", "pubkeys"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllPubKeys_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "filetree", "pub_keys"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/rns/client/cli/query_bids.go b/x/rns/client/cli/query_bids.go index 03cffa827..cb6c5c35e 100644 --- a/x/rns/client/cli/query_bids.go +++ b/x/rns/client/cli/query_bids.go @@ -55,7 +55,7 @@ func CmdShowBids() *cobra.Command { argIndex := args[0] params := &types.QueryBid{ - Index: argIndex, + Name: argIndex, } res, err := queryClient.Bid(context.Background(), params) diff --git a/x/rns/client/cli/query_names.go b/x/rns/client/cli/query_names.go index ce0c6c036..c4d41187e 100644 --- a/x/rns/client/cli/query_names.go +++ b/x/rns/client/cli/query_names.go @@ -55,7 +55,7 @@ func CmdShowNames() *cobra.Command { argIndex := args[0] params := &types.QueryName{ - Index: argIndex, + Name: argIndex, } res, err := queryClient.Name(context.Background(), params) diff --git a/x/rns/keeper/bidding_test.go b/x/rns/keeper/bidding_test.go index aa6954aba..de7802d1d 100644 --- a/x/rns/keeper/bidding_test.go +++ b/x/rns/keeper/bidding_test.go @@ -65,7 +65,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptBid() { suite.Require().Equal(eamt.Int64(), biddee) // cost them the amount they bid nameReq := types.QueryName{ - Index: TestName, + Name: TestName, } res, err := suite.queryClient.Name(suite.ctx.Context(), &nameReq) @@ -97,7 +97,7 @@ func (suite *KeeperTestSuite) TestMsgMakeBid() { suite.Require().NoError(err) bidReq := types.QueryBid{ - Index: fmt.Sprintf("%s%s", address.String(), TestName), + Name: fmt.Sprintf("%s%s", address.String(), TestName), } afterbal := suite.bankKeeper.GetAllBalances(suite.ctx, address) @@ -135,7 +135,7 @@ func (suite *KeeperTestSuite) TestMsgCancelBid() { suite.Require().NoError(err) bidReq := types.QueryBid{ - Index: fmt.Sprintf("%s%s", address.String(), TestName), + Name: fmt.Sprintf("%s%s", address.String(), TestName), } afterbal := suite.bankKeeper.GetAllBalances(suite.ctx, address) diff --git a/x/rns/keeper/grpc_query_bids.go b/x/rns/keeper/grpc_query_bids.go index dc7d67210..d86ee5b45 100644 --- a/x/rns/keeper/grpc_query_bids.go +++ b/x/rns/keeper/grpc_query_bids.go @@ -46,7 +46,7 @@ func (k Keeper) Bid(c context.Context, req *types.QueryBid) (*types.QueryBidResp val, found := k.GetBids( ctx, - req.Index, + req.Name, ) if !found { return nil, status.Error(codes.NotFound, "not found") diff --git a/x/rns/keeper/grpc_query_names.go b/x/rns/keeper/grpc_query_names.go index 5bf7c449d..e788dd8d2 100644 --- a/x/rns/keeper/grpc_query_names.go +++ b/x/rns/keeper/grpc_query_names.go @@ -44,7 +44,7 @@ func (k Keeper) Name(c context.Context, req *types.QueryName) (*types.QueryNameR } ctx := sdk.UnwrapSDKContext(c) - n, tld, err := GetNameAndTLD(req.Index) + n, tld, err := GetNameAndTLD(req.Name) if err != nil { return nil, err } diff --git a/x/rns/keeper/keeper_test.go b/x/rns/keeper/keeper_test.go index 412c2105c..a992bc891 100644 --- a/x/rns/keeper/keeper_test.go +++ b/x/rns/keeper/keeper_test.go @@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) TestMakeBid() { suite.rnsKeeper.SetBids(suite.ctx, bid) bidReq := types.QueryBid{ - Index: fmt.Sprintf("%s%s", address.String(), name), + Name: fmt.Sprintf("%s%s", address.String(), name), } _, err = suite.queryClient.Bid(suite.ctx.Context(), &bidReq) @@ -138,7 +138,7 @@ func (suite *KeeperTestSuite) TestUpdateName() { suite.rnsKeeper.SetNames(suite.ctx, name) nameReq := types.QueryName{ - Index: "validname.jkl", + Name: "validname.jkl", } _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) @@ -177,7 +177,7 @@ func (suite *KeeperTestSuite) TestRemoveName() { suite.rnsKeeper.SetNames(suite.ctx, name) nameReq := types.QueryName{ - Index: "validname.jkl", + Name: "validname.jkl", } _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) @@ -213,7 +213,7 @@ func (suite *KeeperTestSuite) TestSetName() { suite.rnsKeeper.SetNames(suite.ctx, name) nameReq := types.QueryName{ - Index: "validname.jkl", + Name: "validname.jkl", } _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) @@ -231,7 +231,7 @@ func (suite *KeeperTestSuite) TestSetName() { suite.rnsKeeper.SetNames(suite.ctx, badname) nameReq = types.QueryName{ - Index: "badname.jkl", + Name: "badname.jkl", } _, err = suite.queryClient.Name(suite.ctx.Context(), &nameReq) suite.Require().Error(err) diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go index e8b9f0988..a8d2bc1e8 100644 --- a/x/rns/keeper/register_test.go +++ b/x/rns/keeper/register_test.go @@ -39,7 +39,7 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { suite.Require().NoError(err) nameReq := types.QueryName{ - Index: name, + Name: name, } afterbal := suite.bankKeeper.GetAllBalances(suite.ctx, address) diff --git a/x/rns/keeper/transfer_test.go b/x/rns/keeper/transfer_test.go index 88a1feb5e..9e9e4b698 100644 --- a/x/rns/keeper/transfer_test.go +++ b/x/rns/keeper/transfer_test.go @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestMsgTransfer() { suite.Require().NoError(err) nameReq := types.QueryName{ - Index: name, + Name: name, } afterbal := suite.bankKeeper.GetAllBalances(suite.ctx, address) diff --git a/x/rns/types/query.pb.go b/x/rns/types/query.pb.go index a9b3763ed..893970e4c 100644 --- a/x/rns/types/query.pb.go +++ b/x/rns/types/query.pb.go @@ -114,7 +114,7 @@ func (m *QueryParamsResponse) GetParams() Params { } type QueryName struct { - Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } func (m *QueryName) Reset() { *m = QueryName{} } @@ -150,9 +150,9 @@ func (m *QueryName) XXX_DiscardUnknown() { var xxx_messageInfo_QueryName proto.InternalMessageInfo -func (m *QueryName) GetIndex() string { +func (m *QueryName) GetName() string { if m != nil { - return m.Index + return m.Name } return "" } @@ -298,7 +298,7 @@ func (m *QueryAllNamesResponse) GetPagination() *query.PageResponse { } type QueryBid struct { - Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } func (m *QueryBid) Reset() { *m = QueryBid{} } @@ -334,9 +334,9 @@ func (m *QueryBid) XXX_DiscardUnknown() { var xxx_messageInfo_QueryBid proto.InternalMessageInfo -func (m *QueryBid) GetIndex() string { +func (m *QueryBid) GetName() string { if m != nil { - return m.Index + return m.Name } return "" } @@ -979,67 +979,66 @@ func init() { func init() { proto.RegisterFile("canine_chain/rns/query.proto", fileDescriptor_8561b6b36d651aba) } var fileDescriptor_8561b6b36d651aba = []byte{ - // 951 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x4f, 0x24, 0x45, - 0x18, 0xa5, 0x61, 0xf8, 0xf5, 0xad, 0xab, 0x6b, 0x89, 0x2e, 0x36, 0x4b, 0x03, 0xbd, 0x81, 0x81, - 0x4d, 0xe8, 0x5e, 0x96, 0xe8, 0x41, 0x4f, 0x4e, 0x0c, 0x6a, 0xb2, 0xea, 0x3a, 0x26, 0x1a, 0xbd, - 0x90, 0x9a, 0x99, 0x62, 0x28, 0x9d, 0xe9, 0x9a, 0xed, 0x6a, 0x04, 0x82, 0x5c, 0x34, 0xde, 0xd5, - 0xf5, 0x66, 0xe2, 0xc5, 0x7f, 0x66, 0x8f, 0x9b, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, 0x98, 0xfa, - 0xaa, 0xaa, 0xed, 0x99, 0xa6, 0x86, 0x71, 0x33, 0x37, 0x3a, 0xef, 0xf5, 0xf7, 0x5e, 0xbd, 0xfe, - 0xe6, 0x55, 0x80, 0x3b, 0x4d, 0x9a, 0xf0, 0x84, 0xed, 0x37, 0x0f, 0x29, 0x4f, 0xe2, 0x34, 0x91, - 0xf1, 0xe3, 0x23, 0x96, 0x9e, 0x46, 0xbd, 0x54, 0x64, 0x82, 0xdc, 0x2a, 0xa2, 0x51, 0x9a, 0x48, - 0x7f, 0xa1, 0x2d, 0xda, 0x02, 0xc1, 0x58, 0xfd, 0xa5, 0x79, 0xfe, 0x9d, 0xb6, 0x10, 0xed, 0x0e, - 0x8b, 0x69, 0x8f, 0xc7, 0x34, 0x49, 0x44, 0x46, 0x33, 0x2e, 0x12, 0x69, 0xd0, 0x7b, 0x4d, 0x21, - 0xbb, 0x42, 0xc6, 0x0d, 0x2a, 0x99, 0x1e, 0x1f, 0x7f, 0xb3, 0xd3, 0x60, 0x19, 0xdd, 0x89, 0x7b, - 0xb4, 0xcd, 0x13, 0x24, 0x1b, 0xee, 0x72, 0xc9, 0x4f, 0x8f, 0xa6, 0xb4, 0x6b, 0x47, 0x95, 0xed, - 0x1e, 0x1f, 0x0a, 0xee, 0x46, 0x13, 0xda, 0x65, 0x16, 0x5d, 0x2a, 0xa1, 0x0d, 0xde, 0xb2, 0x60, - 0x50, 0x02, 0x0f, 0x44, 0x2a, 0x69, 0x87, 0x39, 0x5f, 0xe6, 0x09, 0xcf, 0x34, 0x18, 0xde, 0x84, - 0x1b, 0x9f, 0xa8, 0x63, 0x3d, 0x42, 0xab, 0xe1, 0x87, 0xf0, 0x4a, 0xe1, 0xb1, 0xce, 0x64, 0x4f, - 0x24, 0x92, 0x91, 0x37, 0x61, 0x46, 0x9f, 0x65, 0xd1, 0x5b, 0xf5, 0x36, 0x6f, 0x3c, 0x58, 0x8c, - 0x06, 0xd3, 0x8d, 0xf4, 0x1b, 0xb5, 0xca, 0xd3, 0xbf, 0x56, 0x26, 0xea, 0x86, 0x1d, 0xae, 0xc1, - 0x3c, 0x8e, 0xfb, 0x88, 0x76, 0x19, 0x59, 0x80, 0x69, 0x9e, 0xb4, 0xd8, 0x09, 0xce, 0x98, 0xaf, - 0xeb, 0x87, 0x70, 0x0f, 0x5e, 0xce, 0x29, 0xb9, 0xde, 0x0e, 0x54, 0xd4, 0xf1, 0x8d, 0xda, 0xed, - 0xb2, 0x9a, 0x62, 0x5b, 0x31, 0xa4, 0x86, 0x9f, 0xc3, 0x4d, 0x9c, 0xf3, 0x4e, 0xa7, 0x83, 0x20, - 0xd9, 0x03, 0xf8, 0xef, 0x13, 0x99, 0x49, 0x1b, 0x91, 0xfe, 0x9e, 0x91, 0xfa, 0x9e, 0x91, 0x5e, - 0x17, 0xf3, 0x3d, 0xa3, 0x47, 0xb4, 0xcd, 0xea, 0xec, 0xf1, 0x11, 0x93, 0x59, 0xbd, 0xf0, 0x66, - 0xf8, 0xc4, 0x83, 0x57, 0xfb, 0x26, 0x5f, 0xe1, 0x72, 0x6a, 0x44, 0x97, 0xe4, 0xbd, 0x3e, 0x53, - 0x93, 0x68, 0xaa, 0x7a, 0xad, 0x29, 0xad, 0xd7, 0xe7, 0x6a, 0x15, 0xe6, 0xd0, 0x54, 0x8d, 0xb7, - 0x1c, 0xc1, 0xbe, 0x0b, 0xb7, 0x2c, 0x23, 0x77, 0x7c, 0x1f, 0x2a, 0x6a, 0x71, 0x4c, 0x1a, 0xaf, - 0x95, 0x1d, 0xd7, 0x78, 0x2b, 0x37, 0xac, 0x98, 0xe1, 0x67, 0xf0, 0x82, 0x3d, 0xbc, 0xc2, 0xc6, - 0x96, 0xea, 0x4f, 0x1e, 0x2c, 0x14, 0x07, 0x5f, 0x61, 0x71, 0x6a, 0x34, 0x8b, 0xe3, 0xcb, 0x34, - 0x34, 0x67, 0xdd, 0x13, 0xe9, 0xa7, 0xb4, 0xc3, 0x08, 0x29, 0x6c, 0xe1, 0xbc, 0x59, 0xb3, 0xba, - 0xb1, 0x6d, 0x38, 0xb9, 0xed, 0xb7, 0x60, 0xee, 0x40, 0xa4, 0xfb, 0xea, 0x67, 0x67, 0x52, 0x79, - 0xbd, 0x6c, 0x7d, 0x4f, 0xff, 0x2e, 0x8d, 0xfb, 0xd9, 0x03, 0x3d, 0x23, 0xfc, 0x02, 0x5e, 0xb2, - 0x51, 0x58, 0xe9, 0x71, 0xc5, 0xfc, 0x9b, 0x07, 0xb7, 0x07, 0x66, 0x3b, 0x2c, 0x4f, 0xfd, 0x1f, - 0xcb, 0xe3, 0xcb, 0x7c, 0xdd, 0x34, 0xc4, 0x07, 0x09, 0xcf, 0xc8, 0x22, 0xcc, 0xd2, 0x56, 0x2b, - 0x65, 0x52, 0x9a, 0xcc, 0xed, 0x63, 0x58, 0x35, 0x2d, 0xa1, 0x68, 0xf9, 0x01, 0x08, 0x54, 0x54, - 0x93, 0x21, 0x77, 0xae, 0x8e, 0x7f, 0x17, 0x6b, 0x40, 0x71, 0xc7, 0xb7, 0xb0, 0x3f, 0x17, 0x6a, - 0x00, 0x27, 0x17, 0x37, 0xd6, 0xd8, 0x70, 0x6c, 0xac, 0xa2, 0xdb, 0x8d, 0x55, 0xcc, 0xf1, 0xa5, - 0x77, 0x6c, 0xea, 0xfa, 0x21, 0x97, 0xd9, 0xc7, 0xc7, 0x09, 0x6b, 0xe9, 0xea, 0x73, 0xe6, 0x38, - 0x90, 0xc6, 0xe4, 0x73, 0xa7, 0xf1, 0xab, 0x07, 0x4b, 0x57, 0x28, 0xe7, 0x99, 0xec, 0xc2, 0x34, - 0xde, 0x5f, 0xa3, 0x75, 0xa3, 0xe6, 0x8e, 0x2d, 0x96, 0x07, 0xbf, 0x00, 0x4c, 0xa3, 0x3b, 0x72, - 0x0c, 0x33, 0xfa, 0x62, 0x22, 0xcb, 0x65, 0x0b, 0x85, 0x9b, 0xce, 0x5f, 0x1f, 0x0a, 0x5b, 0x95, - 0xb0, 0xfa, 0xdd, 0x1f, 0xff, 0x3c, 0x99, 0x5c, 0x23, 0x2b, 0xf1, 0x57, 0xb4, 0xf9, 0x35, 0xed, - 0xc4, 0xfa, 0xad, 0xed, 0xc1, 0x3b, 0x9f, 0x9c, 0x40, 0x05, 0x2f, 0xbd, 0x25, 0xc7, 0x5c, 0x05, - 0xfa, 0x77, 0x87, 0x80, 0xb9, 0x64, 0x84, 0x92, 0x9b, 0x64, 0xc3, 0x29, 0x89, 0xe9, 0xc5, 0x67, - 0x58, 0xfb, 0xe7, 0xe4, 0x5b, 0x98, 0xcb, 0xef, 0xc0, 0x15, 0x87, 0x80, 0x25, 0xf8, 0xd5, 0x6b, - 0x08, 0xb9, 0x8b, 0x0d, 0x74, 0xb1, 0x4a, 0x82, 0xe1, 0x2e, 0x48, 0x06, 0x53, 0xea, 0x4a, 0xf2, - 0x1d, 0x73, 0x6b, 0xbc, 0xe5, 0x87, 0x6e, 0x2c, 0x97, 0xdb, 0x46, 0xb9, 0x2a, 0x59, 0x77, 0xca, - 0xa9, 0xea, 0xcf, 0xcf, 0x7c, 0x02, 0xb3, 0xf6, 0x82, 0x0a, 0xdc, 0x27, 0x52, 0xb8, 0xbf, 0x31, - 0x1c, 0xcf, 0x1d, 0xac, 0xa3, 0x83, 0x15, 0xb2, 0x3c, 0xd4, 0x01, 0xf9, 0xde, 0x83, 0x59, 0x5b, - 0xda, 0x2e, 0x69, 0x83, 0x3b, 0xa5, 0x07, 0x8a, 0x39, 0xbc, 0x8f, 0xd2, 0xf7, 0xc8, 0xa6, 0x53, - 0xda, 0xf6, 0x76, 0x7c, 0xa6, 0x52, 0x3f, 0x27, 0x3f, 0x78, 0x00, 0x85, 0xdb, 0x63, 0xcd, 0x7d, - 0x46, 0xeb, 0x65, 0xeb, 0x5a, 0x4a, 0x6e, 0x67, 0x0b, 0xed, 0xdc, 0x25, 0x6b, 0xd7, 0xda, 0x21, - 0xa7, 0x50, 0xc1, 0x22, 0x77, 0x6d, 0xbd, 0x02, 0x9d, 0x5b, 0x5f, 0xec, 0xf6, 0x30, 0x46, 0xd1, - 0x2d, 0x52, 0x75, 0x8a, 0xaa, 0x26, 0x8d, 0xcf, 0x4c, 0xb1, 0x9d, 0x93, 0x33, 0x5c, 0x7b, 0xdd, - 0xf9, 0x43, 0xd6, 0x1e, 0x09, 0xc3, 0xd6, 0xbe, 0xaf, 0xdb, 0x47, 0xd8, 0x02, 0x2c, 0xf4, 0xdf, - 0x3d, 0x78, 0x71, 0xa0, 0x83, 0x5d, 0x85, 0xd2, 0x4f, 0xf3, 0xb7, 0x47, 0xa2, 0xe5, 0x7e, 0xde, - 0x46, 0x3f, 0x6f, 0x90, 0x5d, 0xa7, 0x9f, 0x0e, 0x97, 0xd9, 0xbe, 0x50, 0x6f, 0xee, 0x9b, 0x5e, - 0xb0, 0x11, 0xd5, 0xde, 0x7f, 0x7a, 0x11, 0x78, 0xcf, 0x2e, 0x02, 0xef, 0xef, 0x8b, 0xc0, 0xfb, - 0xf1, 0x32, 0x98, 0x78, 0x76, 0x19, 0x4c, 0xfc, 0x79, 0x19, 0x4c, 0x7c, 0x19, 0xb5, 0x79, 0x76, - 0x78, 0xd4, 0x88, 0x9a, 0xa2, 0x6b, 0x06, 0x3f, 0xa4, 0x0d, 0xd9, 0x3f, 0xfc, 0x04, 0xc7, 0x67, - 0xa7, 0x3d, 0x26, 0x1b, 0x33, 0xf8, 0xcf, 0xc3, 0xee, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5f, - 0x1a, 0x6c, 0x79, 0x83, 0x0d, 0x00, 0x00, + // 938 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xce, 0x26, 0x6e, 0xec, 0xbe, 0x50, 0x28, 0x43, 0xa1, 0x61, 0xd3, 0xac, 0x9b, 0x2d, 0xb6, + 0x9b, 0x8a, 0xec, 0x36, 0x89, 0xe0, 0x00, 0x27, 0x2c, 0x64, 0x40, 0x2a, 0x50, 0x8c, 0x04, 0x82, + 0x8b, 0x35, 0xb6, 0x27, 0xce, 0x80, 0xbd, 0xe3, 0xee, 0x6c, 0x70, 0xa3, 0xd0, 0x0b, 0x88, 0x3b, + 0xb4, 0x47, 0x24, 0x2e, 0xfc, 0x33, 0x3d, 0x56, 0xe2, 0xc2, 0x09, 0xa1, 0x84, 0x3f, 0x04, 0xcd, + 0xaf, 0x65, 0xed, 0xf5, 0xd8, 0xa6, 0xf2, 0x29, 0x6b, 0x7d, 0xdf, 0xbc, 0xef, 0x7b, 0x6f, 0xdf, + 0x7e, 0xa3, 0xc0, 0x8d, 0x0e, 0x8e, 0x68, 0x44, 0x5a, 0x9d, 0x63, 0x4c, 0xa3, 0x30, 0x8e, 0x78, + 0xf8, 0xe0, 0x84, 0xc4, 0xa7, 0xc1, 0x30, 0x66, 0x09, 0x43, 0x57, 0xb3, 0x68, 0x10, 0x47, 0xdc, + 0xbd, 0xd6, 0x63, 0x3d, 0x26, 0xc1, 0x50, 0x3c, 0x29, 0x9e, 0x7b, 0xa3, 0xc7, 0x58, 0xaf, 0x4f, + 0x42, 0x3c, 0xa4, 0x21, 0x8e, 0x22, 0x96, 0xe0, 0x84, 0xb2, 0x88, 0x6b, 0xf4, 0x4e, 0x87, 0xf1, + 0x01, 0xe3, 0x61, 0x1b, 0x73, 0xa2, 0xca, 0x87, 0xdf, 0xed, 0xb7, 0x49, 0x82, 0xf7, 0xc3, 0x21, + 0xee, 0xd1, 0x48, 0x92, 0x35, 0x77, 0x3b, 0xe7, 0x67, 0x88, 0x63, 0x3c, 0x30, 0xa5, 0xf2, 0x76, + 0x47, 0xc7, 0x8c, 0xda, 0xd1, 0x08, 0x0f, 0x88, 0x41, 0xb7, 0x72, 0x68, 0x9b, 0x76, 0x0d, 0xe8, + 0xe5, 0xc0, 0x23, 0x16, 0x73, 0xdc, 0x27, 0xd6, 0xc3, 0x34, 0xa2, 0x89, 0x02, 0xfd, 0x2b, 0xb0, + 0xf1, 0x99, 0x68, 0xeb, 0xbe, 0xb4, 0xea, 0x7f, 0x0c, 0xaf, 0x64, 0x7e, 0x36, 0x09, 0x1f, 0xb2, + 0x88, 0x13, 0xf4, 0x36, 0xac, 0xab, 0x5e, 0x36, 0x9d, 0x9b, 0xce, 0xed, 0x8d, 0x83, 0xcd, 0x60, + 0x72, 0xba, 0x81, 0x3a, 0x51, 0x2f, 0x3c, 0xfd, 0xab, 0xbc, 0xd2, 0xd4, 0x6c, 0xbf, 0x0c, 0x97, + 0x65, 0xb9, 0x4f, 0xf0, 0x80, 0x20, 0x04, 0x05, 0xd1, 0x93, 0x2c, 0x71, 0xb9, 0x29, 0x9f, 0xfd, + 0x06, 0xbc, 0x9c, 0x12, 0x52, 0xb5, 0xfd, 0x0c, 0x71, 0xe3, 0xe0, 0x7a, 0x5e, 0x4b, 0xb0, 0x8d, + 0x94, 0xaa, 0xf3, 0x25, 0x5c, 0x91, 0x75, 0xde, 0xeb, 0xf7, 0x25, 0x88, 0x1a, 0x00, 0xff, 0xbd, + 0x20, 0x5d, 0xa9, 0x1a, 0xa8, 0xb7, 0x19, 0x88, 0xb7, 0x19, 0xa8, 0x65, 0xd1, 0x6f, 0x33, 0xb8, + 0x8f, 0x7b, 0xa4, 0x49, 0x1e, 0x9c, 0x10, 0x9e, 0x34, 0x33, 0x27, 0xfd, 0x27, 0x0e, 0xbc, 0x3a, + 0x56, 0x79, 0x8a, 0xcb, 0xb5, 0x05, 0x5d, 0xa2, 0x0f, 0xc6, 0x4c, 0xad, 0x4a, 0x53, 0xb5, 0xb9, + 0xa6, 0x94, 0xde, 0x98, 0x2b, 0x0f, 0x4a, 0xd2, 0x54, 0x9d, 0x76, 0xa7, 0x8e, 0xf5, 0x7d, 0xb8, + 0x6a, 0xf0, 0xd4, 0xef, 0x5d, 0x28, 0x88, 0xa5, 0xd1, 0xb3, 0x78, 0x2d, 0xef, 0xb7, 0x4e, 0xbb, + 0xa9, 0x5d, 0xc1, 0xf4, 0xbf, 0x80, 0x17, 0x4c, 0xeb, 0x02, 0x5b, 0xda, 0x4c, 0x7f, 0x71, 0xe0, + 0x5a, 0xb6, 0xf0, 0x14, 0x8b, 0x6b, 0x8b, 0x59, 0x5c, 0xde, 0x44, 0x7d, 0xdd, 0x6b, 0x83, 0xc5, + 0x9f, 0xe3, 0xfe, 0xf4, 0x65, 0x6d, 0x6a, 0xdb, 0x9a, 0x93, 0xda, 0x7e, 0x07, 0x4a, 0x47, 0x2c, + 0x6e, 0x89, 0x4f, 0x4e, 0x4f, 0xe5, 0xf5, 0xbc, 0xf5, 0x86, 0xfa, 0x26, 0xb5, 0xfb, 0xe2, 0x91, + 0xaa, 0xe1, 0x7f, 0x05, 0x2f, 0x99, 0x51, 0x18, 0xe9, 0x65, 0x8d, 0xf9, 0x37, 0x07, 0xae, 0x4f, + 0xd4, 0xb6, 0x58, 0x5e, 0xfb, 0x3f, 0x96, 0x97, 0x37, 0xf3, 0x8a, 0x4e, 0x87, 0x8f, 0x22, 0x9a, + 0xa0, 0x4d, 0x28, 0xe2, 0x6e, 0x37, 0x26, 0x9c, 0xeb, 0x99, 0x9b, 0x9f, 0x7e, 0x4d, 0x67, 0x84, + 0xa0, 0xa5, 0x0d, 0x20, 0x28, 0x88, 0x14, 0x93, 0xdc, 0x52, 0x53, 0x3e, 0x67, 0x43, 0x40, 0x70, + 0x97, 0xb7, 0xb0, 0x8f, 0x33, 0x21, 0x20, 0x2b, 0x67, 0x37, 0x56, 0xdb, 0xb0, 0x6c, 0xac, 0xa0, + 0x9b, 0x8d, 0x15, 0xcc, 0xe5, 0x4d, 0x6f, 0xa4, 0xa3, 0xfa, 0x1e, 0xe5, 0xc9, 0xa7, 0xa3, 0x88, + 0x74, 0x55, 0xf0, 0x59, 0xe7, 0x38, 0x31, 0x8d, 0xd5, 0xe7, 0x9e, 0xc6, 0xaf, 0x0e, 0x6c, 0x4d, + 0x51, 0x4e, 0x67, 0x72, 0x08, 0x97, 0xe4, 0xdd, 0xb5, 0x58, 0x32, 0x2a, 0xee, 0xd2, 0xc6, 0x72, + 0xf0, 0x18, 0xe0, 0x92, 0x74, 0x87, 0x46, 0xb0, 0xae, 0x2e, 0x25, 0xb4, 0x9d, 0xb7, 0x90, 0xb9, + 0xe5, 0xdc, 0xca, 0x4c, 0xd8, 0xa8, 0xf8, 0xb5, 0x1f, 0xfe, 0xf8, 0xe7, 0xc9, 0xea, 0x0e, 0x2a, + 0x87, 0xdf, 0xe0, 0xce, 0xb7, 0xb8, 0x1f, 0xaa, 0x53, 0x7b, 0x93, 0xf7, 0x3d, 0x1a, 0x41, 0x41, + 0x5e, 0x78, 0x5b, 0x96, 0xba, 0x02, 0x74, 0x6f, 0xcd, 0x00, 0x53, 0xc9, 0x3d, 0x29, 0x59, 0x43, + 0x15, 0xab, 0xa4, 0x9c, 0x5e, 0x78, 0x26, 0xfe, 0x3c, 0x42, 0xdf, 0x43, 0x29, 0xbd, 0x00, 0xcb, + 0x96, 0xfa, 0x86, 0xe0, 0xd6, 0xe6, 0x10, 0x52, 0x13, 0x55, 0x69, 0xe2, 0x26, 0xf2, 0x66, 0x9b, + 0x40, 0x1c, 0xd6, 0xc4, 0x7d, 0xe4, 0x5a, 0xea, 0xd6, 0x69, 0xd7, 0xf5, 0xed, 0x58, 0x2a, 0xf7, + 0xa6, 0x94, 0xab, 0xa2, 0x37, 0xac, 0x72, 0x22, 0xf9, 0x4d, 0xcb, 0x0f, 0xa1, 0x68, 0xae, 0x27, + 0xcf, 0xde, 0x90, 0xc0, 0xdd, 0xea, 0x6c, 0x3c, 0x35, 0x50, 0x91, 0x06, 0xca, 0x68, 0x7b, 0xa6, + 0x01, 0xf4, 0xa3, 0x03, 0x45, 0x13, 0xd9, 0x36, 0x69, 0x8d, 0x5b, 0xa5, 0x27, 0x62, 0xd9, 0xbf, + 0x2b, 0xa5, 0xef, 0xa0, 0xdb, 0x56, 0x69, 0x93, 0xda, 0xa6, 0xff, 0x9f, 0x1c, 0x80, 0xcc, 0xdd, + 0xb1, 0x63, 0xef, 0xd1, 0x78, 0xd9, 0x9d, 0x4b, 0x49, 0xed, 0xec, 0x4a, 0x3b, 0xb7, 0xd0, 0xce, + 0x5c, 0x3b, 0xe8, 0x14, 0x0a, 0x32, 0xc6, 0x6d, 0x3b, 0x2f, 0x40, 0xeb, 0xce, 0x67, 0x93, 0xdd, + 0x0f, 0xa5, 0xe8, 0x2e, 0xaa, 0x59, 0x45, 0x45, 0x8e, 0x86, 0x67, 0x3a, 0xd6, 0x1e, 0xa1, 0x33, + 0xb9, 0xf5, 0x2a, 0xf1, 0x67, 0x6c, 0xbd, 0x24, 0xcc, 0xda, 0xfa, 0xb1, 0x64, 0x5f, 0x60, 0x0b, + 0x64, 0x9c, 0xff, 0xee, 0xc0, 0x8b, 0x13, 0x09, 0x6c, 0x8b, 0x93, 0x71, 0x9a, 0xbb, 0xb7, 0x10, + 0x2d, 0xf5, 0xf3, 0xae, 0xf4, 0xf3, 0x16, 0x3a, 0xb4, 0xfa, 0xe9, 0x53, 0x9e, 0xb4, 0x98, 0x38, + 0xd9, 0xd2, 0xa9, 0x60, 0x46, 0x54, 0xff, 0xf0, 0xe9, 0xb9, 0xe7, 0x3c, 0x3b, 0xf7, 0x9c, 0xbf, + 0xcf, 0x3d, 0xe7, 0xe7, 0x0b, 0x6f, 0xe5, 0xd9, 0x85, 0xb7, 0xf2, 0xe7, 0x85, 0xb7, 0xf2, 0x75, + 0xd0, 0xa3, 0xc9, 0xf1, 0x49, 0x3b, 0xe8, 0xb0, 0x81, 0x2e, 0x7c, 0x0f, 0xb7, 0xf9, 0x78, 0xf1, + 0x87, 0xb2, 0x7c, 0x72, 0x3a, 0x24, 0xbc, 0xbd, 0x2e, 0xff, 0x6d, 0x38, 0xfc, 0x37, 0x00, 0x00, + 0xff, 0xff, 0x03, 0x20, 0x2a, 0x1b, 0x7d, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1542,10 +1541,10 @@ func (m *QueryName) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Name))) i-- dAtA[i] = 0xa } @@ -1689,10 +1688,10 @@ func (m *QueryBid) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Name))) i-- dAtA[i] = 0xa } @@ -2238,7 +2237,7 @@ func (m *QueryName) Size() (n int) { } var l int _ = l - l = len(m.Index) + l = len(m.Name) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -2294,7 +2293,7 @@ func (m *QueryBid) Size() (n int) { } var l int _ = l - l = len(m.Index) + l = len(m.Name) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -2663,7 +2662,7 @@ func (m *QueryName) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2691,7 +2690,7 @@ func (m *QueryName) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Index = string(dAtA[iNdEx:postIndex]) + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -3034,7 +3033,7 @@ func (m *QueryBid) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3062,7 +3061,7 @@ func (m *QueryBid) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Index = string(dAtA[iNdEx:postIndex]) + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/rns/types/query.pb.gw.go b/x/rns/types/query.pb.gw.go index 6b7abaf7e..38be4f02d 100644 --- a/x/rns/types/query.pb.gw.go +++ b/x/rns/types/query.pb.gw.go @@ -62,15 +62,15 @@ func request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler, clie _ = err ) - val, ok = pathParams["index"] + val, ok = pathParams["name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Index, err = runtime.String(val) + protoReq.Name, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } msg, err := client.Name(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -89,15 +89,15 @@ func local_request_Query_Name_0(ctx context.Context, marshaler runtime.Marshaler _ = err ) - val, ok = pathParams["index"] + val, ok = pathParams["name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Index, err = runtime.String(val) + protoReq.Name, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } msg, err := server.Name(ctx, &protoReq) @@ -152,15 +152,15 @@ func request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, clien _ = err ) - val, ok = pathParams["index"] + val, ok = pathParams["name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Index, err = runtime.String(val) + protoReq.Name, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } msg, err := client.Bid(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -179,15 +179,15 @@ func local_request_Query_Bid_0(ctx context.Context, marshaler runtime.Marshaler, _ = err ) - val, ok = pathParams["index"] + val, ok = pathParams["name"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Index, err = runtime.String(val) + protoReq.Name, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } msg, err := server.Bid(ctx, &protoReq) @@ -966,11 +966,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Name_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "names", "index"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Name_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "names", "name"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_AllNames_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "names"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Bid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "bids", "index"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Bid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "rns", "bids", "name"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_AllBids_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "rns", "bids"}, "", runtime.AssumeColonVerbOpt(false))) diff --git a/x/storage/keeper/grpc_query_active_deals.go b/x/storage/keeper/grpc_query_active_deals.go index 0242a3c85..27ea9a4c3 100644 --- a/x/storage/keeper/grpc_query_active_deals.go +++ b/x/storage/keeper/grpc_query_active_deals.go @@ -116,7 +116,34 @@ func (k Keeper) Proof(c context.Context, req *types.QueryProof) (*types.QueryPro return &types.QueryProofResponse{Proof: val}, nil } -func (k Keeper) AllProofs(c context.Context, req *types.QueryProofsByAddress) (*types.QueryProofsByAddressResponse, error) { +func (k Keeper) AllProofs(c context.Context, req *types.QueryAllProofs) (*types.QueryAllProofsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + var proofs []types.FileProof + ctx := sdk.UnwrapSDKContext(c) + + store := ctx.KVStore(k.storeKey) + proofStore := prefix.NewStore(store, types.KeyPrefix(types.ProofKeyPrefix)) + + pageRes, err := query.Paginate(proofStore, req.Pagination, func(key []byte, value []byte) error { + var proof types.FileProof + if err := k.cdc.Unmarshal(value, &proof); err != nil { + return err + } + + proofs = append(proofs, proof) + return nil + }) + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllProofsResponse{Proofs: proofs, Pagination: pageRes}, nil +} + +func (k Keeper) ProofsByAddress(c context.Context, req *types.QueryProofsByAddress) (*types.QueryProofsByAddressResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -140,5 +167,5 @@ func (k Keeper) AllProofs(c context.Context, req *types.QueryProofsByAddress) (* return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryProofsByAddressResponse{Proof: proofs, Pagination: pageRes}, nil + return &types.QueryProofsByAddressResponse{Proofs: proofs, Pagination: pageRes}, nil } diff --git a/x/storage/types/query.pb.go b/x/storage/types/query.pb.go index c6a26a5cf..d5462986b 100644 --- a/x/storage/types/query.pb.go +++ b/x/storage/types/query.pb.go @@ -279,7 +279,7 @@ func (m *QueryProofsByAddress) GetPagination() *query.PageRequest { } type QueryProofsByAddressResponse struct { - Proof []FileProof `protobuf:"bytes,1,rep,name=proof,proto3" json:"proof"` + Proofs []FileProof `protobuf:"bytes,1,rep,name=proofs,proto3" json:"proofs"` Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -316,9 +316,9 @@ func (m *QueryProofsByAddressResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryProofsByAddressResponse proto.InternalMessageInfo -func (m *QueryProofsByAddressResponse) GetProof() []FileProof { +func (m *QueryProofsByAddressResponse) GetProofs() []FileProof { if m != nil { - return m.Proof + return m.Proofs } return nil } @@ -330,6 +330,102 @@ func (m *QueryProofsByAddressResponse) GetPagination() *query.PageResponse { return nil } +type QueryAllProofs struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllProofs) Reset() { *m = QueryAllProofs{} } +func (m *QueryAllProofs) String() string { return proto.CompactTextString(m) } +func (*QueryAllProofs) ProtoMessage() {} +func (*QueryAllProofs) Descriptor() ([]byte, []int) { + return fileDescriptor_9fe03bff51a37284, []int{6} +} +func (m *QueryAllProofs) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllProofs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllProofs.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 *QueryAllProofs) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllProofs.Merge(m, src) +} +func (m *QueryAllProofs) XXX_Size() int { + return m.Size() +} +func (m *QueryAllProofs) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllProofs.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllProofs proto.InternalMessageInfo + +func (m *QueryAllProofs) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllProofsResponse struct { + Proofs []FileProof `protobuf:"bytes,1,rep,name=proofs,proto3" json:"proofs"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllProofsResponse) Reset() { *m = QueryAllProofsResponse{} } +func (m *QueryAllProofsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllProofsResponse) ProtoMessage() {} +func (*QueryAllProofsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_9fe03bff51a37284, []int{7} +} +func (m *QueryAllProofsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllProofsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllProofsResponse.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 *QueryAllProofsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllProofsResponse.Merge(m, src) +} +func (m *QueryAllProofsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllProofsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllProofsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllProofsResponse proto.InternalMessageInfo + +func (m *QueryAllProofsResponse) GetProofs() []FileProof { + if m != nil { + return m.Proofs + } + return nil +} + +func (m *QueryAllProofsResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + type QueryFile struct { Merkle []byte `protobuf:"bytes,1,opt,name=merkle,proto3" json:"merkle,omitempty"` Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` @@ -340,7 +436,7 @@ func (m *QueryFile) Reset() { *m = QueryFile{} } func (m *QueryFile) String() string { return proto.CompactTextString(m) } func (*QueryFile) ProtoMessage() {} func (*QueryFile) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{6} + return fileDescriptor_9fe03bff51a37284, []int{8} } func (m *QueryFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +494,7 @@ func (m *QueryFileResponse) Reset() { *m = QueryFileResponse{} } func (m *QueryFileResponse) String() string { return proto.CompactTextString(m) } func (*QueryFileResponse) ProtoMessage() {} func (*QueryFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{7} + return fileDescriptor_9fe03bff51a37284, []int{9} } func (m *QueryFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -442,7 +538,7 @@ func (m *QueryAllFiles) Reset() { *m = QueryAllFiles{} } func (m *QueryAllFiles) String() string { return proto.CompactTextString(m) } func (*QueryAllFiles) ProtoMessage() {} func (*QueryAllFiles) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{8} + return fileDescriptor_9fe03bff51a37284, []int{10} } func (m *QueryAllFiles) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -487,7 +583,7 @@ func (m *QueryOpenFiles) Reset() { *m = QueryOpenFiles{} } func (m *QueryOpenFiles) String() string { return proto.CompactTextString(m) } func (*QueryOpenFiles) ProtoMessage() {} func (*QueryOpenFiles) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{9} + return fileDescriptor_9fe03bff51a37284, []int{11} } func (m *QueryOpenFiles) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -539,7 +635,7 @@ func (m *QueryAllFilesResponse) Reset() { *m = QueryAllFilesResponse{} } func (m *QueryAllFilesResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllFilesResponse) ProtoMessage() {} func (*QueryAllFilesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{10} + return fileDescriptor_9fe03bff51a37284, []int{12} } func (m *QueryAllFilesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +686,7 @@ func (m *QueryProvider) Reset() { *m = QueryProvider{} } func (m *QueryProvider) String() string { return proto.CompactTextString(m) } func (*QueryProvider) ProtoMessage() {} func (*QueryProvider) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{11} + return fileDescriptor_9fe03bff51a37284, []int{13} } func (m *QueryProvider) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -634,7 +730,7 @@ func (m *QueryProviderResponse) Reset() { *m = QueryProviderResponse{} } func (m *QueryProviderResponse) String() string { return proto.CompactTextString(m) } func (*QueryProviderResponse) ProtoMessage() {} func (*QueryProviderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{12} + return fileDescriptor_9fe03bff51a37284, []int{14} } func (m *QueryProviderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -678,7 +774,7 @@ func (m *QueryAllProviders) Reset() { *m = QueryAllProviders{} } func (m *QueryAllProviders) String() string { return proto.CompactTextString(m) } func (*QueryAllProviders) ProtoMessage() {} func (*QueryAllProviders) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{13} + return fileDescriptor_9fe03bff51a37284, []int{15} } func (m *QueryAllProviders) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -723,7 +819,7 @@ func (m *QueryAllProvidersResponse) Reset() { *m = QueryAllProvidersResp func (m *QueryAllProvidersResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllProvidersResponse) ProtoMessage() {} func (*QueryAllProvidersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{14} + return fileDescriptor_9fe03bff51a37284, []int{16} } func (m *QueryAllProvidersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -777,7 +873,7 @@ func (m *QueryAttestation) Reset() { *m = QueryAttestation{} } func (m *QueryAttestation) String() string { return proto.CompactTextString(m) } func (*QueryAttestation) ProtoMessage() {} func (*QueryAttestation) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{15} + return fileDescriptor_9fe03bff51a37284, []int{17} } func (m *QueryAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -842,7 +938,7 @@ func (m *QueryAttestationResponse) Reset() { *m = QueryAttestationRespon func (m *QueryAttestationResponse) String() string { return proto.CompactTextString(m) } func (*QueryAttestationResponse) ProtoMessage() {} func (*QueryAttestationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{16} + return fileDescriptor_9fe03bff51a37284, []int{18} } func (m *QueryAttestationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -886,7 +982,7 @@ func (m *QueryAllAttestations) Reset() { *m = QueryAllAttestations{} } func (m *QueryAllAttestations) String() string { return proto.CompactTextString(m) } func (*QueryAllAttestations) ProtoMessage() {} func (*QueryAllAttestations) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{17} + return fileDescriptor_9fe03bff51a37284, []int{19} } func (m *QueryAllAttestations) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -931,7 +1027,7 @@ func (m *QueryAllAttestationsResponse) Reset() { *m = QueryAllAttestatio func (m *QueryAllAttestationsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllAttestationsResponse) ProtoMessage() {} func (*QueryAllAttestationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{18} + return fileDescriptor_9fe03bff51a37284, []int{20} } func (m *QueryAllAttestationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -985,7 +1081,7 @@ func (m *QueryReport) Reset() { *m = QueryReport{} } func (m *QueryReport) String() string { return proto.CompactTextString(m) } func (*QueryReport) ProtoMessage() {} func (*QueryReport) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{19} + return fileDescriptor_9fe03bff51a37284, []int{21} } func (m *QueryReport) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +1146,7 @@ func (m *QueryReportResponse) Reset() { *m = QueryReportResponse{} } func (m *QueryReportResponse) String() string { return proto.CompactTextString(m) } func (*QueryReportResponse) ProtoMessage() {} func (*QueryReportResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{20} + return fileDescriptor_9fe03bff51a37284, []int{22} } func (m *QueryReportResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1094,7 +1190,7 @@ func (m *QueryAllReports) Reset() { *m = QueryAllReports{} } func (m *QueryAllReports) String() string { return proto.CompactTextString(m) } func (*QueryAllReports) ProtoMessage() {} func (*QueryAllReports) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{21} + return fileDescriptor_9fe03bff51a37284, []int{23} } func (m *QueryAllReports) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1139,7 +1235,7 @@ func (m *QueryAllReportsResponse) Reset() { *m = QueryAllReportsResponse func (m *QueryAllReportsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllReportsResponse) ProtoMessage() {} func (*QueryAllReportsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{22} + return fileDescriptor_9fe03bff51a37284, []int{24} } func (m *QueryAllReportsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1190,7 +1286,7 @@ func (m *QueryFreeSpace) Reset() { *m = QueryFreeSpace{} } func (m *QueryFreeSpace) String() string { return proto.CompactTextString(m) } func (*QueryFreeSpace) ProtoMessage() {} func (*QueryFreeSpace) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{23} + return fileDescriptor_9fe03bff51a37284, []int{25} } func (m *QueryFreeSpace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1234,7 +1330,7 @@ func (m *QueryStoreCount) Reset() { *m = QueryStoreCount{} } func (m *QueryStoreCount) String() string { return proto.CompactTextString(m) } func (*QueryStoreCount) ProtoMessage() {} func (*QueryStoreCount) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{24} + return fileDescriptor_9fe03bff51a37284, []int{26} } func (m *QueryStoreCount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1278,7 +1374,7 @@ func (m *QueryFreeSpaceResponse) Reset() { *m = QueryFreeSpaceResponse{} func (m *QueryFreeSpaceResponse) String() string { return proto.CompactTextString(m) } func (*QueryFreeSpaceResponse) ProtoMessage() {} func (*QueryFreeSpaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{25} + return fileDescriptor_9fe03bff51a37284, []int{27} } func (m *QueryFreeSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1322,7 +1418,7 @@ func (m *QueryStoreCountResponse) Reset() { *m = QueryStoreCountResponse func (m *QueryStoreCountResponse) String() string { return proto.CompactTextString(m) } func (*QueryStoreCountResponse) ProtoMessage() {} func (*QueryStoreCountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{26} + return fileDescriptor_9fe03bff51a37284, []int{28} } func (m *QueryStoreCountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1366,7 +1462,7 @@ func (m *QueryFindFile) Reset() { *m = QueryFindFile{} } func (m *QueryFindFile) String() string { return proto.CompactTextString(m) } func (*QueryFindFile) ProtoMessage() {} func (*QueryFindFile) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{27} + return fileDescriptor_9fe03bff51a37284, []int{29} } func (m *QueryFindFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1410,7 +1506,7 @@ func (m *QueryFindFileResponse) Reset() { *m = QueryFindFileResponse{} } func (m *QueryFindFileResponse) String() string { return proto.CompactTextString(m) } func (*QueryFindFileResponse) ProtoMessage() {} func (*QueryFindFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{28} + return fileDescriptor_9fe03bff51a37284, []int{30} } func (m *QueryFindFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1454,7 +1550,7 @@ func (m *QueryClientFreeSpace) Reset() { *m = QueryClientFreeSpace{} } func (m *QueryClientFreeSpace) String() string { return proto.CompactTextString(m) } func (*QueryClientFreeSpace) ProtoMessage() {} func (*QueryClientFreeSpace) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{29} + return fileDescriptor_9fe03bff51a37284, []int{31} } func (m *QueryClientFreeSpace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1498,7 +1594,7 @@ func (m *QueryClientFreeSpaceResponse) Reset() { *m = QueryClientFreeSpa func (m *QueryClientFreeSpaceResponse) String() string { return proto.CompactTextString(m) } func (*QueryClientFreeSpaceResponse) ProtoMessage() {} func (*QueryClientFreeSpaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{30} + return fileDescriptor_9fe03bff51a37284, []int{32} } func (m *QueryClientFreeSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1542,7 +1638,7 @@ func (m *QueryPayData) Reset() { *m = QueryPayData{} } func (m *QueryPayData) String() string { return proto.CompactTextString(m) } func (*QueryPayData) ProtoMessage() {} func (*QueryPayData) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{31} + return fileDescriptor_9fe03bff51a37284, []int{33} } func (m *QueryPayData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1587,7 +1683,7 @@ func (m *QueryPayDataResponse) Reset() { *m = QueryPayDataResponse{} } func (m *QueryPayDataResponse) String() string { return proto.CompactTextString(m) } func (*QueryPayDataResponse) ProtoMessage() {} func (*QueryPayDataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{32} + return fileDescriptor_9fe03bff51a37284, []int{34} } func (m *QueryPayDataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1638,7 +1734,7 @@ func (m *QueryStoragePaymentInfo) Reset() { *m = QueryStoragePaymentInfo func (m *QueryStoragePaymentInfo) String() string { return proto.CompactTextString(m) } func (*QueryStoragePaymentInfo) ProtoMessage() {} func (*QueryStoragePaymentInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{33} + return fileDescriptor_9fe03bff51a37284, []int{35} } func (m *QueryStoragePaymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1682,7 +1778,7 @@ func (m *QueryStoragePaymentInfoResponse) Reset() { *m = QueryStoragePay func (m *QueryStoragePaymentInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueryStoragePaymentInfoResponse) ProtoMessage() {} func (*QueryStoragePaymentInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{34} + return fileDescriptor_9fe03bff51a37284, []int{36} } func (m *QueryStoragePaymentInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1726,7 +1822,7 @@ func (m *QueryAllStoragePaymentInfo) Reset() { *m = QueryAllStoragePayme func (m *QueryAllStoragePaymentInfo) String() string { return proto.CompactTextString(m) } func (*QueryAllStoragePaymentInfo) ProtoMessage() {} func (*QueryAllStoragePaymentInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{35} + return fileDescriptor_9fe03bff51a37284, []int{37} } func (m *QueryAllStoragePaymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1771,7 +1867,7 @@ func (m *QueryAllStoragePaymentInfoResponse) Reset() { *m = QueryAllStor func (m *QueryAllStoragePaymentInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllStoragePaymentInfoResponse) ProtoMessage() {} func (*QueryAllStoragePaymentInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{36} + return fileDescriptor_9fe03bff51a37284, []int{38} } func (m *QueryAllStoragePaymentInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1823,7 +1919,7 @@ func (m *QueryFileUploadCheck) Reset() { *m = QueryFileUploadCheck{} } func (m *QueryFileUploadCheck) String() string { return proto.CompactTextString(m) } func (*QueryFileUploadCheck) ProtoMessage() {} func (*QueryFileUploadCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{37} + return fileDescriptor_9fe03bff51a37284, []int{39} } func (m *QueryFileUploadCheck) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1874,7 +1970,7 @@ func (m *QueryFileUploadCheckResponse) Reset() { *m = QueryFileUploadChe func (m *QueryFileUploadCheckResponse) String() string { return proto.CompactTextString(m) } func (*QueryFileUploadCheckResponse) ProtoMessage() {} func (*QueryFileUploadCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{38} + return fileDescriptor_9fe03bff51a37284, []int{40} } func (m *QueryFileUploadCheckResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1919,7 +2015,7 @@ func (m *QueryPriceCheck) Reset() { *m = QueryPriceCheck{} } func (m *QueryPriceCheck) String() string { return proto.CompactTextString(m) } func (*QueryPriceCheck) ProtoMessage() {} func (*QueryPriceCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{39} + return fileDescriptor_9fe03bff51a37284, []int{41} } func (m *QueryPriceCheck) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1970,7 +2066,7 @@ func (m *QueryPriceCheckResponse) Reset() { *m = QueryPriceCheckResponse func (m *QueryPriceCheckResponse) String() string { return proto.CompactTextString(m) } func (*QueryPriceCheckResponse) ProtoMessage() {} func (*QueryPriceCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{40} + return fileDescriptor_9fe03bff51a37284, []int{42} } func (m *QueryPriceCheckResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2013,7 +2109,7 @@ func (m *QueryActiveProviders) Reset() { *m = QueryActiveProviders{} } func (m *QueryActiveProviders) String() string { return proto.CompactTextString(m) } func (*QueryActiveProviders) ProtoMessage() {} func (*QueryActiveProviders) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{41} + return fileDescriptor_9fe03bff51a37284, []int{43} } func (m *QueryActiveProviders) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2050,7 +2146,7 @@ func (m *QueryActiveProvidersResponse) Reset() { *m = QueryActiveProvide func (m *QueryActiveProvidersResponse) String() string { return proto.CompactTextString(m) } func (*QueryActiveProvidersResponse) ProtoMessage() {} func (*QueryActiveProvidersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{42} + return fileDescriptor_9fe03bff51a37284, []int{44} } func (m *QueryActiveProvidersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2093,7 +2189,7 @@ func (m *QueryStorageStats) Reset() { *m = QueryStorageStats{} } func (m *QueryStorageStats) String() string { return proto.CompactTextString(m) } func (*QueryStorageStats) ProtoMessage() {} func (*QueryStorageStats) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{43} + return fileDescriptor_9fe03bff51a37284, []int{45} } func (m *QueryStorageStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2134,7 +2230,7 @@ func (m *QueryStorageStatsResponse) Reset() { *m = QueryStorageStatsResp func (m *QueryStorageStatsResponse) String() string { return proto.CompactTextString(m) } func (*QueryStorageStatsResponse) ProtoMessage() {} func (*QueryStorageStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9fe03bff51a37284, []int{44} + return fileDescriptor_9fe03bff51a37284, []int{46} } func (m *QueryStorageStatsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2198,6 +2294,8 @@ func init() { proto.RegisterType((*QueryProofResponse)(nil), "canine_chain.storage.QueryProofResponse") proto.RegisterType((*QueryProofsByAddress)(nil), "canine_chain.storage.QueryProofsByAddress") proto.RegisterType((*QueryProofsByAddressResponse)(nil), "canine_chain.storage.QueryProofsByAddressResponse") + proto.RegisterType((*QueryAllProofs)(nil), "canine_chain.storage.QueryAllProofs") + proto.RegisterType((*QueryAllProofsResponse)(nil), "canine_chain.storage.QueryAllProofsResponse") proto.RegisterType((*QueryFile)(nil), "canine_chain.storage.QueryFile") proto.RegisterType((*QueryFileResponse)(nil), "canine_chain.storage.QueryFileResponse") proto.RegisterType((*QueryAllFiles)(nil), "canine_chain.storage.QueryAllFiles") @@ -2243,134 +2341,139 @@ func init() { func init() { proto.RegisterFile("canine_chain/storage/query.proto", fileDescriptor_9fe03bff51a37284) } var fileDescriptor_9fe03bff51a37284 = []byte{ - // 2021 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6f, 0x1c, 0x49, - 0x11, 0x4f, 0xfb, 0xeb, 0xbc, 0xb5, 0xce, 0x25, 0xf4, 0xf9, 0x82, 0x59, 0x19, 0xdb, 0xe9, 0xc4, - 0x1f, 0x71, 0xe2, 0x9d, 0xd8, 0x21, 0x10, 0x92, 0x4b, 0x74, 0xb6, 0x83, 0x43, 0xc4, 0xe5, 0xe2, - 0x8c, 0x15, 0x10, 0x87, 0xc4, 0xd0, 0xde, 0x6d, 0x6f, 0x06, 0xaf, 0x67, 0xe6, 0x66, 0x66, 0x03, - 0x2b, 0xcb, 0x2f, 0xe4, 0x05, 0xde, 0x4e, 0x42, 0x41, 0x70, 0x42, 0x42, 0x42, 0x11, 0x70, 0xe2, - 0x1d, 0x10, 0x7f, 0xc1, 0xbd, 0x71, 0x12, 0x2f, 0x88, 0x87, 0x08, 0x25, 0xf0, 0x7f, 0xa0, 0xfe, - 0x98, 0xde, 0xde, 0xf5, 0x6c, 0xef, 0x1a, 0x2d, 0xba, 0x27, 0x6f, 0xf7, 0xfe, 0xaa, 0xea, 0x57, - 0x55, 0xdd, 0xd5, 0x55, 0x6b, 0x98, 0xab, 0xd0, 0xc0, 0x0f, 0x98, 0x57, 0x79, 0x42, 0xfd, 0xc0, - 0x49, 0xd2, 0x30, 0xa6, 0x35, 0xe6, 0x7c, 0xd8, 0x60, 0x71, 0xb3, 0x1c, 0xc5, 0x61, 0x1a, 0xe2, - 0x49, 0x13, 0x51, 0x56, 0x88, 0xd2, 0x64, 0x2d, 0xac, 0x85, 0x02, 0xe0, 0xf0, 0x4f, 0x12, 0x5b, - 0x9a, 0xae, 0x85, 0x61, 0xad, 0xce, 0x1c, 0x1a, 0xf9, 0x0e, 0x0d, 0x82, 0x30, 0xa5, 0xa9, 0x1f, - 0x06, 0x89, 0xfa, 0x76, 0xb9, 0x12, 0x26, 0x07, 0x61, 0xe2, 0xec, 0xd2, 0x44, 0x99, 0x70, 0x9e, - 0xae, 0xee, 0xb2, 0x94, 0xae, 0x3a, 0x11, 0xad, 0xf9, 0x81, 0x00, 0x2b, 0xec, 0xf9, 0x5c, 0x5e, - 0x11, 0x8d, 0xe9, 0x41, 0xa6, 0x6e, 0x31, 0x17, 0x42, 0x2b, 0xa9, 0xff, 0x94, 0x79, 0x55, 0x46, - 0xeb, 0x19, 0xf0, 0x62, 0xbe, 0xae, 0x38, 0x7c, 0xea, 0x57, 0x59, 0x6c, 0x57, 0x17, 0xd1, 0xe6, - 0x01, 0x0b, 0x52, 0xcf, 0x0f, 0xf6, 0x94, 0x93, 0xe4, 0x34, 0x14, 0x1f, 0x71, 0xf2, 0xdb, 0x82, - 0x0c, 0x79, 0x04, 0x6f, 0x19, 0x4b, 0x97, 0x25, 0x51, 0x18, 0x24, 0x0c, 0xdf, 0x84, 0x31, 0xc9, - 0x76, 0x0a, 0xcd, 0xa1, 0xa5, 0xe2, 0xda, 0x74, 0x39, 0x2f, 0x8e, 0x65, 0x29, 0xb5, 0x31, 0xf2, - 0xe9, 0xcb, 0xd9, 0x53, 0xae, 0x92, 0x20, 0x87, 0x00, 0x52, 0x65, 0x1c, 0x86, 0x7b, 0xf8, 0x12, - 0x9c, 0xcd, 0xb8, 0x7a, 0xb4, 0x5a, 0x8d, 0x59, 0x22, 0x75, 0x16, 0xdc, 0x33, 0xd9, 0xfe, 0xba, - 0xdc, 0xc6, 0xe7, 0x60, 0xec, 0x80, 0xc5, 0xfb, 0x75, 0x36, 0x35, 0x34, 0x87, 0x96, 0x26, 0x5c, - 0xb5, 0xc2, 0x93, 0x30, 0x1a, 0xfe, 0x28, 0x60, 0xf1, 0xd4, 0xb0, 0x90, 0x93, 0x0b, 0xbe, 0x9b, - 0xa4, 0x34, 0x4e, 0xa7, 0x46, 0xe6, 0xd0, 0xd2, 0xb0, 0x2b, 0x17, 0xe4, 0x11, 0xe0, 0x96, 0x71, - 0xed, 0xce, 0x2d, 0x18, 0x8d, 0xf8, 0x86, 0xf2, 0x66, 0x36, 0xdf, 0x9b, 0x2d, 0xbf, 0xce, 0x84, - 0x9c, 0x72, 0x48, 0xca, 0x90, 0x9f, 0x21, 0x98, 0x6c, 0xe9, 0x4c, 0x36, 0x9a, 0x19, 0xdf, 0x13, - 0xb8, 0xb6, 0x05, 0xd0, 0x3a, 0x24, 0xc2, 0xbd, 0xe2, 0xda, 0x42, 0x59, 0x9e, 0xa8, 0x32, 0x3f, - 0x51, 0x65, 0x79, 0x68, 0xd5, 0x89, 0x2a, 0x6f, 0xd3, 0x1a, 0x73, 0xd9, 0x87, 0x0d, 0x96, 0xa4, - 0xae, 0x21, 0x49, 0x5e, 0x20, 0x98, 0xce, 0xe3, 0x92, 0xe7, 0xe9, 0xf0, 0x49, 0x3d, 0xc5, 0xf7, - 0x72, 0x58, 0x2e, 0xf6, 0x64, 0x29, 0x2d, 0xb7, 0xd1, 0x7c, 0x08, 0x05, 0xc1, 0x92, 0xdb, 0x31, - 0xd2, 0x8a, 0xf2, 0xd3, 0x3a, 0x94, 0x9b, 0xd6, 0x61, 0x33, 0xad, 0xdb, 0xf0, 0x05, 0xad, 0xd0, - 0xf0, 0x75, 0x64, 0xcf, 0x57, 0x6a, 0x8b, 0x6b, 0xe7, 0xf3, 0x5d, 0x7d, 0x1c, 0xf8, 0x7b, 0x3e, - 0xab, 0x72, 0x41, 0xe5, 0xac, 0x10, 0x22, 0xdf, 0x81, 0xd3, 0x42, 0xe3, 0x7a, 0xbd, 0xce, 0xbf, - 0xeb, 0x4c, 0x11, 0xfa, 0x9f, 0x53, 0xf4, 0x0c, 0xc1, 0x9b, 0x42, 0xf3, 0xc3, 0x88, 0x05, 0x52, - 0xf5, 0xe7, 0x70, 0x50, 0x7e, 0x83, 0xe0, 0xed, 0x36, 0xff, 0x74, 0xd4, 0x6e, 0xc3, 0x28, 0x0f, - 0x40, 0xa2, 0x4e, 0x48, 0xdf, 0x61, 0x93, 0x52, 0x83, 0x3b, 0x23, 0x97, 0x54, 0x02, 0xb6, 0x55, - 0x04, 0xf0, 0x14, 0xbc, 0xd1, 0x1e, 0x9c, 0x6c, 0x49, 0x3e, 0x50, 0xbe, 0x64, 0x50, 0xed, 0xcb, - 0x3a, 0x8c, 0x67, 0x01, 0xb4, 0x5f, 0xed, 0x4c, 0x32, 0xab, 0x55, 0x5a, 0x8c, 0x7c, 0x4f, 0x9d, - 0xac, 0xf5, 0x7a, 0x5d, 0x83, 0x06, 0x76, 0x16, 0x3e, 0x41, 0xf0, 0xa5, 0x63, 0xda, 0x35, 0xfb, - 0x4d, 0x28, 0xe8, 0x32, 0x6e, 0xbf, 0xaf, 0x9d, 0xf4, 0x5b, 0x72, 0x83, 0xcb, 0x47, 0x00, 0x67, - 0x25, 0xd5, 0x34, 0x65, 0x89, 0x7c, 0xfa, 0xf8, 0xd5, 0xe5, 0x96, 0x54, 0x74, 0x0b, 0xae, 0x5a, - 0x0d, 0xa4, 0x52, 0xfb, 0x30, 0xd5, 0x69, 0x4f, 0x47, 0xe6, 0x01, 0x14, 0x69, 0x6b, 0x5b, 0x25, - 0x60, 0x3e, 0x3f, 0x36, 0x86, 0xfc, 0x56, 0x18, 0x1f, 0xa8, 0x08, 0x99, 0xf2, 0xe4, 0xfb, 0xaa, - 0x80, 0xaf, 0xd7, 0xeb, 0x06, 0x7a, 0x70, 0x69, 0xfe, 0x4b, 0x56, 0x95, 0x3b, 0x0c, 0x68, 0x7f, - 0x1e, 0xc2, 0x84, 0xc1, 0x27, 0x4b, 0xf6, 0x89, 0x1c, 0x6a, 0x53, 0x30, 0xb8, 0xac, 0xfb, 0xaa, - 0x1d, 0x70, 0x59, 0x14, 0xc6, 0xe9, 0xff, 0x35, 0xe1, 0x8f, 0x55, 0xab, 0x21, 0x4d, 0xe9, 0xd8, - 0xdc, 0x81, 0xb1, 0x58, 0xec, 0xa8, 0x04, 0xcc, 0xe5, 0x47, 0x45, 0x4a, 0x19, 0x01, 0x51, 0x52, - 0xe4, 0xbb, 0x70, 0x26, 0x8b, 0xbd, 0xc4, 0x0c, 0x2e, 0xaf, 0x2f, 0x10, 0x7c, 0xb1, 0x43, 0xb7, - 0xa6, 0xfd, 0x2e, 0xbc, 0x21, 0x09, 0x64, 0xd9, 0xec, 0x97, 0x77, 0x26, 0x36, 0xb8, 0x1c, 0x2e, - 0xab, 0x07, 0x67, 0x2b, 0x66, 0x6c, 0x27, 0xa2, 0x15, 0x66, 0x29, 0xa5, 0x97, 0x55, 0xb4, 0x76, - 0xd2, 0x30, 0x66, 0x9b, 0x61, 0x23, 0x48, 0x2d, 0xe0, 0x32, 0x9c, 0x6b, 0x57, 0xac, 0xbd, 0xe7, - 0x19, 0xe6, 0x1b, 0x42, 0x82, 0x67, 0x98, 0x2f, 0x88, 0xa3, 0xc2, 0xd5, 0x52, 0x6e, 0x0a, 0x54, - 0xf8, 0x46, 0x26, 0x20, 0x16, 0x64, 0x51, 0xbd, 0x01, 0x5b, 0x7e, 0x50, 0xb5, 0xf5, 0x0a, 0xe4, - 0xa6, 0x7a, 0x01, 0x32, 0xa0, 0xd6, 0x7b, 0x1e, 0x26, 0xf4, 0xd3, 0xea, 0x47, 0x99, 0x07, 0xc5, - 0x6c, 0xef, 0x7e, 0x94, 0x90, 0xab, 0xea, 0xf6, 0x6f, 0xd6, 0x7d, 0x16, 0xa4, 0xfd, 0x04, 0xe9, - 0xb6, 0xba, 0xce, 0x1d, 0x12, 0xda, 0xe8, 0x97, 0x01, 0x76, 0x9b, 0x29, 0x4b, 0xbc, 0xbd, 0x98, - 0x65, 0x21, 0x28, 0x88, 0x1d, 0x8e, 0x25, 0x4b, 0x30, 0xa1, 0x7a, 0xea, 0xe6, 0x5d, 0x9a, 0x52, - 0x8b, 0xa1, 0x9d, 0xac, 0xb3, 0x94, 0x48, 0x6d, 0x60, 0x1e, 0xde, 0x4c, 0xfd, 0x03, 0xe6, 0xc5, - 0xec, 0x80, 0xfa, 0x81, 0x1f, 0xd4, 0x94, 0x91, 0xd3, 0x7c, 0xd7, 0xcd, 0x36, 0x79, 0x50, 0x85, - 0x55, 0x71, 0x78, 0x86, 0x5d, 0xb9, 0x20, 0xd7, 0x8c, 0x2c, 0xd0, 0x1a, 0xdb, 0x96, 0x33, 0xc0, - 0xfd, 0x60, 0x2f, 0xb4, 0x30, 0x79, 0x86, 0x60, 0xb6, 0x8b, 0x94, 0x66, 0xf5, 0x03, 0x98, 0x54, - 0xa7, 0xda, 0x33, 0x07, 0x0b, 0x75, 0xc1, 0x96, 0xf2, 0xcf, 0xff, 0x71, 0x7d, 0xea, 0x1e, 0xe0, - 0xe4, 0xd8, 0x37, 0xa4, 0x0a, 0xa5, 0xec, 0xbe, 0xe5, 0xb0, 0x1f, 0xd4, 0xb5, 0xfe, 0x1b, 0x02, - 0xd2, 0xdd, 0x4c, 0x1f, 0xee, 0x0e, 0x0f, 0xc6, 0xdd, 0xc1, 0x55, 0x80, 0x2d, 0x75, 0x8e, 0xf8, - 0xd5, 0x78, 0x1c, 0xd5, 0x43, 0x5a, 0xdd, 0x7c, 0xc2, 0x2a, 0xfb, 0xdd, 0xf3, 0xdd, 0xe5, 0xe8, - 0x7c, 0x45, 0x1d, 0xfc, 0x0e, 0x3d, 0xe6, 0x2d, 0x7e, 0x4a, 0xeb, 0x7e, 0x55, 0x68, 0x1b, 0x77, - 0xe5, 0x82, 0x6c, 0xaa, 0x9a, 0xb2, 0x1d, 0xfb, 0x15, 0x26, 0x0d, 0x97, 0x60, 0xbc, 0xda, 0x88, - 0x5b, 0x89, 0x2a, 0xb8, 0x7a, 0xdd, 0xc5, 0x74, 0x56, 0x3b, 0x5a, 0x4a, 0x4c, 0xab, 0x11, 0xdf, - 0xcd, 0x6a, 0x87, 0x58, 0x90, 0x73, 0xd9, 0xa3, 0x2e, 0x46, 0x66, 0xdd, 0x21, 0x11, 0x3f, 0x7b, - 0x8b, 0xdb, 0xf7, 0xb5, 0xb6, 0xfb, 0xc7, 0xbb, 0xae, 0x6e, 0x0f, 0x71, 0xbb, 0x86, 0x63, 0xbd, - 0x17, 0x79, 0x4b, 0xf5, 0x8e, 0x2a, 0xe9, 0x3b, 0x29, 0x4d, 0x13, 0xf2, 0x9f, 0x21, 0xd5, 0xf3, - 0x99, 0xbb, 0xda, 0xfa, 0x34, 0x14, 0xa2, 0x46, 0x5c, 0x79, 0x42, 0x13, 0x26, 0xa3, 0x38, 0xe2, - 0xb6, 0x36, 0x30, 0x86, 0x91, 0x06, 0xff, 0x62, 0x48, 0x7c, 0x21, 0x3e, 0xe3, 0x07, 0x00, 0xfc, - 0xaf, 0x27, 0xa2, 0x27, 0xde, 0xd9, 0x89, 0x8d, 0x32, 0x67, 0xf2, 0xcf, 0x97, 0xb3, 0x0b, 0x35, - 0x3f, 0x7d, 0xd2, 0xd8, 0x2d, 0x57, 0xc2, 0x03, 0x47, 0xfd, 0x3c, 0x21, 0xff, 0xac, 0x24, 0xd5, - 0x7d, 0x27, 0x6d, 0x46, 0x2c, 0x29, 0xdf, 0x65, 0x15, 0xb7, 0xc0, 0x35, 0xb8, 0x5c, 0x01, 0x2f, - 0x98, 0xea, 0x47, 0x86, 0x46, 0xc2, 0x23, 0x30, 0x22, 0x4c, 0x15, 0xe5, 0xde, 0x63, 0xbe, 0x85, - 0xab, 0x70, 0x5a, 0x7c, 0xe7, 0xed, 0x36, 0xbd, 0xa8, 0x4e, 0x83, 0xa9, 0x51, 0x11, 0xa5, 0x77, - 0xf3, 0xa3, 0xd4, 0xd5, 0xd7, 0xb2, 0xd0, 0xb6, 0xd1, 0xdc, 0xae, 0xd3, 0xe0, 0x1b, 0x41, 0x1a, - 0x37, 0xdd, 0x62, 0xa3, 0xb5, 0x53, 0xba, 0x03, 0x67, 0x3b, 0x01, 0xf8, 0x2c, 0x0c, 0xef, 0xb3, - 0xa6, 0xca, 0x33, 0xff, 0xa8, 0x4e, 0x5c, 0x83, 0x65, 0x87, 0x45, 0x2c, 0x6e, 0x0e, 0xdd, 0x40, - 0x6b, 0xcf, 0xa7, 0x61, 0x54, 0xd8, 0xc6, 0xcf, 0x10, 0x8c, 0xc9, 0x5f, 0x22, 0xf0, 0x79, 0x0b, - 0x47, 0x09, 0x29, 0x5d, 0xea, 0x09, 0xc9, 0x1c, 0x20, 0x97, 0x7f, 0xf2, 0xf7, 0x7f, 0xff, 0x7c, - 0x68, 0x1e, 0x5f, 0x70, 0x7e, 0x48, 0x2b, 0xfb, 0xb4, 0xee, 0x48, 0xc9, 0x95, 0xbc, 0x9f, 0x75, - 0xf0, 0x73, 0x04, 0x23, 0xe2, 0x0d, 0x9b, 0xb5, 0x18, 0xe0, 0x80, 0xd2, 0x62, 0x0f, 0x80, 0xb6, - 0xbf, 0x29, 0xec, 0xdf, 0xc6, 0xb7, 0xac, 0xf6, 0xc5, 0x5c, 0xe6, 0x1c, 0xca, 0x97, 0xf2, 0xc8, - 0x39, 0x14, 0x3d, 0xd8, 0x91, 0x73, 0x28, 0xba, 0xae, 0x23, 0xfc, 0x53, 0x04, 0xe3, 0x7a, 0xc8, - 0xbd, 0x60, 0x31, 0x9d, 0x81, 0x4a, 0x97, 0xfb, 0x00, 0x69, 0x8e, 0xcb, 0x82, 0xe3, 0x45, 0x4c, - 0x7a, 0x73, 0xc4, 0xbf, 0x45, 0x50, 0x68, 0x4d, 0xc5, 0x17, 0x2d, 0x66, 0x34, 0xea, 0x64, 0x64, - 0x36, 0x04, 0x99, 0x77, 0xf0, 0x4d, 0x2b, 0x99, 0x30, 0x62, 0x81, 0xa7, 0xa2, 0xd6, 0x39, 0x97, - 0x1f, 0xe1, 0x3f, 0x22, 0x18, 0x95, 0x3f, 0x5d, 0xcd, 0xd9, 0x4e, 0x0a, 0x47, 0x94, 0x96, 0x7a, - 0x21, 0x34, 0xb3, 0x6f, 0x0b, 0x66, 0xdb, 0xf8, 0x7d, 0xfb, 0x51, 0xe2, 0x32, 0x39, 0xa4, 0xba, - 0x67, 0xf7, 0x17, 0x08, 0xc6, 0xf5, 0x04, 0x7d, 0xc1, 0x4e, 0x47, 0x80, 0xac, 0x01, 0xed, 0x1c, - 0xb0, 0xc9, 0x0d, 0x41, 0x7b, 0x0d, 0x5f, 0xed, 0x45, 0x5b, 0x56, 0x44, 0xe7, 0x50, 0x87, 0xf1, - 0x97, 0x08, 0x26, 0xda, 0x66, 0xea, 0x45, 0x7b, 0x22, 0x35, 0xb0, 0xe4, 0xf4, 0x09, 0xd4, 0x24, - 0xcb, 0x82, 0xe4, 0x12, 0x5e, 0xe8, 0x8f, 0x24, 0xfe, 0x2b, 0x82, 0xa2, 0x39, 0xe5, 0x2e, 0xd8, - 0x0c, 0xb6, 0x70, 0xa5, 0x72, 0x7f, 0x38, 0xcd, 0x6b, 0x47, 0xf0, 0x7a, 0x80, 0xbf, 0x65, 0xe5, - 0x65, 0xce, 0x75, 0x32, 0xf5, 0x22, 0xbf, 0xdd, 0x12, 0xfe, 0x02, 0xc1, 0x99, 0xce, 0x39, 0x76, - 0xd9, 0x1e, 0x31, 0x13, 0x5b, 0x5a, 0xeb, 0x1f, 0xab, 0x1d, 0x59, 0x15, 0x8e, 0x5c, 0xc6, 0x97, - 0xfa, 0x76, 0x04, 0xff, 0x0e, 0xc1, 0x98, 0x9a, 0x29, 0x6d, 0x35, 0x59, 0x42, 0xac, 0x35, 0xb9, - 0x7d, 0x5c, 0x24, 0xef, 0x0b, 0x2e, 0xdf, 0xc4, 0x5b, 0x56, 0x2e, 0x6a, 0xc6, 0xea, 0x23, 0x9e, - 0x1f, 0x21, 0x00, 0x63, 0x74, 0x9c, 0xb7, 0x87, 0x47, 0xc1, 0x4a, 0x2b, 0x7d, 0xc1, 0x34, 0xe9, - 0x2b, 0x82, 0xf4, 0x02, 0xbe, 0xd8, 0x0f, 0x69, 0xfc, 0x31, 0x82, 0x42, 0x6b, 0x4c, 0xb1, 0x95, - 0x49, 0x8d, 0x2a, 0x5d, 0xe9, 0x07, 0xa5, 0xf9, 0x7c, 0x5d, 0xf0, 0xb9, 0x86, 0x57, 0xed, 0x45, - 0x3b, 0x66, 0xcc, 0x13, 0x93, 0x9d, 0x71, 0xaf, 0x3f, 0x46, 0x00, 0xc6, 0xf0, 0x38, 0xdf, 0xa3, - 0x29, 0x90, 0x30, 0x6b, 0xbc, 0x8e, 0x4f, 0x8b, 0xe4, 0xab, 0x82, 0xdf, 0x55, 0x5c, 0xb6, 0xf2, - 0xe3, 0x7f, 0xfd, 0xa0, 0x66, 0x90, 0x7b, 0x8e, 0x60, 0x5c, 0xcf, 0x92, 0x17, 0xac, 0xcf, 0xac, - 0x04, 0x59, 0xab, 0x61, 0xe7, 0xb0, 0x49, 0xbe, 0x26, 0x68, 0xad, 0x62, 0xa7, 0xc7, 0x5b, 0x17, - 0x54, 0xc5, 0xf3, 0xa2, 0x0f, 0x1d, 0xaf, 0x38, 0xf8, 0x1e, 0x4b, 0x3b, 0x27, 0x50, 0xdb, 0xbd, - 0xed, 0xc0, 0x5a, 0xef, 0x6d, 0x97, 0x39, 0x95, 0xdc, 0x15, 0x7c, 0xef, 0xe0, 0x77, 0xac, 0x7c, - 0x6b, 0x2c, 0xf5, 0x2a, 0x42, 0x83, 0x97, 0x9b, 0xf1, 0x5f, 0x21, 0x80, 0x7b, 0x2c, 0xcd, 0xa6, - 0x59, 0x62, 0xed, 0x9f, 0x04, 0xa6, 0xb4, 0xdc, 0x1b, 0xa3, 0x49, 0xde, 0x12, 0x24, 0xaf, 0xe3, - 0x6b, 0x3d, 0x49, 0x46, 0xb4, 0xe9, 0x55, 0x69, 0x4a, 0x0d, 0x6e, 0x7f, 0x46, 0x80, 0x73, 0x26, - 0xc5, 0x95, 0xde, 0xad, 0xaa, 0x01, 0x2f, 0x5d, 0x3f, 0x11, 0xfc, 0x84, 0xcc, 0xcd, 0xd9, 0xd1, - 0x60, 0xfe, 0x27, 0x04, 0x6f, 0xe7, 0x8f, 0xb9, 0x57, 0xed, 0xb5, 0x25, 0x87, 0xff, 0x8d, 0x93, - 0x4a, 0x9c, 0xb0, 0xb2, 0x9b, 0x2e, 0xe0, 0x4f, 0x10, 0x9c, 0xe9, 0x9c, 0x33, 0x97, 0x7b, 0x74, - 0xb4, 0x06, 0xd6, 0x7a, 0x90, 0xbb, 0xcc, 0x9d, 0x7d, 0xd6, 0x03, 0x7e, 0xe7, 0xbc, 0x86, 0x10, - 0xf7, 0x2a, 0x82, 0xd7, 0xef, 0x11, 0x80, 0x31, 0x95, 0xce, 0x5b, 0x5b, 0x9f, 0x0c, 0x66, 0x2d, - 0x56, 0xc7, 0xc7, 0xd3, 0x3e, 0xbb, 0x74, 0x31, 0xb4, 0x4a, 0x5a, 0xce, 0x61, 0x36, 0x0b, 0x1f, - 0x39, 0x87, 0x62, 0xfa, 0x3d, 0xc2, 0x7f, 0xe0, 0xcf, 0x7a, 0xfb, 0xbc, 0x69, 0x7f, 0xd6, 0xdb, - 0xb1, 0xf6, 0x67, 0x3d, 0x7f, 0x12, 0x26, 0xd7, 0x05, 0x71, 0x07, 0xaf, 0xd8, 0x9f, 0x75, 0x39, - 0x2d, 0xb6, 0xda, 0xa7, 0x5f, 0x23, 0x98, 0x30, 0xe7, 0x3d, 0x6b, 0x67, 0x67, 0x02, 0xad, 0x9d, - 0x5d, 0xde, 0x04, 0x49, 0xd6, 0x04, 0xc3, 0x2b, 0x78, 0xb9, 0xe7, 0x3b, 0x40, 0x6b, 0xcc, 0xe3, - 0xcd, 0x47, 0xb2, 0xf1, 0xde, 0xa7, 0xaf, 0x66, 0xd0, 0x67, 0xaf, 0x66, 0xd0, 0xbf, 0x5e, 0xcd, - 0xa0, 0x8f, 0x5e, 0xcf, 0x9c, 0xfa, 0xec, 0xf5, 0xcc, 0xa9, 0x7f, 0xbc, 0x9e, 0x39, 0xf5, 0xc1, - 0x9a, 0x31, 0x2d, 0x4b, 0x7d, 0xef, 0xd1, 0xdd, 0xa4, 0x5d, 0xe7, 0x8f, 0xb5, 0x56, 0x31, 0x3d, - 0xef, 0x8e, 0x89, 0xff, 0x9a, 0x5f, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0x71, 0x89, - 0x57, 0x6a, 0x20, 0x00, 0x00, + // 2102 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdf, 0x6f, 0x5c, 0x47, + 0xf5, 0xcf, 0xf8, 0x57, 0xbd, 0x67, 0x9d, 0x3a, 0xdf, 0xa9, 0x9b, 0xaf, 0x59, 0x05, 0xdb, 0x99, + 0xf8, 0x57, 0x9c, 0x78, 0x6f, 0xec, 0x90, 0x12, 0x92, 0x26, 0x6a, 0xec, 0xe0, 0x10, 0xd1, 0x10, + 0x67, 0xad, 0xa8, 0x50, 0x24, 0x96, 0xf1, 0xee, 0x78, 0x73, 0xf1, 0xfa, 0xde, 0xdb, 0x7b, 0xef, + 0x06, 0x56, 0x96, 0x5f, 0xc8, 0x0b, 0x48, 0x3c, 0x54, 0x42, 0x45, 0x50, 0x21, 0x81, 0x50, 0x55, + 0xa8, 0xc4, 0x0b, 0x2f, 0x80, 0xf8, 0x0b, 0xfa, 0x46, 0x25, 0x5e, 0x80, 0x87, 0x0a, 0x25, 0xf0, + 0x7f, 0xa0, 0xf9, 0xb9, 0xb3, 0xeb, 0xbb, 0xb3, 0xeb, 0x6a, 0x11, 0x3c, 0x79, 0x67, 0xee, 0xe7, + 0x9c, 0xf3, 0x39, 0x67, 0xce, 0xcc, 0x99, 0x33, 0x32, 0xcc, 0x55, 0x68, 0xe0, 0x07, 0xac, 0x5c, + 0x79, 0x42, 0xfd, 0xc0, 0x4b, 0xd2, 0x30, 0xa6, 0x35, 0xe6, 0xbd, 0xd3, 0x60, 0x71, 0xb3, 0x18, + 0xc5, 0x61, 0x1a, 0xe2, 0x29, 0x1b, 0x51, 0x54, 0x88, 0xc2, 0x54, 0x2d, 0xac, 0x85, 0x02, 0xe0, + 0xf1, 0x5f, 0x12, 0x5b, 0x38, 0x57, 0x0b, 0xc3, 0x5a, 0x9d, 0x79, 0x34, 0xf2, 0x3d, 0x1a, 0x04, + 0x61, 0x4a, 0x53, 0x3f, 0x0c, 0x12, 0xf5, 0x75, 0xa5, 0x12, 0x26, 0x07, 0x61, 0xe2, 0xed, 0xd2, + 0x44, 0x99, 0xf0, 0x9e, 0xae, 0xed, 0xb2, 0x94, 0xae, 0x79, 0x11, 0xad, 0xf9, 0x81, 0x00, 0x2b, + 0xec, 0xf9, 0x4c, 0x5e, 0x11, 0x8d, 0xe9, 0x81, 0x56, 0xb7, 0x94, 0x09, 0xa1, 0x95, 0xd4, 0x7f, + 0xca, 0xca, 0x55, 0x46, 0xeb, 0x1a, 0x38, 0x9f, 0xad, 0x2b, 0x0e, 0x9f, 0xfa, 0x55, 0x16, 0xbb, + 0xd5, 0x45, 0xb4, 0x79, 0xc0, 0x82, 0xb4, 0xec, 0x07, 0x7b, 0xca, 0x49, 0x72, 0x1a, 0xf2, 0x8f, + 0x38, 0xf9, 0x6d, 0x41, 0x86, 0x3c, 0x82, 0x57, 0xac, 0x61, 0x89, 0x25, 0x51, 0x18, 0x24, 0x0c, + 0xdf, 0x80, 0x31, 0xc9, 0x76, 0x1a, 0xcd, 0xa1, 0xe5, 0xfc, 0xfa, 0xb9, 0x62, 0x56, 0x1c, 0x8b, + 0x52, 0x6a, 0x63, 0xe4, 0xe3, 0x4f, 0x67, 0x4f, 0x95, 0x94, 0x04, 0x39, 0x04, 0x90, 0x2a, 0xe3, + 0x30, 0xdc, 0xc3, 0x17, 0xe1, 0x8c, 0xe6, 0x5a, 0xa6, 0xd5, 0x6a, 0xcc, 0x12, 0xa9, 0x33, 0x57, + 0x9a, 0xd4, 0xf3, 0x77, 0xe4, 0x34, 0x3e, 0x0b, 0x63, 0x07, 0x2c, 0xde, 0xaf, 0xb3, 0xe9, 0xa1, + 0x39, 0xb4, 0x3c, 0x51, 0x52, 0x23, 0x3c, 0x05, 0xa3, 0xe1, 0x77, 0x03, 0x16, 0x4f, 0x0f, 0x0b, + 0x39, 0x39, 0xe0, 0xb3, 0x49, 0x4a, 0xe3, 0x74, 0x7a, 0x64, 0x0e, 0x2d, 0x0f, 0x97, 0xe4, 0x80, + 0x3c, 0x02, 0xdc, 0x32, 0x6e, 0xdc, 0xb9, 0x09, 0xa3, 0x11, 0x9f, 0x50, 0xde, 0xcc, 0x66, 0x7b, + 0xb3, 0xe5, 0xd7, 0x99, 0x90, 0x53, 0x0e, 0x49, 0x19, 0xf2, 0x43, 0x04, 0x53, 0x2d, 0x9d, 0xc9, + 0x46, 0x53, 0xf3, 0x3d, 0x81, 0x6b, 0x5b, 0x00, 0xad, 0x24, 0x11, 0xee, 0xe5, 0xd7, 0x17, 0x8b, + 0x32, 0xa3, 0x8a, 0x3c, 0xa3, 0x8a, 0x32, 0x69, 0x55, 0x46, 0x15, 0xb7, 0x69, 0x8d, 0x95, 0xd8, + 0x3b, 0x0d, 0x96, 0xa4, 0x25, 0x4b, 0x92, 0x7c, 0x88, 0xe0, 0x5c, 0x16, 0x17, 0xe3, 0xe9, 0x2d, + 0x18, 0x13, 0xac, 0x39, 0x93, 0xe1, 0xfe, 0x5d, 0x55, 0x42, 0xf8, 0x5e, 0x06, 0xcf, 0xa5, 0x9e, + 0x3c, 0xa5, 0xed, 0x36, 0xa2, 0x5f, 0x87, 0x97, 0x05, 0xcf, 0x3b, 0xf5, 0xba, 0xa4, 0xda, 0x11, + 0x02, 0xf4, 0x99, 0x43, 0xf0, 0x4b, 0x04, 0x67, 0xdb, 0x55, 0xff, 0xcf, 0x39, 0xff, 0x10, 0x72, + 0x82, 0x21, 0x37, 0x64, 0x65, 0x35, 0xca, 0xce, 0xea, 0xa1, 0xcc, 0xac, 0x1e, 0xb6, 0xb3, 0x7a, + 0x1b, 0xfe, 0xcf, 0x28, 0xb4, 0x92, 0x7a, 0x64, 0xcf, 0x57, 0x6a, 0xf3, 0xeb, 0xe7, 0xb3, 0x7d, + 0x7d, 0x1c, 0xf8, 0x7b, 0x3e, 0xab, 0x72, 0x41, 0xe5, 0xad, 0x10, 0x22, 0x6f, 0xc1, 0x69, 0x1d, + 0x44, 0xfe, 0x6d, 0x70, 0xcb, 0xf3, 0x0c, 0xa9, 0x95, 0x7f, 0x18, 0xb1, 0x40, 0xaa, 0xfe, 0x2f, + 0xec, 0x93, 0x5f, 0x20, 0x78, 0xb5, 0xcd, 0x3f, 0x2b, 0x47, 0x46, 0x79, 0x00, 0x74, 0x8a, 0xf4, + 0x1d, 0x36, 0x29, 0x35, 0xb8, 0x1c, 0xb9, 0xa8, 0x16, 0x60, 0x5b, 0x45, 0x00, 0x4f, 0xc3, 0x4b, + 0xed, 0xc1, 0xd1, 0x43, 0xf2, 0xb6, 0xf2, 0x45, 0x43, 0x8d, 0x2f, 0x77, 0x60, 0x5c, 0x07, 0xd0, + 0x7d, 0xb2, 0x69, 0x49, 0x7d, 0x54, 0x1b, 0x31, 0xf2, 0x4d, 0x95, 0x59, 0x72, 0x33, 0x49, 0xd0, + 0xc0, 0x72, 0xe1, 0x23, 0x04, 0x9f, 0x3b, 0xa6, 0xdd, 0xb0, 0xdf, 0x84, 0x9c, 0xa9, 0x62, 0xee, + 0x0d, 0xdb, 0x49, 0xbf, 0x25, 0x37, 0xb8, 0xf5, 0x08, 0xe0, 0x8c, 0xa4, 0x9a, 0xa6, 0x2c, 0x91, + 0x95, 0x9f, 0x6f, 0x5d, 0x6e, 0x49, 0x45, 0x37, 0x57, 0x52, 0xa3, 0x81, 0x14, 0x2a, 0x1f, 0xa6, + 0x3b, 0xed, 0x99, 0xc8, 0x3c, 0x80, 0x3c, 0x6d, 0x4d, 0xab, 0x05, 0x58, 0xc8, 0x8e, 0x8d, 0x25, + 0xbf, 0x15, 0xc6, 0x07, 0x2a, 0x42, 0xb6, 0x3c, 0xf9, 0x96, 0xaa, 0x5f, 0x77, 0xea, 0x75, 0x0b, + 0x3d, 0xb8, 0x65, 0xfe, 0xa3, 0x2e, 0x4a, 0x1d, 0x06, 0x8c, 0x3f, 0x0f, 0x61, 0xc2, 0xe2, 0xa3, + 0x17, 0xfb, 0x44, 0x0e, 0xb5, 0x29, 0x18, 0xdc, 0xaa, 0xfb, 0xea, 0x36, 0x54, 0x62, 0x51, 0x18, + 0xa7, 0xff, 0xd1, 0x05, 0x7f, 0xac, 0x6e, 0x5a, 0xd2, 0x94, 0x89, 0xcd, 0x6d, 0x18, 0x8b, 0xc5, + 0x8c, 0x5a, 0x80, 0xb9, 0xec, 0xa8, 0x48, 0x29, 0x2b, 0x20, 0x4a, 0x8a, 0x7c, 0x03, 0x26, 0x75, + 0xec, 0x25, 0x66, 0x70, 0xeb, 0xfa, 0x01, 0x82, 0xff, 0xef, 0xd0, 0x6d, 0x68, 0xbf, 0x01, 0x2f, + 0x49, 0x02, 0x7a, 0x35, 0xfb, 0xe5, 0xad, 0xc5, 0x06, 0xb7, 0x86, 0x2b, 0xaa, 0xe0, 0x6c, 0xc5, + 0x8c, 0xed, 0x44, 0xb4, 0xc2, 0x1c, 0x47, 0xe9, 0x25, 0x15, 0xad, 0x9d, 0x34, 0x8c, 0xd9, 0x66, + 0xd8, 0x08, 0x52, 0x07, 0xb8, 0xa8, 0x2e, 0x1a, 0x46, 0xb1, 0xf1, 0x9e, 0xaf, 0x30, 0x9f, 0x10, + 0x12, 0x7c, 0x85, 0xf9, 0x80, 0x78, 0x2a, 0x5c, 0x2d, 0xe5, 0xb6, 0x40, 0x85, 0x4f, 0x68, 0x01, + 0x31, 0x20, 0x4b, 0xaa, 0x06, 0x6c, 0xf9, 0x41, 0xd5, 0x75, 0x57, 0x20, 0x37, 0x54, 0x05, 0xd0, + 0x40, 0xa3, 0xf7, 0x3c, 0x4c, 0x98, 0xd2, 0xea, 0x47, 0xda, 0x83, 0xbc, 0x9e, 0xbb, 0x1f, 0x25, + 0xe4, 0x8a, 0xda, 0xfd, 0x9b, 0x75, 0x9f, 0x05, 0x69, 0x3f, 0x41, 0xba, 0xa5, 0xb6, 0x73, 0x87, + 0x84, 0x31, 0xfa, 0x79, 0x80, 0xdd, 0x66, 0xca, 0x92, 0xf2, 0x5e, 0xcc, 0x74, 0x08, 0x72, 0x62, + 0x86, 0x63, 0xc9, 0x32, 0x4c, 0xa8, 0x96, 0xa2, 0x79, 0x97, 0xa6, 0xd4, 0x61, 0x68, 0x47, 0x5f, + 0xac, 0x25, 0xd2, 0x18, 0x58, 0x80, 0x97, 0x53, 0xff, 0x80, 0x95, 0x63, 0x76, 0x40, 0xfd, 0xc0, + 0x0f, 0x6a, 0xca, 0xc8, 0x69, 0x3e, 0x5b, 0xd2, 0x93, 0x3c, 0xa8, 0xc2, 0xaa, 0x48, 0x9e, 0xe1, + 0x92, 0x1c, 0x90, 0xab, 0xd6, 0x2a, 0xd0, 0x1a, 0xdb, 0x96, 0x2d, 0xd0, 0xfd, 0x60, 0x2f, 0x74, + 0x30, 0x79, 0x86, 0x60, 0xb6, 0x8b, 0x94, 0x61, 0xf5, 0x6d, 0x98, 0x52, 0x59, 0x5d, 0xb6, 0xfb, + 0x2a, 0xb5, 0xc1, 0x96, 0xb3, 0xf3, 0xff, 0xb8, 0x3e, 0xb5, 0x0f, 0x70, 0x72, 0xec, 0x0b, 0xa9, + 0x42, 0x41, 0xef, 0xb7, 0x0c, 0xf6, 0x83, 0xda, 0xd6, 0x7f, 0x46, 0x40, 0xba, 0x9b, 0xe9, 0xc3, + 0xdd, 0xe1, 0xc1, 0xb8, 0x3b, 0xb8, 0x13, 0x60, 0x4b, 0xe5, 0x11, 0xdf, 0x1a, 0x8f, 0xa3, 0x7a, + 0x48, 0xab, 0x9b, 0x4f, 0x58, 0x65, 0xbf, 0xfb, 0x7a, 0x77, 0x49, 0x9d, 0x2f, 0xa8, 0xc4, 0xef, + 0xd0, 0x63, 0xef, 0xe2, 0xa7, 0xb4, 0xee, 0x57, 0x85, 0xb6, 0xf1, 0x92, 0x1c, 0x90, 0x4d, 0x75, + 0xa6, 0x6c, 0xc7, 0x7e, 0x85, 0x49, 0xc3, 0x05, 0x18, 0xaf, 0x36, 0xe2, 0xd6, 0x42, 0xe5, 0x4a, + 0x66, 0xdc, 0xc5, 0xb4, 0x3e, 0x3b, 0x5a, 0x4a, 0x6c, 0xab, 0x11, 0x9f, 0xd5, 0x67, 0x87, 0x18, + 0x90, 0xb3, 0xba, 0xa8, 0x8b, 0x17, 0x03, 0x73, 0x43, 0x22, 0xbe, 0xae, 0xc5, 0xed, 0xf3, 0x46, + 0xdb, 0xfd, 0xe3, 0xb7, 0xae, 0x6e, 0x85, 0xb8, 0x5d, 0xc3, 0xb1, 0xbb, 0x17, 0x79, 0x45, 0xdd, + 0x1d, 0xd5, 0xa2, 0xef, 0xa4, 0x34, 0x4d, 0xc8, 0xbf, 0x86, 0xd4, 0x9d, 0xcf, 0x9e, 0x35, 0xd6, + 0xcf, 0x41, 0x2e, 0x6a, 0xc4, 0x95, 0x27, 0x34, 0x61, 0x32, 0x8a, 0x23, 0xa5, 0xd6, 0x04, 0xc6, + 0x30, 0xd2, 0xe0, 0x1f, 0x86, 0xc4, 0x07, 0xf1, 0x1b, 0x3f, 0x00, 0xe0, 0x7f, 0xcb, 0x22, 0x7a, + 0xa2, 0xce, 0x4e, 0x6c, 0x14, 0x39, 0x93, 0xbf, 0x7f, 0x3a, 0xbb, 0x58, 0xf3, 0xd3, 0x27, 0x8d, + 0xdd, 0x62, 0x25, 0x3c, 0xf0, 0xd4, 0xeb, 0x8c, 0xfc, 0xb3, 0x9a, 0x54, 0xf7, 0xbd, 0xb4, 0x19, + 0xb1, 0xa4, 0x78, 0x97, 0x55, 0x4a, 0x39, 0xae, 0xa1, 0xc4, 0x15, 0xf0, 0x03, 0x53, 0xbd, 0xb1, + 0x34, 0x12, 0x1e, 0x81, 0x11, 0x61, 0x2a, 0x2f, 0xe7, 0x1e, 0xf3, 0x29, 0x5c, 0x85, 0xd3, 0xe2, + 0x5b, 0x79, 0xb7, 0x59, 0x8e, 0xea, 0x34, 0x98, 0x1e, 0x15, 0x51, 0x7a, 0x23, 0x3b, 0x4a, 0x5d, + 0x7d, 0x2d, 0x0a, 0x6d, 0x1b, 0xcd, 0xed, 0x3a, 0x0d, 0xbe, 0x1c, 0xa4, 0x71, 0xb3, 0x94, 0x6f, + 0xb4, 0x66, 0x0a, 0xb7, 0xe1, 0x4c, 0x27, 0x00, 0x9f, 0x81, 0xe1, 0x7d, 0xd6, 0x54, 0xeb, 0xcc, + 0x7f, 0xaa, 0x8c, 0x6b, 0x30, 0x9d, 0x2c, 0x62, 0x70, 0x63, 0xe8, 0x3a, 0x5a, 0xff, 0xdb, 0x0c, + 0x8c, 0x0a, 0xdb, 0xf8, 0x19, 0x82, 0x31, 0xf9, 0x10, 0x83, 0xcf, 0x3b, 0x38, 0x4a, 0x48, 0xe1, + 0x62, 0x4f, 0x88, 0x76, 0x80, 0x5c, 0xfa, 0xfe, 0x5f, 0xfe, 0xf9, 0xe3, 0xa1, 0x05, 0x7c, 0xc1, + 0xfb, 0x0e, 0xad, 0xec, 0xd3, 0xba, 0x27, 0x25, 0x57, 0xb3, 0x5e, 0xb5, 0xf0, 0x7b, 0x08, 0x46, + 0x44, 0x0d, 0x9b, 0x75, 0x18, 0xe0, 0x80, 0xc2, 0x52, 0x0f, 0x80, 0xb1, 0xbf, 0x29, 0xec, 0xdf, + 0xc2, 0x37, 0x9d, 0xf6, 0x45, 0x5f, 0xe6, 0x1d, 0xca, 0x4a, 0x79, 0xe4, 0x1d, 0x8a, 0x3b, 0xd8, + 0x91, 0x77, 0x28, 0x6e, 0x5d, 0x47, 0xf8, 0x07, 0x08, 0xc6, 0x4d, 0x93, 0x7b, 0xc1, 0x61, 0x5a, + 0x83, 0x0a, 0x97, 0xfa, 0x00, 0x19, 0x8e, 0x2b, 0x82, 0xe3, 0x3c, 0x26, 0xbd, 0x39, 0xe2, 0x5f, + 0x21, 0xc8, 0xb5, 0xba, 0xe2, 0x79, 0x87, 0x19, 0x83, 0x3a, 0x19, 0x99, 0x0d, 0x41, 0xe6, 0x75, + 0x7c, 0xc3, 0x49, 0x26, 0x8c, 0x58, 0x50, 0x56, 0x51, 0xeb, 0xec, 0xcb, 0x8f, 0xf0, 0x6f, 0x11, + 0x8c, 0xca, 0x97, 0xbb, 0x39, 0x57, 0xa6, 0x70, 0x44, 0x61, 0xb9, 0x17, 0xc2, 0x30, 0x7b, 0x4b, + 0x30, 0x7b, 0x84, 0x1f, 0xba, 0x53, 0x49, 0xbc, 0xc3, 0x64, 0xb0, 0xea, 0xbe, 0xbc, 0x3f, 0x42, + 0x90, 0x6b, 0xbd, 0x31, 0xcd, 0xbb, 0xa3, 0x25, 0x51, 0x85, 0xcb, 0xfd, 0xa0, 0x4e, 0xba, 0x0b, + 0x24, 0x81, 0xdf, 0x21, 0x98, 0xec, 0x7c, 0x26, 0x5c, 0xe9, 0x15, 0xa5, 0x16, 0xb6, 0xb0, 0xde, + 0x3f, 0xd6, 0x10, 0xbc, 0x2d, 0x08, 0x5e, 0xc7, 0xaf, 0x7d, 0xb6, 0xd8, 0xe2, 0x9f, 0x20, 0x18, + 0x37, 0xaf, 0x10, 0x17, 0xdc, 0x04, 0x04, 0xc8, 0x99, 0x94, 0x9d, 0x8f, 0x14, 0xe4, 0xba, 0xa0, + 0xb7, 0x8e, 0xaf, 0xf4, 0xa2, 0x27, 0xab, 0x8a, 0x77, 0x68, 0x88, 0xfd, 0x14, 0xc1, 0x44, 0xdb, + 0xbb, 0xc4, 0x52, 0xcf, 0x85, 0x93, 0xc0, 0x82, 0xd7, 0x27, 0xd0, 0x90, 0x2c, 0x0a, 0x92, 0xcb, + 0x78, 0xb1, 0x3f, 0x92, 0xf8, 0x4f, 0x08, 0xf2, 0xf6, 0x4b, 0xc1, 0xa2, 0xcb, 0x60, 0x0b, 0x57, + 0x28, 0xf6, 0x87, 0x33, 0xbc, 0x76, 0x04, 0xaf, 0x07, 0xf8, 0xab, 0x4e, 0x5e, 0x76, 0x6f, 0x2c, + 0x57, 0x58, 0x6c, 0x91, 0x6e, 0x7b, 0xe6, 0x03, 0x04, 0x93, 0x9d, 0x6f, 0x01, 0x2b, 0xee, 0x88, + 0xd9, 0x58, 0x67, 0x92, 0x76, 0x79, 0x02, 0x20, 0x6b, 0xc2, 0x91, 0x4b, 0xf8, 0x62, 0xdf, 0x8e, + 0xe0, 0x0f, 0x11, 0x8c, 0xa9, 0xbe, 0xdc, 0x55, 0xd7, 0x24, 0xc4, 0x59, 0xd7, 0xda, 0x5b, 0x6e, + 0xf2, 0x35, 0xc1, 0xe5, 0x2b, 0x78, 0xcb, 0xc9, 0x45, 0xf5, 0xa9, 0x7d, 0xc4, 0xf3, 0x5d, 0x04, + 0x60, 0xb5, 0xdf, 0x0b, 0xee, 0xf0, 0x28, 0x58, 0x61, 0xb5, 0x2f, 0x98, 0x21, 0x7d, 0x59, 0x90, + 0x5e, 0xc4, 0xf3, 0xfd, 0x90, 0xc6, 0xef, 0x23, 0xc8, 0xb5, 0x5a, 0x3d, 0xd7, 0xb1, 0x68, 0x50, + 0xce, 0x63, 0xf1, 0x58, 0x13, 0x48, 0xbe, 0x24, 0xf8, 0x5c, 0xc5, 0x6b, 0xee, 0xc2, 0x17, 0x33, + 0x56, 0x16, 0xdd, 0xb1, 0xb5, 0xaf, 0xdf, 0x47, 0x00, 0x56, 0x03, 0xbe, 0xd0, 0xe3, 0x62, 0x25, + 0x61, 0xce, 0x78, 0x1d, 0xef, 0xb8, 0xc9, 0x6b, 0x82, 0xdf, 0x15, 0x5c, 0x74, 0xf2, 0xe3, 0x7f, + 0xfd, 0xa0, 0x66, 0x91, 0x7b, 0x0f, 0xc1, 0xb8, 0xe9, 0xc7, 0x2f, 0x38, 0xaf, 0x2a, 0x12, 0xe4, + 0x3c, 0x0d, 0x3b, 0x1b, 0x76, 0xf2, 0x45, 0x41, 0x6b, 0x0d, 0x7b, 0x3d, 0xee, 0x0b, 0x41, 0x55, + 0x94, 0x68, 0x93, 0x74, 0xfc, 0xc4, 0xc1, 0xf7, 0x58, 0xda, 0xd9, 0xc5, 0xbb, 0xf6, 0x6d, 0x07, + 0xd6, 0xb9, 0x6f, 0xbb, 0xf4, 0xfa, 0xe4, 0xae, 0xe0, 0x7b, 0x1b, 0xbf, 0xee, 0xe4, 0x5b, 0x63, + 0x69, 0xb9, 0x22, 0x34, 0x94, 0x33, 0x57, 0xfc, 0x67, 0x08, 0xe0, 0x1e, 0x4b, 0xf5, 0x8b, 0x00, + 0x71, 0xde, 0x41, 0x05, 0xa6, 0xb0, 0xd2, 0x1b, 0x63, 0x48, 0xde, 0x14, 0x24, 0xaf, 0xe1, 0xab, + 0x3d, 0x49, 0x46, 0xb4, 0x59, 0xae, 0xd2, 0x94, 0x5a, 0xdc, 0xfe, 0x80, 0x00, 0x67, 0x74, 0xdb, + 0xab, 0xbd, 0xaf, 0xfb, 0x16, 0xbc, 0x70, 0xed, 0x44, 0xf0, 0x13, 0x32, 0xb7, 0xfb, 0x6f, 0x8b, + 0xf9, 0xef, 0x11, 0xbc, 0x9a, 0xfd, 0x54, 0x70, 0xc5, 0x7d, 0xb6, 0x64, 0xf0, 0xbf, 0x7e, 0x52, + 0x89, 0x13, 0x9e, 0xec, 0xb6, 0x0b, 0xf8, 0x23, 0x04, 0x93, 0x9d, 0xbd, 0xfa, 0x4a, 0x8f, 0xae, + 0xc0, 0xc2, 0x3a, 0x13, 0xb9, 0x4b, 0xef, 0xde, 0xe7, 0x79, 0xc0, 0xf7, 0x5c, 0xb9, 0x21, 0xc4, + 0xcb, 0x15, 0xc1, 0xeb, 0xd7, 0x08, 0xc0, 0xea, 0xec, 0x17, 0x9c, 0x57, 0x1f, 0x0d, 0x73, 0x1e, + 0x56, 0xc7, 0x5b, 0xfc, 0x3e, 0x3b, 0x1d, 0xd1, 0xf8, 0x4b, 0x5a, 0xde, 0xa1, 0x7e, 0x4f, 0x38, + 0xf2, 0x0e, 0xc5, 0x0b, 0xc2, 0x11, 0xfe, 0x0d, 0x2f, 0xeb, 0xed, 0x3d, 0xbb, 0xbb, 0xac, 0xb7, + 0x63, 0xdd, 0x65, 0x3d, 0xfb, 0x35, 0x81, 0x5c, 0x13, 0xc4, 0x3d, 0xbc, 0xea, 0x2e, 0xeb, 0xb2, + 0xe3, 0x6e, 0x5d, 0x9f, 0x7e, 0x8e, 0x60, 0xc2, 0xee, 0x99, 0x9d, 0x37, 0x3b, 0x1b, 0xe8, 0xbc, + 0xd9, 0x65, 0x75, 0xe1, 0x64, 0x5d, 0x30, 0xbc, 0x8c, 0x57, 0x7a, 0xd6, 0x01, 0x5a, 0x63, 0x65, + 0x7e, 0xf9, 0x48, 0x36, 0xde, 0xfc, 0xf8, 0xf9, 0x0c, 0xfa, 0xe4, 0xf9, 0x0c, 0xfa, 0xc7, 0xf3, + 0x19, 0xf4, 0xee, 0x8b, 0x99, 0x53, 0x9f, 0xbc, 0x98, 0x39, 0xf5, 0xd7, 0x17, 0x33, 0xa7, 0xde, + 0x5e, 0xb7, 0x5e, 0x1c, 0xa4, 0xbe, 0x37, 0xe9, 0x6e, 0xd2, 0xae, 0xf3, 0x7b, 0x46, 0xab, 0x78, + 0x81, 0xd8, 0x1d, 0x13, 0xff, 0x78, 0x71, 0xf5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0xfa, + 0xd7, 0x47, 0xad, 0x22, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2393,8 +2496,12 @@ type QueryClient interface { AllFiles(ctx context.Context, in *QueryAllFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) // Queries a list of open files. OpenFiles(ctx context.Context, in *QueryOpenFiles, opts ...grpc.CallOption) (*QueryAllFilesResponse, error) - // Queries a list of Proofs. + // Queries a Proof. Proof(ctx context.Context, in *QueryProof, opts ...grpc.CallOption) (*QueryProofResponse, error) + // Queries a list of Proofs. + AllProofs(ctx context.Context, in *QueryAllProofs, opts ...grpc.CallOption) (*QueryAllProofsResponse, error) + // Queries a list of Proofs. + ProofsByAddress(ctx context.Context, in *QueryProofsByAddress, opts ...grpc.CallOption) (*QueryProofsByAddressResponse, error) // Queries a Providers by index. Provider(ctx context.Context, in *QueryProvider, opts ...grpc.CallOption) (*QueryProviderResponse, error) // Queries a list of Providers items. @@ -2484,6 +2591,24 @@ func (c *queryClient) Proof(ctx context.Context, in *QueryProof, opts ...grpc.Ca return out, nil } +func (c *queryClient) AllProofs(ctx context.Context, in *QueryAllProofs, opts ...grpc.CallOption) (*QueryAllProofsResponse, error) { + out := new(QueryAllProofsResponse) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/AllProofs", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) ProofsByAddress(ctx context.Context, in *QueryProofsByAddress, opts ...grpc.CallOption) (*QueryProofsByAddressResponse, error) { + out := new(QueryProofsByAddressResponse) + err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/ProofsByAddress", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) Provider(ctx context.Context, in *QueryProvider, opts ...grpc.CallOption) (*QueryProviderResponse, error) { out := new(QueryProviderResponse) err := c.cc.Invoke(ctx, "/canine_chain.storage.Query/Provider", in, out, opts...) @@ -2647,8 +2772,12 @@ type QueryServer interface { AllFiles(context.Context, *QueryAllFiles) (*QueryAllFilesResponse, error) // Queries a list of open files. OpenFiles(context.Context, *QueryOpenFiles) (*QueryAllFilesResponse, error) - // Queries a list of Proofs. + // Queries a Proof. Proof(context.Context, *QueryProof) (*QueryProofResponse, error) + // Queries a list of Proofs. + AllProofs(context.Context, *QueryAllProofs) (*QueryAllProofsResponse, error) + // Queries a list of Proofs. + ProofsByAddress(context.Context, *QueryProofsByAddress) (*QueryProofsByAddressResponse, error) // Queries a Providers by index. Provider(context.Context, *QueryProvider) (*QueryProviderResponse, error) // Queries a list of Providers items. @@ -2704,6 +2833,12 @@ func (*UnimplementedQueryServer) OpenFiles(ctx context.Context, req *QueryOpenFi func (*UnimplementedQueryServer) Proof(ctx context.Context, req *QueryProof) (*QueryProofResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proof not implemented") } +func (*UnimplementedQueryServer) AllProofs(ctx context.Context, req *QueryAllProofs) (*QueryAllProofsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllProofs not implemented") +} +func (*UnimplementedQueryServer) ProofsByAddress(ctx context.Context, req *QueryProofsByAddress) (*QueryProofsByAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ProofsByAddress not implemented") +} func (*UnimplementedQueryServer) Provider(ctx context.Context, req *QueryProvider) (*QueryProviderResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Provider not implemented") } @@ -2850,6 +2985,42 @@ func _Query_Proof_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _Query_AllProofs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllProofs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).AllProofs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/canine_chain.storage.Query/AllProofs", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).AllProofs(ctx, req.(*QueryAllProofs)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_ProofsByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryProofsByAddress) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).ProofsByAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/canine_chain.storage.Query/ProofsByAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).ProofsByAddress(ctx, req.(*QueryProofsByAddress)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_Provider_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryProvider) if err := dec(in); err != nil { @@ -3180,6 +3351,14 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Proof", Handler: _Query_Proof_Handler, }, + { + MethodName: "AllProofs", + Handler: _Query_AllProofs_Handler, + }, + { + MethodName: "ProofsByAddress", + Handler: _Query_ProofsByAddress_Handler, + }, { MethodName: "Provider", Handler: _Query_Provider_Handler, @@ -3465,10 +3644,94 @@ func (m *QueryProofsByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, e i-- dAtA[i] = 0x12 } - if len(m.Proof) > 0 { - for iNdEx := len(m.Proof) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Proofs) > 0 { + for iNdEx := len(m.Proofs) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Proof[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Proofs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryAllProofs) 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 *QueryAllProofs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllProofs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryAllProofsResponse) 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 *QueryAllProofsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllProofsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Proofs) > 0 { + for iNdEx := len(m.Proofs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Proofs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4972,8 +5235,40 @@ func (m *QueryProofsByAddressResponse) Size() (n int) { } var l int _ = l - if len(m.Proof) > 0 { - for _, e := range m.Proof { + if len(m.Proofs) > 0 { + for _, e := range m.Proofs { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllProofs) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllProofsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Proofs) > 0 { + for _, e := range m.Proofs { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -6095,7 +6390,213 @@ func (m *QueryProofsByAddressResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Proof", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Proofs", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Proofs = append(m.Proofs, FileProof{}) + if err := m.Proofs[len(m.Proofs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllProofs) 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: QueryAllProofs: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllProofs: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllProofsResponse) 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: QueryAllProofsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllProofsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Proofs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6122,8 +6623,8 @@ func (m *QueryProofsByAddressResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Proof = append(m.Proof, FileProof{}) - if err := m.Proof[len(m.Proof)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Proofs = append(m.Proofs, FileProof{}) + if err := m.Proofs[len(m.Proofs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/storage/types/query.pb.gw.go b/x/storage/types/query.pb.gw.go index eaf2bbe48..7b66ee574 100644 --- a/x/storage/types/query.pb.gw.go +++ b/x/storage/types/query.pb.gw.go @@ -377,6 +377,114 @@ func local_request_Query_Proof_0(ctx context.Context, marshaler runtime.Marshale } +var ( + filter_Query_AllProofs_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_AllProofs_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllProofs + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllProofs_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.AllProofs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_AllProofs_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllProofs + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllProofs_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.AllProofs(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_ProofsByAddress_0 = &utilities.DoubleArray{Encoding: map[string]int{"provider_address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_ProofsByAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryProofsByAddress + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["provider_address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "provider_address") + } + + protoReq.ProviderAddress, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "provider_address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ProofsByAddress_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ProofsByAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_ProofsByAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryProofsByAddress + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["provider_address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "provider_address") + } + + protoReq.ProviderAddress, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "provider_address", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ProofsByAddress_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ProofsByAddress(ctx, &protoReq) + return msg, metadata, err + +} + func request_Query_Provider_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProvider var metadata runtime.ServerMetadata @@ -1408,6 +1516,52 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_AllProofs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_AllProofs_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_AllProofs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ProofsByAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_ProofsByAddress_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ProofsByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_Provider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1940,6 +2094,46 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_AllProofs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_AllProofs_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_AllProofs_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ProofsByAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_ProofsByAddress_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ProofsByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_Provider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2292,7 +2486,11 @@ var ( pattern_Query_OpenFiles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "open_files", "provider_address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Proof_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal", "canine-chain", "storage", "proof", "provider_address", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Proof_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"jackal", "canine-chain", "storage", "proofs", "provider_address", "merkle", "owner", "start"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_AllProofs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"jackal", "canine-chain", "storage", "proofs"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_ProofsByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "proofs", "provider_address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Provider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"jackal", "canine-chain", "storage", "providers", "address"}, "", runtime.AssumeColonVerbOpt(false))) @@ -2340,6 +2538,10 @@ var ( forward_Query_Proof_0 = runtime.ForwardResponseMessage + forward_Query_AllProofs_0 = runtime.ForwardResponseMessage + + forward_Query_ProofsByAddress_0 = runtime.ForwardResponseMessage + forward_Query_Provider_0 = runtime.ForwardResponseMessage forward_Query_AllProviders_0 = runtime.ForwardResponseMessage