From 12e4a728646a719a5e764c47f30da2d338cc366a Mon Sep 17 00:00:00 2001 From: Tian Date: Wed, 2 Oct 2024 17:24:19 -0400 Subject: [PATCH] remove deprecated params from x/vault params query (#2387) (cherry picked from commit ed1179d7247d82fa926d5cd835de7f2ff8610dc8) --- .../src/codegen/dydxprotocol/vault/query.ts | 26 +- proto/dydxprotocol/vault/query.proto | 6 +- protocol/x/vault/types/query.pb.go | 245 +++++++----------- 3 files changed, 101 insertions(+), 176 deletions(-) diff --git a/indexer/packages/v4-protos/src/codegen/dydxprotocol/vault/query.ts b/indexer/packages/v4-protos/src/codegen/dydxprotocol/vault/query.ts index bd8ced867f..0d2f16b855 100644 --- a/indexer/packages/v4-protos/src/codegen/dydxprotocol/vault/query.ts +++ b/indexer/packages/v4-protos/src/codegen/dydxprotocol/vault/query.ts @@ -1,7 +1,7 @@ import { VaultType, VaultTypeSDKType, VaultId, VaultIdSDKType } from "./vault"; import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; import { NumShares, NumSharesSDKType, ShareUnlock, ShareUnlockSDKType, OwnerShare, OwnerShareSDKType } from "./share"; -import { Params, ParamsSDKType, QuotingParams, QuotingParamsSDKType, OperatorParams, OperatorParamsSDKType, VaultParams, VaultParamsSDKType } from "./params"; +import { QuotingParams, QuotingParamsSDKType, OperatorParams, OperatorParamsSDKType, VaultParams, VaultParamsSDKType } from "./params"; import { SubaccountId, SubaccountIdSDKType } from "../subaccounts/subaccount"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial } from "../../helpers"; @@ -14,20 +14,12 @@ export interface QueryParamsRequestSDKType {} /** QueryParamsResponse is a response type for the Params RPC method. */ export interface QueryParamsResponse { - /** Deprecated since v6.x in favor of default_quoting_params. */ - - /** @deprecated */ - params?: Params; defaultQuotingParams?: QuotingParams; operatorParams?: OperatorParams; } /** QueryParamsResponse is a response type for the Params RPC method. */ export interface QueryParamsResponseSDKType { - /** Deprecated since v6.x in favor of default_quoting_params. */ - - /** @deprecated */ - params?: ParamsSDKType; default_quoting_params?: QuotingParamsSDKType; operator_params?: OperatorParamsSDKType; } @@ -344,7 +336,6 @@ export const QueryParamsRequest = { function createBaseQueryParamsResponse(): QueryParamsResponse { return { - params: undefined, defaultQuotingParams: undefined, operatorParams: undefined }; @@ -352,16 +343,12 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (message.params !== undefined) { - Params.encode(message.params, writer.uint32(10).fork()).ldelim(); - } - if (message.defaultQuotingParams !== undefined) { - QuotingParams.encode(message.defaultQuotingParams, writer.uint32(18).fork()).ldelim(); + QuotingParams.encode(message.defaultQuotingParams, writer.uint32(10).fork()).ldelim(); } if (message.operatorParams !== undefined) { - OperatorParams.encode(message.operatorParams, writer.uint32(26).fork()).ldelim(); + OperatorParams.encode(message.operatorParams, writer.uint32(18).fork()).ldelim(); } return writer; @@ -377,14 +364,10 @@ export const QueryParamsResponse = { switch (tag >>> 3) { case 1: - message.params = Params.decode(reader, reader.uint32()); - break; - - case 2: message.defaultQuotingParams = QuotingParams.decode(reader, reader.uint32()); break; - case 3: + case 2: message.operatorParams = OperatorParams.decode(reader, reader.uint32()); break; @@ -399,7 +382,6 @@ export const QueryParamsResponse = { fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; message.defaultQuotingParams = object.defaultQuotingParams !== undefined && object.defaultQuotingParams !== null ? QuotingParams.fromPartial(object.defaultQuotingParams) : undefined; message.operatorParams = object.operatorParams !== undefined && object.operatorParams !== null ? OperatorParams.fromPartial(object.operatorParams) : undefined; return message; diff --git a/proto/dydxprotocol/vault/query.proto b/proto/dydxprotocol/vault/query.proto index a700529778..ed82af2013 100644 --- a/proto/dydxprotocol/vault/query.proto +++ b/proto/dydxprotocol/vault/query.proto @@ -61,10 +61,8 @@ message QueryParamsRequest {} // QueryParamsResponse is a response type for the Params RPC method. message QueryParamsResponse { - // Deprecated since v6.x in favor of default_quoting_params. - Params params = 1 [ (gogoproto.nullable) = false, deprecated = true ]; - QuotingParams default_quoting_params = 2 [ (gogoproto.nullable) = false ]; - OperatorParams operator_params = 3 [ (gogoproto.nullable) = false ]; + QuotingParams default_quoting_params = 1 [ (gogoproto.nullable) = false ]; + OperatorParams operator_params = 2 [ (gogoproto.nullable) = false ]; } // QueryVaultRequest is a request type for the Vault RPC method. diff --git a/protocol/x/vault/types/query.pb.go b/protocol/x/vault/types/query.pb.go index 59c0536601..228db44453 100644 --- a/protocol/x/vault/types/query.pb.go +++ b/protocol/x/vault/types/query.pb.go @@ -72,10 +72,8 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo // QueryParamsResponse is a response type for the Params RPC method. type QueryParamsResponse struct { - // Deprecated since v6.x in favor of default_quoting_params. - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // Deprecated: Do not use. - DefaultQuotingParams QuotingParams `protobuf:"bytes,2,opt,name=default_quoting_params,json=defaultQuotingParams,proto3" json:"default_quoting_params"` - OperatorParams OperatorParams `protobuf:"bytes,3,opt,name=operator_params,json=operatorParams,proto3" json:"operator_params"` + DefaultQuotingParams QuotingParams `protobuf:"bytes,1,opt,name=default_quoting_params,json=defaultQuotingParams,proto3" json:"default_quoting_params"` + OperatorParams OperatorParams `protobuf:"bytes,2,opt,name=operator_params,json=operatorParams,proto3" json:"operator_params"` } func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } @@ -111,14 +109,6 @@ func (m *QueryParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo -// Deprecated: Do not use. -func (m *QueryParamsResponse) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - func (m *QueryParamsResponse) GetDefaultQuotingParams() QuotingParams { if m != nil { return m.DefaultQuotingParams @@ -893,88 +883,88 @@ func init() { func init() { proto.RegisterFile("dydxprotocol/vault/query.proto", fileDescriptor_478fb8dc0ff21ea6) } var fileDescriptor_478fb8dc0ff21ea6 = []byte{ - // 1295 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xc6, 0x89, 0x4b, 0x26, 0x49, 0x5b, 0x26, 0x69, 0xe2, 0xba, 0xc5, 0x49, 0x16, 0x68, - 0x9b, 0xb4, 0xf1, 0x92, 0x34, 0x6d, 0x11, 0x54, 0xa8, 0x09, 0xa2, 0x34, 0x48, 0xd0, 0x7a, 0x13, - 0x8a, 0x84, 0x04, 0xcb, 0xd8, 0x3b, 0x71, 0x56, 0xac, 0x77, 0x9c, 0xdd, 0xd9, 0x24, 0x26, 0x8a, - 0x84, 0x40, 0x1c, 0xb8, 0x21, 0x71, 0xe5, 0x02, 0x1f, 0x01, 0x21, 0x21, 0x0e, 0x1c, 0x10, 0x3d, - 0xf4, 0x58, 0xc1, 0x05, 0x71, 0xa8, 0x50, 0xc2, 0x99, 0xcf, 0x80, 0x76, 0xe6, 0xad, 0xbd, 0xeb, - 0xac, 0x9d, 0x6d, 0xe5, 0x5e, 0x22, 0xef, 0xcc, 0x7b, 0xbf, 0xdf, 0x7b, 0x6f, 0xde, 0xbf, 0xa0, - 0x82, 0xd9, 0x30, 0x77, 0xeb, 0x2e, 0xe3, 0xac, 0xc2, 0x6c, 0x6d, 0x9b, 0xf8, 0x36, 0xd7, 0xb6, - 0x7c, 0xea, 0x36, 0x8a, 0xe2, 0x10, 0xe3, 0xe8, 0x7d, 0x51, 0xdc, 0xe7, 0xcf, 0x56, 0x98, 0x57, - 0x63, 0x9e, 0x21, 0x8e, 0x35, 0xf9, 0x21, 0xc5, 0xf3, 0x73, 0xf2, 0x4b, 0x2b, 0x13, 0x8f, 0x4a, - 0x1c, 0x6d, 0x7b, 0xa1, 0x4c, 0x39, 0x59, 0xd0, 0xea, 0xa4, 0x6a, 0x39, 0x84, 0x5b, 0xcc, 0x01, - 0xd9, 0xf1, 0x2a, 0xab, 0x32, 0x89, 0x11, 0xfc, 0x82, 0xd3, 0xf3, 0x55, 0xc6, 0xaa, 0x36, 0xd5, - 0x48, 0xdd, 0xd2, 0x88, 0xe3, 0x30, 0x2e, 0x54, 0x42, 0xfc, 0xd9, 0x98, 0xb9, 0x9e, 0x5f, 0x26, - 0x95, 0x0a, 0xf3, 0x1d, 0xee, 0x45, 0x7e, 0x83, 0xe8, 0x54, 0x82, 0x67, 0x75, 0xe2, 0x92, 0x5a, - 0x88, 0x95, 0xe4, 0xba, 0xb7, 0x49, 0x5c, 0xda, 0xe5, 0x5e, 0xfc, 0x95, 0xf7, 0xea, 0x38, 0xc2, - 0xa5, 0xc0, 0xc3, 0x7b, 0x02, 0x54, 0xa7, 0x5b, 0x3e, 0xf5, 0xb8, 0xfa, 0x65, 0x3f, 0x1a, 0x8b, - 0x1d, 0x7b, 0x75, 0xe6, 0x78, 0x14, 0xbf, 0x86, 0xb2, 0x92, 0x3d, 0xa7, 0x4c, 0x2b, 0x97, 0x86, - 0x17, 0xf3, 0xc5, 0xa3, 0x91, 0x2d, 0x4a, 0x9d, 0x95, 0xec, 0xc3, 0xc7, 0x53, 0x7d, 0x39, 0x45, - 0x07, 0x0d, 0xfc, 0x11, 0x9a, 0x30, 0xe9, 0x46, 0x20, 0x61, 0x6c, 0xf9, 0x8c, 0x5b, 0x4e, 0xd5, - 0x00, 0xac, 0x7e, 0x81, 0x35, 0x93, 0x84, 0x55, 0x92, 0x92, 0x00, 0x39, 0x10, 0x40, 0xea, 0xe3, - 0x00, 0x13, 0xbb, 0xc3, 0x25, 0x74, 0x8a, 0xd5, 0xa9, 0x4b, 0x38, 0x73, 0x43, 0xdc, 0x8c, 0xc0, - 0x55, 0x93, 0x70, 0xef, 0x82, 0x68, 0x0c, 0xf8, 0x24, 0x8b, 0x9d, 0xaa, 0x1f, 0xa3, 0xe7, 0x45, - 0x10, 0xee, 0x07, 0x2a, 0x10, 0x1a, 0xbc, 0x80, 0x06, 0x78, 0xa3, 0x4e, 0x45, 0x00, 0x4e, 0x2e, - 0xbe, 0x90, 0x04, 0x2e, 0xe4, 0xd7, 0x1b, 0x75, 0xaa, 0x0b, 0x51, 0x3c, 0x81, 0xb2, 0x8e, 0x5f, - 0x2b, 0x53, 0x57, 0x78, 0x3a, 0xaa, 0xc3, 0x97, 0xfa, 0x5f, 0x06, 0x82, 0x0f, 0x04, 0x10, 0xe4, - 0x9b, 0xe8, 0x39, 0x81, 0x63, 0x58, 0x26, 0x84, 0xf9, 0x5c, 0x47, 0x96, 0x55, 0x13, 0x6c, 0x3f, - 0xb1, 0x2d, 0x3f, 0x71, 0x09, 0x8d, 0xb6, 0xb2, 0x28, 0x80, 0x90, 0xd1, 0xbd, 0x10, 0x87, 0x88, - 0x24, 0x5d, 0x71, 0xad, 0xf9, 0xbb, 0x89, 0x36, 0xe2, 0x45, 0xce, 0xf0, 0x27, 0x28, 0x4b, 0xb7, - 0x7c, 0x8b, 0x37, 0x44, 0x44, 0x47, 0x56, 0xee, 0x04, 0x32, 0x7f, 0x3f, 0x9e, 0xba, 0x55, 0xb5, - 0xf8, 0xa6, 0x5f, 0x2e, 0x56, 0x58, 0x4d, 0x8b, 0xa7, 0xd9, 0xd2, 0x7c, 0x65, 0x93, 0x58, 0x8e, - 0xd6, 0x3c, 0x31, 0x83, 0x40, 0x78, 0xc5, 0x35, 0xea, 0x5a, 0xc4, 0xb6, 0x3e, 0x23, 0x65, 0x9b, - 0xae, 0x3a, 0x5c, 0x07, 0x5c, 0xbc, 0x81, 0x86, 0x2c, 0x67, 0x9b, 0x3a, 0x9c, 0xb9, 0x8d, 0xdc, - 0x40, 0x8f, 0x49, 0x5a, 0xd0, 0xf8, 0x0e, 0x1a, 0x91, 0xa1, 0x85, 0x0c, 0x19, 0x14, 0xb1, 0x99, - 0xea, 0x18, 0xde, 0x58, 0x7a, 0x0c, 0x6f, 0xb7, 0x8e, 0xf0, 0x55, 0x34, 0x51, 0x63, 0x1e, 0x37, - 0x5c, 0x5a, 0xa1, 0x0e, 0x37, 0x2a, 0xb6, 0x45, 0x45, 0xb8, 0xbd, 0x5c, 0x76, 0x3a, 0x73, 0x69, - 0x54, 0x1f, 0x0b, 0x6e, 0x75, 0x71, 0xf9, 0xa6, 0xb8, 0x5b, 0x35, 0x3d, 0xd5, 0x40, 0x67, 0xc4, - 0x7b, 0x2f, 0xdb, 0xb6, 0x80, 0x0f, 0xeb, 0x0d, 0xdf, 0x46, 0xa8, 0xd5, 0x59, 0xe0, 0xd1, 0x2f, - 0x14, 0xa1, 0x29, 0x05, 0x6d, 0xa8, 0x28, 0xdb, 0x19, 0xb4, 0xa1, 0xe2, 0x3d, 0x52, 0xa5, 0xa0, - 0xab, 0x47, 0x34, 0xd5, 0xef, 0x15, 0x34, 0xd1, 0xce, 0x00, 0x59, 0xf5, 0x06, 0xca, 0x0a, 0xfb, - 0x83, 0xd2, 0xcd, 0x1c, 0x4d, 0x88, 0xb0, 0xdc, 0xda, 0xb3, 0x51, 0x07, 0x2d, 0xfc, 0x76, 0xcc, - 0x44, 0x99, 0x54, 0x17, 0x8f, 0x35, 0x11, 0x40, 0xa2, 0x36, 0xaa, 0x68, 0x5a, 0xd0, 0xbc, 0x4b, - 0xab, 0x44, 0x60, 0xaf, 0x33, 0x4e, 0xec, 0xb5, 0xa0, 0x67, 0x35, 0xfb, 0x0f, 0x45, 0x33, 0x5d, - 0x64, 0xc0, 0xa3, 0x5b, 0x68, 0x84, 0x07, 0xc7, 0x86, 0xe8, 0x77, 0x61, 0x4b, 0x4a, 0xac, 0xc8, - 0xf7, 0xfc, 0x1a, 0x28, 0x0f, 0xf3, 0x16, 0x92, 0x7a, 0xbf, 0xdd, 0x94, 0xbb, 0x3b, 0x0e, 0x75, - 0x63, 0xa6, 0xe0, 0x45, 0x74, 0x82, 0x98, 0xa6, 0x4b, 0x3d, 0x49, 0x30, 0xb4, 0x92, 0xfb, 0xe3, - 0xa7, 0xf9, 0x71, 0xf0, 0x7b, 0x59, 0xde, 0xac, 0x71, 0xd7, 0x72, 0xaa, 0x7a, 0x28, 0xa8, 0xfe, - 0x9a, 0x69, 0xb7, 0x3f, 0x06, 0x0c, 0xf6, 0x3f, 0x05, 0x32, 0x7e, 0x1d, 0x65, 0xc1, 0xdb, 0xfe, - 0x14, 0xde, 0x42, 0xe2, 0x82, 0x0a, 0x7e, 0x07, 0x8d, 0x8a, 0x5f, 0x86, 0xef, 0xd8, 0xac, 0xf2, - 0x69, 0xd0, 0x20, 0x33, 0x9d, 0xd2, 0x5f, 0x00, 0xbc, 0x2f, 0xe4, 0x9a, 0x3d, 0xa1, 0x75, 0xe4, - 0x45, 0x7a, 0xc2, 0xc0, 0x33, 0xea, 0x09, 0x0d, 0x34, 0xb6, 0x63, 0xf1, 0x4d, 0xd3, 0x25, 0x3b, - 0xc1, 0x95, 0x01, 0x74, 0x83, 0x3d, 0xa6, 0xc3, 0x51, 0x92, 0xb7, 0x04, 0x87, 0x5a, 0x43, 0x2f, - 0xc6, 0x9f, 0x6f, 0xd9, 0xb6, 0x13, 0x52, 0xa3, 0x57, 0x55, 0xfb, 0xa3, 0x82, 0x5e, 0xea, 0xce, - 0x07, 0x19, 0xb3, 0x8c, 0x46, 0x58, 0x70, 0xdc, 0xca, 0xf8, 0xe0, 0xfd, 0x0a, 0x89, 0x03, 0xae, - 0xa9, 0xae, 0x0f, 0xb3, 0x16, 0x54, 0xef, 0xca, 0xd8, 0x44, 0x93, 0xad, 0x6e, 0x11, 0xdb, 0x1e, - 0x7a, 0x39, 0x22, 0x7f, 0x50, 0x50, 0xee, 0x28, 0x4d, 0x4f, 0x06, 0x65, 0xfb, 0x2c, 0xe8, 0x7f, - 0xda, 0x59, 0xa0, 0xee, 0xb6, 0xa7, 0xcb, 0x07, 0x61, 0x4a, 0xd9, 0xab, 0xce, 0x06, 0x0b, 0xc3, - 0x52, 0x42, 0x58, 0xbe, 0x9b, 0xc1, 0x99, 0x11, 0x66, 0x5d, 0xaa, 0xae, 0x05, 0xa4, 0xa7, 0xa5, - 0xfa, 0x3a, 0x0b, 0xf1, 0xd5, 0x5f, 0x32, 0xed, 0x99, 0xd3, 0x4e, 0x0d, 0xa1, 0xea, 0x3d, 0x37, - 0xfe, 0x5c, 0x41, 0x93, 0x74, 0xb7, 0x4e, 0x2b, 0x9c, 0x9a, 0x62, 0xa3, 0xa3, 0xc6, 0x96, 0x4f, - 0x1c, 0xee, 0x43, 0x2c, 0x7b, 0x59, 0xa4, 0x67, 0x42, 0xa2, 0x60, 0xe7, 0xa3, 0x25, 0xa0, 0xc1, - 0x1e, 0x3a, 0x5d, 0x0b, 0x1d, 0x37, 0x9e, 0xd1, 0x8a, 0x72, 0xaa, 0xc9, 0x20, 0x9b, 0x03, 0xbe, - 0xdd, 0x36, 0x76, 0x06, 0xd2, 0x07, 0x31, 0x3a, 0x7c, 0x16, 0x1f, 0x20, 0x34, 0x28, 0xde, 0x0e, - 0xef, 0xa3, 0x2c, 0x6c, 0x15, 0x9d, 0x87, 0x72, 0xac, 0xc2, 0xf2, 0x17, 0x8f, 0x95, 0x93, 0xef, - 0xae, 0xaa, 0x5f, 0xfc, 0xf9, 0xef, 0xb7, 0xfd, 0xe7, 0x71, 0x5e, 0xeb, 0xf8, 0x8f, 0x04, 0xfe, - 0x5a, 0x41, 0x83, 0x22, 0xc3, 0xf1, 0xcb, 0xc7, 0xed, 0x04, 0x92, 0x3d, 0xe5, 0xea, 0xa0, 0x2e, - 0x08, 0xf2, 0xcb, 0x78, 0x56, 0xeb, 0xf4, 0x4f, 0x88, 0xb6, 0x17, 0x04, 0x7d, 0x5f, 0xdb, 0x93, - 0xe5, 0xbe, 0x8f, 0xbf, 0x52, 0xd0, 0x50, 0x73, 0x77, 0xc1, 0xb3, 0x1d, 0x89, 0xda, 0x37, 0xa8, - 0xfc, 0x5c, 0x1a, 0x51, 0xb0, 0x6b, 0x46, 0xd8, 0x75, 0x0e, 0x9f, 0xed, 0x68, 0x17, 0xfe, 0x59, - 0x41, 0xe3, 0x49, 0xcb, 0x07, 0x5e, 0xea, 0xc8, 0xd3, 0x65, 0x9f, 0xc9, 0x5f, 0x7b, 0x42, 0x2d, - 0x30, 0x74, 0x51, 0x18, 0x7a, 0x05, 0xcf, 0x25, 0x19, 0xda, 0xcc, 0x4b, 0x2d, 0x9a, 0x8e, 0xf8, - 0xb7, 0xa8, 0xe5, 0x91, 0x21, 0x92, 0xc6, 0xf2, 0xa3, 0x33, 0x2e, 0x8d, 0xe5, 0x09, 0x93, 0x4a, - 0xbd, 0x29, 0x2c, 0xbf, 0x8e, 0x97, 0xba, 0x5b, 0x1e, 0x9d, 0x66, 0xda, 0x1e, 0x2c, 0x39, 0xfb, - 0xf8, 0x81, 0x82, 0x26, 0x3b, 0xcc, 0x42, 0x7c, 0xe3, 0x78, 0x83, 0x12, 0xa7, 0x75, 0xfe, 0xd5, - 0x27, 0x57, 0x04, 0x67, 0xae, 0x0b, 0x67, 0x5e, 0xc1, 0xc5, 0xee, 0xce, 0x10, 0xdb, 0x36, 0xa2, - 0x0e, 0xe1, 0xef, 0x14, 0x34, 0x1c, 0x19, 0x1d, 0xf8, 0x72, 0xf7, 0xba, 0x89, 0x97, 0xf8, 0x95, - 0x74, 0xc2, 0x69, 0x32, 0x45, 0xd6, 0xf9, 0x91, 0x5a, 0xfb, 0x3d, 0x1a, 0xe5, 0xf8, 0xdc, 0x48, - 0x13, 0xe5, 0xc4, 0x21, 0x97, 0x26, 0xca, 0xc9, 0x23, 0x4a, 0xbd, 0x26, 0x5c, 0xd0, 0xf0, 0x7c, - 0xf7, 0x28, 0x37, 0xd7, 0x35, 0xdb, 0xb0, 0x9c, 0x0d, 0xb6, 0x52, 0x7a, 0x78, 0x50, 0x50, 0x1e, - 0x1d, 0x14, 0x94, 0x7f, 0x0e, 0x0a, 0xca, 0x37, 0x87, 0x85, 0xbe, 0x47, 0x87, 0x85, 0xbe, 0xbf, - 0x0e, 0x0b, 0x7d, 0x1f, 0xde, 0x48, 0xdf, 0xfb, 0x77, 0x81, 0x46, 0x8c, 0x80, 0x72, 0x56, 0x9c, - 0x5f, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x49, 0x93, 0xca, 0x9a, 0x57, 0x12, 0x00, 0x00, + // 1282 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xc6, 0x89, 0xfb, 0xcd, 0x4b, 0xd2, 0xf6, 0x3b, 0x49, 0x13, 0xd7, 0x2d, 0x4e, 0xb2, + 0x40, 0x9b, 0xa4, 0x8d, 0x97, 0xa4, 0x69, 0x8b, 0x44, 0x85, 0x9a, 0x20, 0x4a, 0x83, 0x04, 0xad, + 0x37, 0xa1, 0x48, 0x48, 0xb0, 0x8c, 0xbd, 0x13, 0x67, 0xc5, 0x7a, 0xc7, 0xd9, 0x9d, 0x4d, 0x62, + 0xa2, 0x48, 0x08, 0x89, 0x03, 0x37, 0x24, 0xae, 0x5c, 0xe0, 0x4f, 0x40, 0x48, 0x88, 0x03, 0x07, + 0x44, 0x25, 0x7a, 0xac, 0xe0, 0x82, 0x38, 0x54, 0x28, 0xe1, 0xcc, 0xdf, 0x80, 0x76, 0x66, 0xd6, + 0xde, 0x75, 0xd6, 0xce, 0xb6, 0x72, 0x2f, 0x91, 0x77, 0xe6, 0xbd, 0xcf, 0xfb, 0xbc, 0x37, 0xef, + 0x57, 0xa0, 0x60, 0x36, 0xcc, 0xbd, 0xba, 0x4b, 0x19, 0xad, 0x50, 0x5b, 0xdb, 0xc1, 0xbe, 0xcd, + 0xb4, 0x6d, 0x9f, 0xb8, 0x8d, 0x22, 0x3f, 0x44, 0x28, 0x7a, 0x5f, 0xe4, 0xf7, 0xf9, 0xf3, 0x15, + 0xea, 0xd5, 0xa8, 0x67, 0xf0, 0x63, 0x4d, 0x7c, 0x08, 0xf1, 0xfc, 0xbc, 0xf8, 0xd2, 0xca, 0xd8, + 0x23, 0x02, 0x47, 0xdb, 0x59, 0x2c, 0x13, 0x86, 0x17, 0xb5, 0x3a, 0xae, 0x5a, 0x0e, 0x66, 0x16, + 0x75, 0xa4, 0xec, 0x78, 0x95, 0x56, 0xa9, 0xc0, 0x08, 0x7e, 0xc9, 0xd3, 0x8b, 0x55, 0x4a, 0xab, + 0x36, 0xd1, 0x70, 0xdd, 0xd2, 0xb0, 0xe3, 0x50, 0xc6, 0x55, 0x42, 0xfc, 0xb9, 0x18, 0x5d, 0xcf, + 0x2f, 0xe3, 0x4a, 0x85, 0xfa, 0x0e, 0xf3, 0x22, 0xbf, 0xa5, 0xe8, 0x54, 0x82, 0x67, 0x75, 0xec, + 0xe2, 0x5a, 0x88, 0x95, 0xe4, 0xba, 0xb7, 0x85, 0x5d, 0xd2, 0xe5, 0x9e, 0xff, 0x15, 0xf7, 0xea, + 0x38, 0xa0, 0x52, 0xe0, 0xe1, 0x7d, 0x0e, 0xaa, 0x93, 0x6d, 0x9f, 0x78, 0x4c, 0xfd, 0x4d, 0x81, + 0xb1, 0xd8, 0xb1, 0x57, 0xa7, 0x8e, 0x47, 0xd0, 0x87, 0x30, 0x61, 0x92, 0xcd, 0x40, 0xdd, 0xd8, + 0xf6, 0x29, 0xb3, 0x9c, 0xaa, 0x21, 0xd8, 0xe4, 0x94, 0x69, 0x65, 0x76, 0x78, 0x69, 0xa6, 0x78, + 0x3c, 0xd2, 0xc5, 0x92, 0x90, 0x14, 0x50, 0xab, 0x03, 0x8f, 0x9e, 0x4c, 0xf5, 0xe9, 0xe3, 0x12, + 0x26, 0x76, 0x87, 0x4a, 0x70, 0x86, 0xd6, 0x89, 0x8b, 0x19, 0x75, 0x43, 0xdc, 0x7e, 0x8e, 0xab, + 0x26, 0xe1, 0xde, 0x93, 0xa2, 0x31, 0xe0, 0xd3, 0x34, 0x76, 0xaa, 0x7e, 0x04, 0xff, 0xe7, 0x8e, + 0x3c, 0x08, 0x54, 0xa4, 0x7b, 0x68, 0x11, 0x06, 0x58, 0xa3, 0x4e, 0x38, 0xe9, 0xd3, 0x4b, 0x2f, + 0x24, 0x81, 0x73, 0xf9, 0x8d, 0x46, 0x9d, 0xe8, 0x5c, 0x14, 0x4d, 0x40, 0xd6, 0xf1, 0x6b, 0x65, + 0xe2, 0x72, 0x46, 0xa3, 0xba, 0xfc, 0x52, 0xff, 0xcd, 0xc8, 0x00, 0x4a, 0x03, 0x32, 0x50, 0xb7, + 0xe0, 0x7f, 0x1c, 0xc7, 0xb0, 0x4c, 0x19, 0x9a, 0x0b, 0x1d, 0xad, 0xac, 0x99, 0x92, 0xfb, 0xa9, + 0x1d, 0xf1, 0x89, 0x4a, 0x30, 0xda, 0xca, 0x84, 0x00, 0x42, 0x44, 0xe1, 0x52, 0x1c, 0x22, 0x92, + 0x38, 0xc5, 0xf5, 0xe6, 0xef, 0x26, 0xda, 0x88, 0x17, 0x39, 0x43, 0x1f, 0x43, 0x96, 0x6c, 0xfb, + 0x16, 0x6b, 0xe4, 0x32, 0xd3, 0xca, 0xec, 0xc8, 0xea, 0xdd, 0x40, 0xe6, 0xaf, 0x27, 0x53, 0xb7, + 0xab, 0x16, 0xdb, 0xf2, 0xcb, 0xc5, 0x0a, 0xad, 0x69, 0xf1, 0x54, 0x59, 0x5e, 0xa8, 0x6c, 0x61, + 0xcb, 0xd1, 0x9a, 0x27, 0x66, 0x10, 0x08, 0xaf, 0xb8, 0x4e, 0x5c, 0x0b, 0xdb, 0xd6, 0xa7, 0xb8, + 0x6c, 0x93, 0x35, 0x87, 0xe9, 0x12, 0x17, 0x6d, 0xc2, 0x90, 0xe5, 0xec, 0x10, 0x87, 0x51, 0xb7, + 0x91, 0x1b, 0xe8, 0xb1, 0x91, 0x16, 0x34, 0xba, 0x0b, 0x23, 0x22, 0xb4, 0x32, 0x43, 0x06, 0x79, + 0x6c, 0xa6, 0x3a, 0x86, 0x37, 0x96, 0x1e, 0xc3, 0x3b, 0xad, 0x23, 0x74, 0x0d, 0x26, 0x6a, 0xd4, + 0x63, 0x86, 0x4b, 0x2a, 0xc4, 0x61, 0x46, 0xc5, 0xb6, 0x08, 0x0f, 0xb7, 0x97, 0xcb, 0x4e, 0x67, + 0x66, 0x47, 0xf5, 0xb1, 0xe0, 0x56, 0xe7, 0x97, 0x6f, 0xf0, 0xbb, 0x35, 0xd3, 0x53, 0x0d, 0x38, + 0xc7, 0xdf, 0x7b, 0xc5, 0xb6, 0x39, 0x7c, 0x58, 0x33, 0xe8, 0x0e, 0x40, 0xab, 0x3b, 0xc8, 0x47, + 0xbf, 0x54, 0x94, 0x8d, 0x25, 0x68, 0x25, 0x45, 0xd1, 0x92, 0x64, 0x2b, 0x29, 0xde, 0xc7, 0x55, + 0x22, 0x75, 0xf5, 0x88, 0xa6, 0xfa, 0xad, 0x02, 0x13, 0xed, 0x16, 0x64, 0x56, 0xbd, 0x0e, 0x59, + 0xce, 0x3f, 0x28, 0xb7, 0xcc, 0xf1, 0x84, 0x08, 0xcb, 0xad, 0x3d, 0x1b, 0x75, 0xa9, 0x85, 0xde, + 0x8a, 0x51, 0x14, 0x49, 0x75, 0xf9, 0x44, 0x8a, 0x12, 0x24, 0xca, 0x51, 0x85, 0x69, 0x6e, 0xe6, + 0x1d, 0x52, 0xc5, 0x1c, 0x7b, 0x83, 0x32, 0x6c, 0xaf, 0x07, 0x7d, 0xa7, 0xd9, 0x43, 0x08, 0xcc, + 0x74, 0x91, 0x91, 0x1e, 0xdd, 0x86, 0x11, 0x16, 0x1c, 0x1b, 0xbc, 0x67, 0x85, 0x6d, 0x24, 0xb1, + 0x22, 0xdf, 0xf5, 0x6b, 0x52, 0x79, 0x98, 0xb5, 0x90, 0xd4, 0x07, 0xed, 0x54, 0xee, 0xed, 0x3a, + 0xc4, 0x8d, 0x51, 0x41, 0x4b, 0x70, 0x0a, 0x9b, 0xa6, 0x4b, 0x3c, 0x61, 0x60, 0x68, 0x35, 0xf7, + 0xfb, 0x0f, 0x0b, 0xe3, 0xd2, 0xef, 0x15, 0x71, 0xb3, 0xce, 0x5c, 0xcb, 0xa9, 0xea, 0xa1, 0xa0, + 0xfa, 0x73, 0xa6, 0x9d, 0x7f, 0x0c, 0x58, 0xf2, 0x7f, 0x06, 0x64, 0xf4, 0x1a, 0x64, 0xa5, 0xb7, + 0xfd, 0x29, 0xbc, 0x95, 0x89, 0x2b, 0x55, 0xd0, 0xdb, 0x30, 0xca, 0x7f, 0x19, 0xbe, 0x63, 0xd3, + 0xca, 0x27, 0x5e, 0x2e, 0xc3, 0x33, 0x21, 0x31, 0xfd, 0x39, 0xc0, 0x7b, 0x5c, 0xae, 0xd9, 0x13, + 0x5a, 0x47, 0x5e, 0xa4, 0x27, 0x0c, 0x3c, 0xa7, 0x9e, 0xd0, 0x80, 0xb1, 0x5d, 0x8b, 0x6d, 0x99, + 0x2e, 0xde, 0x0d, 0xae, 0x0c, 0x69, 0x6e, 0xb0, 0xc7, 0xe6, 0x50, 0xd4, 0xc8, 0x9b, 0xdc, 0x86, + 0x5a, 0x83, 0x17, 0xe3, 0xcf, 0xb7, 0x62, 0xdb, 0x09, 0xa9, 0xd1, 0xab, 0xaa, 0xfd, 0x5e, 0x81, + 0x97, 0xba, 0xdb, 0x93, 0x19, 0xb3, 0x02, 0x23, 0x34, 0x38, 0x6e, 0x65, 0x7c, 0xf0, 0x7e, 0x85, + 0xc4, 0x01, 0xd7, 0x54, 0xd7, 0x87, 0x69, 0x0b, 0xaa, 0x77, 0x65, 0x6c, 0xc2, 0x64, 0xab, 0x5b, + 0xc4, 0x36, 0x80, 0x5e, 0x8e, 0xc8, 0xef, 0x14, 0xc8, 0x1d, 0x37, 0xd3, 0x93, 0x41, 0xd9, 0x3e, + 0x0b, 0xfa, 0x9f, 0x75, 0x16, 0xa8, 0x7b, 0xed, 0xe9, 0xf2, 0x7e, 0x98, 0x52, 0xf6, 0x9a, 0xb3, + 0x49, 0xc3, 0xb0, 0x94, 0x00, 0x89, 0x77, 0x33, 0x18, 0x35, 0xc2, 0xac, 0x4b, 0xd5, 0xb5, 0xa4, + 0xd1, 0xb3, 0x42, 0x7d, 0x83, 0x86, 0xf8, 0xea, 0x4f, 0x99, 0xf6, 0xcc, 0x69, 0x37, 0x2d, 0x43, + 0xd5, 0x7b, 0xdb, 0xe8, 0x33, 0x05, 0x26, 0xc9, 0x5e, 0x9d, 0x54, 0x18, 0x31, 0xf9, 0x46, 0x47, + 0x8c, 0x6d, 0x1f, 0x3b, 0xcc, 0x97, 0xb1, 0xec, 0x65, 0x91, 0x9e, 0x0b, 0x0d, 0x05, 0x3b, 0x1f, + 0x29, 0x49, 0x33, 0xc8, 0x83, 0xb3, 0xb5, 0xd0, 0x71, 0xe3, 0x39, 0xad, 0x28, 0x67, 0x9a, 0x16, + 0x44, 0x73, 0x40, 0x77, 0xda, 0xc6, 0xce, 0x40, 0xfa, 0x20, 0x46, 0x87, 0xcf, 0xd2, 0x43, 0x80, + 0x41, 0xfe, 0x76, 0xe8, 0x00, 0xb2, 0x72, 0xab, 0xe8, 0x3c, 0x94, 0x63, 0x15, 0x96, 0xbf, 0x7c, + 0xa2, 0x9c, 0x78, 0x77, 0x55, 0xfd, 0xfc, 0x8f, 0x7f, 0xbe, 0xee, 0xbf, 0x88, 0xf2, 0x5a, 0xc7, + 0x7f, 0x06, 0xd0, 0x97, 0x0a, 0x0c, 0xf2, 0x0c, 0x47, 0x2f, 0x9f, 0xb4, 0x13, 0x08, 0xeb, 0x29, + 0x57, 0x07, 0x75, 0x91, 0x1b, 0xbf, 0x82, 0xe6, 0xb4, 0x4e, 0xff, 0x48, 0x68, 0xfb, 0x41, 0xd0, + 0x0f, 0xb4, 0x7d, 0x51, 0xee, 0x07, 0xe8, 0x0b, 0x05, 0x86, 0x9a, 0xbb, 0x0b, 0x9a, 0xeb, 0x68, + 0xa8, 0x7d, 0x83, 0xca, 0xcf, 0xa7, 0x11, 0x95, 0xbc, 0x66, 0x38, 0xaf, 0x0b, 0xe8, 0x7c, 0x47, + 0x5e, 0xe8, 0x47, 0x05, 0xc6, 0x93, 0x96, 0x0f, 0xb4, 0xdc, 0xd1, 0x4e, 0x97, 0x7d, 0x26, 0x7f, + 0xfd, 0x29, 0xb5, 0x24, 0xd1, 0x25, 0x4e, 0xf4, 0x2a, 0x9a, 0x4f, 0x22, 0xda, 0xcc, 0x4b, 0x2d, + 0x9a, 0x8e, 0xe8, 0x97, 0x28, 0xf3, 0xc8, 0x10, 0x49, 0xc3, 0xfc, 0xf8, 0x8c, 0x4b, 0xc3, 0x3c, + 0x61, 0x52, 0xa9, 0xb7, 0x38, 0xf3, 0x1b, 0x68, 0xb9, 0x3b, 0xf3, 0xe8, 0x34, 0xd3, 0xf6, 0xe5, + 0x92, 0x73, 0x80, 0x1e, 0x2a, 0x30, 0xd9, 0x61, 0x16, 0xa2, 0x9b, 0x27, 0x13, 0x4a, 0x9c, 0xd6, + 0xf9, 0x57, 0x9f, 0x5e, 0x51, 0x3a, 0x73, 0x83, 0x3b, 0xf3, 0x0a, 0x2a, 0x76, 0x77, 0x06, 0xdb, + 0xb6, 0x11, 0x75, 0x08, 0x7d, 0xa3, 0xc0, 0x70, 0x64, 0x74, 0xa0, 0x2b, 0xdd, 0xeb, 0x26, 0x5e, + 0xe2, 0x57, 0xd3, 0x09, 0xa7, 0xc9, 0x14, 0x51, 0xe7, 0xc7, 0x6a, 0xed, 0xd7, 0x68, 0x94, 0xe3, + 0x73, 0x23, 0x4d, 0x94, 0x13, 0x87, 0x5c, 0x9a, 0x28, 0x27, 0x8f, 0x28, 0xf5, 0x3a, 0x77, 0x41, + 0x43, 0x0b, 0xdd, 0xa3, 0xdc, 0x5c, 0xd7, 0x6c, 0xc3, 0x72, 0x36, 0xe9, 0x6a, 0xe9, 0xd1, 0x61, + 0x41, 0x79, 0x7c, 0x58, 0x50, 0xfe, 0x3e, 0x2c, 0x28, 0x5f, 0x1d, 0x15, 0xfa, 0x1e, 0x1f, 0x15, + 0xfa, 0xfe, 0x3c, 0x2a, 0xf4, 0x7d, 0x70, 0x33, 0x7d, 0xef, 0xdf, 0x93, 0x66, 0xf8, 0x08, 0x28, + 0x67, 0xf9, 0xf9, 0xb5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x87, 0xf2, 0x87, 0x5d, 0x1b, 0x12, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1377,19 +1367,9 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a - { - size, err := m.DefaultQuotingParams.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- dAtA[i] = 0x12 { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.DefaultQuotingParams.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1455,20 +1435,20 @@ func (m *QueryVaultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if len(m.MostRecentClientIds) > 0 { - dAtA5 := make([]byte, len(m.MostRecentClientIds)*10) - var j4 int + dAtA4 := make([]byte, len(m.MostRecentClientIds)*10) + var j3 int for _, num := range m.MostRecentClientIds { for num >= 1<<7 { - dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80) + dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j4++ + j3++ } - dAtA5[j4] = uint8(num) - j4++ + dAtA4[j3] = uint8(num) + j3++ } - i -= j4 - copy(dAtA[i:], dAtA5[:j4]) - i = encodeVarintQuery(dAtA, i, uint64(j4)) + i -= j3 + copy(dAtA[i:], dAtA4[:j3]) + i = encodeVarintQuery(dAtA, i, uint64(j3)) i-- dAtA[i] = 0x32 } @@ -2053,8 +2033,6 @@ func (m *QueryParamsResponse) Size() (n int) { } var l int _ = l - l = m.Params.Size() - n += 1 + l + sovQuery(uint64(l)) l = m.DefaultQuotingParams.Size() n += 1 + l + sovQuery(uint64(l)) l = m.OperatorParams.Size() @@ -2369,39 +2347,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", 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.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DefaultQuotingParams", wireType) } @@ -2434,7 +2379,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OperatorParams", wireType) }