From 30594cffebed901362241f248108b9aa11fe7103 Mon Sep 17 00:00:00 2001 From: zakir <80246097+zakir-code@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:05:27 +0800 Subject: [PATCH] chore: unify deprecated proto filenames as legacy --- .../fx/base/v1/{query.proto => legacy.proto} | 0 proto/fx/other/{query.proto => legacy.proto} | 0 .../legacy/v1/{query.pb.go => legacy.pb.go} | 116 +++++++++--------- .../v1/{query.pb.gw.go => legacy.pb.gw.go} | 2 +- .../legacy/v2/{query.pb.go => legacy.pb.go} | 110 ++++++++--------- .../v2/{query.pb.gw.go => legacy.pb.gw.go} | 2 +- 6 files changed, 115 insertions(+), 115 deletions(-) rename proto/fx/base/v1/{query.proto => legacy.proto} (100%) rename proto/fx/other/{query.proto => legacy.proto} (100%) rename server/grpc/gasprice/legacy/v1/{query.pb.go => legacy.pb.go} (78%) rename server/grpc/gasprice/legacy/v1/{query.pb.gw.go => legacy.pb.gw.go} (99%) rename server/grpc/gasprice/legacy/v2/{query.pb.go => legacy.pb.go} (77%) rename server/grpc/gasprice/legacy/v2/{query.pb.gw.go => legacy.pb.gw.go} (99%) diff --git a/proto/fx/base/v1/query.proto b/proto/fx/base/v1/legacy.proto similarity index 100% rename from proto/fx/base/v1/query.proto rename to proto/fx/base/v1/legacy.proto diff --git a/proto/fx/other/query.proto b/proto/fx/other/legacy.proto similarity index 100% rename from proto/fx/other/query.proto rename to proto/fx/other/legacy.proto diff --git a/server/grpc/gasprice/legacy/v1/query.pb.go b/server/grpc/gasprice/legacy/v1/legacy.pb.go similarity index 78% rename from server/grpc/gasprice/legacy/v1/query.pb.go rename to server/grpc/gasprice/legacy/v1/legacy.pb.go index 92c6f7ce7..f4f601da4 100644 --- a/server/grpc/gasprice/legacy/v1/query.pb.go +++ b/server/grpc/gasprice/legacy/v1/legacy.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: fx/other/query.proto +// source: fx/other/legacy.proto package v1 @@ -39,7 +39,7 @@ func (m *GasPriceRequest) Reset() { *m = GasPriceRequest{} } func (m *GasPriceRequest) String() string { return proto.CompactTextString(m) } func (*GasPriceRequest) ProtoMessage() {} func (*GasPriceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b3b7581ad9e0fdb7, []int{0} + return fileDescriptor_3629dd7decf88f4f, []int{0} } func (m *GasPriceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ func (m *GasPriceResponse) Reset() { *m = GasPriceResponse{} } func (m *GasPriceResponse) String() string { return proto.CompactTextString(m) } func (*GasPriceResponse) ProtoMessage() {} func (*GasPriceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b3b7581ad9e0fdb7, []int{1} + return fileDescriptor_3629dd7decf88f4f, []int{1} } func (m *GasPriceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,34 +118,34 @@ func init() { proto.RegisterType((*GasPriceResponse)(nil), "fx.other.GasPriceResponse") } -func init() { proto.RegisterFile("fx/other/query.proto", fileDescriptor_b3b7581ad9e0fdb7) } - -var fileDescriptor_b3b7581ad9e0fdb7 = []byte{ - // 377 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xb1, 0x4e, 0xe3, 0x30, - 0x18, 0xc7, 0x93, 0x3b, 0xdd, 0xa9, 0xe7, 0x1b, 0xee, 0x9a, 0xeb, 0x49, 0xd7, 0x1c, 0x4a, 0x51, - 0xa6, 0x2e, 0xb5, 0xd5, 0xb2, 0xc1, 0x56, 0x04, 0xac, 0x50, 0x89, 0x85, 0x01, 0x70, 0x8d, 0xe3, - 0x46, 0xb4, 0xf9, 0xd2, 0xd8, 0xa9, 0x92, 0x09, 0x89, 0x27, 0x40, 0xea, 0x5b, 0xf0, 0x24, 0x65, - 0xab, 0xc4, 0xc2, 0x54, 0x50, 0xcb, 0x13, 0xf0, 0x04, 0xc8, 0x49, 0xda, 0x22, 0xc4, 0xc8, 0xe4, - 0x4f, 0xff, 0xcf, 0xfe, 0xeb, 0xf7, 0xfd, 0x3f, 0xa3, 0x8a, 0x97, 0x10, 0x50, 0x3d, 0x1e, 0x91, - 0x61, 0xcc, 0xa3, 0x14, 0x87, 0x11, 0x28, 0xb0, 0x4a, 0x5e, 0x82, 0x33, 0xd5, 0x76, 0x18, 0xc8, - 0x01, 0x48, 0xd2, 0xa5, 0x92, 0x93, 0x51, 0xb3, 0xcb, 0x15, 0x6d, 0x12, 0x06, 0x7e, 0x90, 0xdf, - 0xb4, 0x2b, 0x02, 0x04, 0x64, 0x25, 0xd1, 0x55, 0xa1, 0x6e, 0x08, 0x00, 0xd1, 0xe7, 0x84, 0x86, - 0x3e, 0xa1, 0x41, 0x00, 0x8a, 0x2a, 0x1f, 0x02, 0x99, 0x77, 0xdd, 0x32, 0xfa, 0x75, 0x40, 0xe5, - 0x61, 0xe4, 0x33, 0xde, 0xe1, 0xc3, 0x98, 0x4b, 0xe5, 0x8e, 0x4d, 0xf4, 0x7b, 0xad, 0xc9, 0x10, - 0x02, 0xc9, 0xad, 0x2b, 0x84, 0x04, 0x95, 0x67, 0xa1, 0x16, 0xe5, 0x3f, 0x73, 0xf3, 0x6b, 0xfd, - 0x67, 0xab, 0x8a, 0x73, 0x20, 0xac, 0x81, 0x70, 0x01, 0x84, 0x77, 0xc1, 0x0f, 0xda, 0x7b, 0x93, - 0x59, 0xcd, 0x78, 0x99, 0xd5, 0xca, 0x29, 0x1d, 0xf4, 0xb7, 0xdd, 0xf5, 0x53, 0xf7, 0xf6, 0xb1, - 0x56, 0x17, 0xbe, 0xea, 0xc5, 0x5d, 0xcc, 0x60, 0x40, 0x8a, 0x91, 0xf2, 0xa3, 0x21, 0x2f, 0x2e, - 0x89, 0x4a, 0x43, 0x2e, 0x33, 0x17, 0xd9, 0xf9, 0x21, 0x0a, 0x0e, 0xd9, 0xba, 0x33, 0xd1, 0xb7, - 0x23, 0x1d, 0x8b, 0x75, 0x8e, 0xd0, 0x7e, 0xb2, 0x04, 0xb4, 0xaa, 0x78, 0x99, 0x0f, 0x7e, 0x37, - 0x88, 0x6d, 0x7f, 0xd4, 0xca, 0xe7, 0x71, 0xff, 0x5f, 0xdf, 0x3f, 0x8f, 0xbf, 0xfc, 0xb5, 0xfe, - 0x90, 0x55, 0xe8, 0x2b, 0x48, 0xeb, 0x14, 0x95, 0x3e, 0xcf, 0x3f, 0x37, 0x1f, 0x35, 0xd7, 0xfe, - 0xed, 0xe3, 0xc9, 0xdc, 0x31, 0xa7, 0x73, 0xc7, 0x7c, 0x9a, 0x3b, 0xe6, 0xcd, 0xc2, 0x31, 0xa6, - 0x0b, 0xc7, 0x78, 0x58, 0x38, 0xc6, 0xc9, 0xce, 0x9b, 0x68, 0xbc, 0x38, 0x60, 0x7a, 0x55, 0x09, - 0xf1, 0x92, 0x06, 0x83, 0x88, 0x13, 0xc9, 0xa3, 0x91, 0x06, 0x8d, 0x42, 0xa6, 0xdd, 0x32, 0x33, - 0xd2, 0xe7, 0x82, 0xb2, 0x54, 0xff, 0x87, 0xef, 0xd9, 0x4a, 0xb7, 0x5e, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x46, 0x6a, 0x8f, 0x06, 0x48, 0x02, 0x00, 0x00, +func init() { proto.RegisterFile("fx/other/legacy.proto", fileDescriptor_3629dd7decf88f4f) } + +var fileDescriptor_3629dd7decf88f4f = []byte{ + // 372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xcf, 0x4e, 0xf2, 0x40, + 0x14, 0xc5, 0xdb, 0xef, 0x8b, 0x06, 0xc7, 0x85, 0x52, 0x25, 0x91, 0x6a, 0x8a, 0xe9, 0x8a, 0x0d, + 0x33, 0x01, 0x77, 0xba, 0xc3, 0xa8, 0x5b, 0x25, 0x71, 0xe3, 0x42, 0x1d, 0xc6, 0xe9, 0xd0, 0x08, + 0xbd, 0xb5, 0x33, 0x25, 0xed, 0xca, 0xc4, 0x27, 0x30, 0xe1, 0x2d, 0x7c, 0x12, 0xdc, 0x91, 0xb8, + 0x71, 0x85, 0x06, 0x7c, 0x02, 0x9f, 0xc0, 0xf4, 0x0f, 0x60, 0x8c, 0x4b, 0x57, 0xbd, 0x39, 0xb7, + 0x73, 0xf2, 0xbb, 0xe7, 0x5e, 0x54, 0x72, 0x22, 0x02, 0xaa, 0xc3, 0x03, 0xd2, 0xe5, 0x82, 0xb2, + 0x18, 0xfb, 0x01, 0x28, 0x30, 0x0a, 0x4e, 0x84, 0x53, 0xd9, 0xb4, 0x18, 0xc8, 0x1e, 0x48, 0xd2, + 0xa6, 0x92, 0x93, 0x7e, 0xbd, 0xcd, 0x15, 0xad, 0x13, 0x06, 0xae, 0x97, 0xfd, 0x69, 0x6e, 0x0a, + 0x10, 0x90, 0x96, 0x24, 0xa9, 0x72, 0x75, 0x47, 0x00, 0x88, 0x2e, 0x27, 0xd4, 0x77, 0x09, 0xf5, + 0x3c, 0x50, 0x54, 0xb9, 0xe0, 0xc9, 0xac, 0x6b, 0x17, 0xd1, 0xda, 0x09, 0x95, 0xa7, 0x81, 0xcb, + 0x78, 0x8b, 0xdf, 0x85, 0x5c, 0x2a, 0x7b, 0xa0, 0xa3, 0xf5, 0x85, 0x26, 0x7d, 0xf0, 0x24, 0x37, + 0xee, 0x11, 0x12, 0x54, 0x5e, 0xf9, 0x89, 0x28, 0xb7, 0xf4, 0xdd, 0xff, 0xd5, 0xd5, 0x46, 0x19, + 0x67, 0x40, 0x38, 0x01, 0xc2, 0x39, 0x10, 0x3e, 0x04, 0xd7, 0x6b, 0x1e, 0x0d, 0xc7, 0x15, 0xed, + 0x73, 0x5c, 0x29, 0xc6, 0xb4, 0xd7, 0xdd, 0xb7, 0x17, 0x4f, 0xed, 0xa7, 0xb7, 0x4a, 0x55, 0xb8, + 0xaa, 0x13, 0xb6, 0x31, 0x83, 0x1e, 0xc9, 0x47, 0xca, 0x3e, 0x35, 0x79, 0x73, 0x4b, 0x54, 0xec, + 0x73, 0x99, 0xba, 0xc8, 0xd6, 0x8a, 0xc8, 0x39, 0x64, 0xe3, 0x59, 0x47, 0x4b, 0x67, 0x21, 0x0f, + 0x62, 0xe3, 0x1a, 0xa1, 0xe3, 0x68, 0x06, 0x68, 0x94, 0xf1, 0x2c, 0x1f, 0xfc, 0x63, 0x10, 0xd3, + 0xfc, 0xad, 0x95, 0xcd, 0x63, 0x6f, 0x3f, 0xbc, 0x7c, 0x0c, 0xfe, 0x95, 0x8c, 0x0d, 0x32, 0x4f, + 0x7d, 0x0e, 0x69, 0x5c, 0xa2, 0xc2, 0xdf, 0xf9, 0x67, 0xe6, 0xfd, 0xfa, 0xc2, 0xbf, 0x79, 0x3e, + 0x9c, 0x58, 0xfa, 0x68, 0x62, 0xe9, 0xef, 0x13, 0x4b, 0x7f, 0x9c, 0x5a, 0xda, 0x68, 0x6a, 0x69, + 0xaf, 0x53, 0x4b, 0xbb, 0x38, 0xf8, 0x16, 0x8d, 0x13, 0x7a, 0x2c, 0x59, 0x55, 0x44, 0x9c, 0xa8, + 0xc6, 0x20, 0xe0, 0x44, 0xf2, 0xa0, 0x9f, 0x80, 0x06, 0x3e, 0x4b, 0xdc, 0x52, 0xb3, 0xfc, 0x58, + 0x92, 0x7b, 0x58, 0x4e, 0x57, 0xba, 0xf7, 0x15, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x32, 0x7c, 0x2c, + 0x49, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -265,7 +265,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "fx/other/query.proto", + Metadata: "fx/other/legacy.proto", } func (m *GasPriceRequest) Marshal() (dAtA []byte, err error) { @@ -319,7 +319,7 @@ func (m *GasPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + i = encodeVarintLegacy(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -328,8 +328,8 @@ func (m *GasPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) +func encodeVarintLegacy(dAtA []byte, offset int, v uint64) int { + offset -= sovLegacy(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -357,17 +357,17 @@ func (m *GasPriceResponse) Size() (n int) { if len(m.GasPrices) > 0 { for _, e := range m.GasPrices { l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + n += 1 + l + sovLegacy(uint64(l)) } } return n } -func sovQuery(x uint64) (n int) { +func sovLegacy(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozQuery(x uint64) (n int) { - return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozLegacy(x uint64) (n int) { + return sovLegacy(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *GasPriceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -377,7 +377,7 @@ func (m *GasPriceRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -400,12 +400,12 @@ func (m *GasPriceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) + skippy, err := skipLegacy(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -427,7 +427,7 @@ func (m *GasPriceResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -455,7 +455,7 @@ func (m *GasPriceResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -468,11 +468,11 @@ func (m *GasPriceResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if postIndex > l { return io.ErrUnexpectedEOF @@ -484,12 +484,12 @@ func (m *GasPriceResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) + skippy, err := skipLegacy(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -503,7 +503,7 @@ func (m *GasPriceResponse) Unmarshal(dAtA []byte) error { } return nil } -func skipQuery(dAtA []byte) (n int, err error) { +func skipLegacy(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -511,7 +511,7 @@ func skipQuery(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -528,7 +528,7 @@ func skipQuery(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -544,7 +544,7 @@ func skipQuery(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -557,14 +557,14 @@ func skipQuery(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthQuery + return 0, ErrInvalidLengthLegacy } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupQuery + return 0, ErrUnexpectedEndOfGroupLegacy } depth-- case 5: @@ -573,7 +573,7 @@ func skipQuery(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthQuery + return 0, ErrInvalidLengthLegacy } if depth == 0 { return iNdEx, nil @@ -583,7 +583,7 @@ func skipQuery(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthQuery = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowQuery = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthLegacy = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowLegacy = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupLegacy = fmt.Errorf("proto: unexpected end of group") ) diff --git a/server/grpc/gasprice/legacy/v1/query.pb.gw.go b/server/grpc/gasprice/legacy/v1/legacy.pb.gw.go similarity index 99% rename from server/grpc/gasprice/legacy/v1/query.pb.gw.go rename to server/grpc/gasprice/legacy/v1/legacy.pb.gw.go index 377e53654..e729f43d8 100644 --- a/server/grpc/gasprice/legacy/v1/query.pb.gw.go +++ b/server/grpc/gasprice/legacy/v1/legacy.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: fx/other/query.proto +// source: fx/other/legacy.proto /* Package v1 is a reverse proxy. diff --git a/server/grpc/gasprice/legacy/v2/query.pb.go b/server/grpc/gasprice/legacy/v2/legacy.pb.go similarity index 77% rename from server/grpc/gasprice/legacy/v2/query.pb.go rename to server/grpc/gasprice/legacy/v2/legacy.pb.go index d837106bf..0e7d19031 100644 --- a/server/grpc/gasprice/legacy/v2/query.pb.go +++ b/server/grpc/gasprice/legacy/v2/legacy.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: fx/base/v1/query.proto +// source: fx/base/v1/legacy.proto package v2 @@ -39,7 +39,7 @@ func (m *GetGasPriceRequest) Reset() { *m = GetGasPriceRequest{} } func (m *GetGasPriceRequest) String() string { return proto.CompactTextString(m) } func (*GetGasPriceRequest) ProtoMessage() {} func (*GetGasPriceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_89fcae625cd3656d, []int{0} + return fileDescriptor_a72c8556a163ae4f, []int{0} } func (m *GetGasPriceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ func (m *GetGasPriceResponse) Reset() { *m = GetGasPriceResponse{} } func (m *GetGasPriceResponse) String() string { return proto.CompactTextString(m) } func (*GetGasPriceResponse) ProtoMessage() {} func (*GetGasPriceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_89fcae625cd3656d, []int{1} + return fileDescriptor_a72c8556a163ae4f, []int{1} } func (m *GetGasPriceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,33 +118,33 @@ func init() { proto.RegisterType((*GetGasPriceResponse)(nil), "fx.base.v1.GetGasPriceResponse") } -func init() { proto.RegisterFile("fx/base/v1/query.proto", fileDescriptor_89fcae625cd3656d) } +func init() { proto.RegisterFile("fx/base/v1/legacy.proto", fileDescriptor_a72c8556a163ae4f) } -var fileDescriptor_89fcae625cd3656d = []byte{ - // 361 bytes of a gzipped FileDescriptorProto +var fileDescriptor_a72c8556a163ae4f = []byte{ + // 360 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40, - 0x14, 0xc6, 0x93, 0x7b, 0xb9, 0x17, 0xee, 0x74, 0x75, 0x63, 0xfd, 0x57, 0x74, 0x22, 0x59, 0x75, - 0xd3, 0x19, 0x5a, 0x77, 0xba, 0xab, 0x48, 0xb7, 0x5a, 0x70, 0xe3, 0x46, 0x26, 0xe3, 0x64, 0x0c, - 0x36, 0x99, 0x34, 0x67, 0x12, 0x92, 0x95, 0xe0, 0x13, 0x08, 0x82, 0x0f, 0xe1, 0x93, 0x74, 0x59, - 0x70, 0xe3, 0xaa, 0x4a, 0xeb, 0x13, 0xf8, 0x04, 0x92, 0xa4, 0xb5, 0x15, 0x71, 0x35, 0x87, 0xef, - 0x9c, 0x39, 0xfc, 0xbe, 0xef, 0xa0, 0x0d, 0x2f, 0xa3, 0x2e, 0x03, 0x41, 0xd3, 0x36, 0x1d, 0x26, - 0x22, 0xce, 0x49, 0x14, 0x2b, 0xad, 0x2c, 0xe4, 0x65, 0xa4, 0xd0, 0x49, 0xda, 0x6e, 0x60, 0xae, - 0x20, 0x50, 0xb0, 0x98, 0x73, 0x85, 0x66, 0x6d, 0xca, 0x95, 0x1f, 0x56, 0xb3, 0x8d, 0xba, 0x54, - 0x52, 0x95, 0x25, 0x2d, 0xaa, 0xb9, 0xba, 0x23, 0x95, 0x92, 0x03, 0x41, 0x59, 0xe4, 0x53, 0x16, - 0x86, 0x4a, 0x33, 0xed, 0xab, 0x10, 0xaa, 0xae, 0x53, 0x47, 0x56, 0x4f, 0xe8, 0x1e, 0x83, 0x93, - 0xd8, 0xe7, 0xa2, 0x2f, 0x86, 0x89, 0x00, 0xed, 0x3c, 0x98, 0x68, 0xed, 0x8b, 0x0c, 0x91, 0x0a, - 0x41, 0x58, 0x37, 0x08, 0x49, 0x06, 0x17, 0x51, 0x21, 0xc2, 0x96, 0xb9, 0xf7, 0xbb, 0x59, 0xeb, - 0x6c, 0x93, 0x0a, 0x6b, 0x81, 0x59, 0x62, 0x91, 0x23, 0xe5, 0x87, 0xdd, 0xe3, 0xd1, 0xc4, 0x36, - 0xde, 0x27, 0xf6, 0xff, 0x9c, 0x05, 0x83, 0x03, 0x67, 0xf9, 0xd5, 0x79, 0x7c, 0xb1, 0x9b, 0xd2, - 0xd7, 0x57, 0x89, 0x4b, 0xb8, 0x0a, 0xe8, 0xdc, 0x58, 0xf5, 0xb4, 0xe0, 0xf2, 0x9a, 0xea, 0x3c, - 0x12, 0x50, 0x6e, 0x81, 0xfe, 0x3f, 0x39, 0xe7, 0x80, 0x4e, 0x8a, 0xfe, 0x9c, 0x16, 0xe9, 0x58, - 0x01, 0xaa, 0xad, 0x00, 0x5a, 0x98, 0x2c, 0x73, 0x22, 0xdf, 0x0d, 0x35, 0xec, 0x1f, 0xfb, 0x95, - 0x33, 0x67, 0xf7, 0xf6, 0xe9, 0xed, 0xfe, 0xd7, 0xa6, 0xb5, 0x4e, 0x57, 0x0e, 0xf1, 0x09, 0xdc, - 0x3d, 0x1b, 0x4d, 0xb1, 0x39, 0x9e, 0x62, 0xf3, 0x75, 0x8a, 0xcd, 0xbb, 0x19, 0x36, 0xc6, 0x33, - 0x6c, 0x3c, 0xcf, 0xb0, 0x71, 0x7e, 0xb8, 0x62, 0xc3, 0x4b, 0x42, 0x5e, 0x84, 0x9b, 0x51, 0x2f, - 0x6b, 0x71, 0x15, 0x0b, 0x0a, 0x22, 0x4e, 0x45, 0x4c, 0x65, 0x1c, 0xf1, 0x62, 0x5b, 0xb9, 0x8c, - 0x0e, 0x84, 0x64, 0x3c, 0xa7, 0x69, 0xc7, 0xfd, 0x5b, 0x1e, 0x61, 0xff, 0x23, 0x00, 0x00, 0xff, - 0xff, 0xa9, 0x20, 0x6a, 0xf0, 0xfe, 0x01, 0x00, 0x00, + 0x14, 0xc6, 0x93, 0x7b, 0xb9, 0x17, 0xee, 0x74, 0x75, 0x73, 0x7b, 0xa9, 0x16, 0x9d, 0x48, 0x56, + 0xdd, 0x74, 0x86, 0xd6, 0x9d, 0xee, 0x2a, 0xd2, 0xad, 0x16, 0xdc, 0xb8, 0x91, 0xc9, 0x38, 0x19, + 0x83, 0x4d, 0x26, 0xe6, 0x4c, 0x42, 0xb2, 0x12, 0x7c, 0x02, 0x41, 0xf0, 0x21, 0x7c, 0x92, 0x2e, + 0x0b, 0x6e, 0x5c, 0x55, 0x69, 0x7d, 0x02, 0x9f, 0x40, 0xf2, 0xa7, 0xb6, 0x22, 0xae, 0xe6, 0x70, + 0xce, 0x99, 0x8f, 0xdf, 0x77, 0x3e, 0xd4, 0xf2, 0x32, 0xea, 0x32, 0x10, 0x34, 0xed, 0xd1, 0xb1, + 0x90, 0x8c, 0xe7, 0x24, 0x8a, 0x95, 0x56, 0x16, 0xf2, 0x32, 0x52, 0x0c, 0x48, 0xda, 0x6b, 0x63, + 0xae, 0x20, 0x50, 0xb0, 0x5c, 0x74, 0x85, 0x66, 0x3d, 0xca, 0x95, 0x1f, 0x56, 0xbb, 0xed, 0xa6, + 0x54, 0x52, 0x95, 0x25, 0x2d, 0xaa, 0xba, 0xbb, 0x25, 0x95, 0x92, 0x63, 0x41, 0x59, 0xe4, 0x53, + 0x16, 0x86, 0x4a, 0x33, 0xed, 0xab, 0x10, 0xaa, 0xa9, 0xd3, 0x44, 0xd6, 0x50, 0xe8, 0x21, 0x83, + 0xa3, 0xd8, 0xe7, 0x62, 0x24, 0xae, 0x12, 0x01, 0xda, 0xb9, 0x37, 0xd1, 0xbf, 0x4f, 0x6d, 0x88, + 0x54, 0x08, 0xc2, 0xba, 0x46, 0x48, 0x32, 0x38, 0x8b, 0x8a, 0x26, 0x6c, 0x98, 0x3b, 0x3f, 0x3b, + 0x8d, 0xfe, 0x26, 0xa9, 0xb0, 0x96, 0x98, 0x25, 0x16, 0x39, 0x50, 0x7e, 0x38, 0x38, 0x9c, 0xcc, + 0x6c, 0xe3, 0x6d, 0x66, 0xff, 0xcd, 0x59, 0x30, 0xde, 0x73, 0x56, 0x5f, 0x9d, 0x87, 0x67, 0xbb, + 0x23, 0x7d, 0x7d, 0x91, 0xb8, 0x84, 0xab, 0x80, 0xd6, 0xc6, 0xaa, 0xa7, 0x0b, 0xe7, 0x97, 0x54, + 0xe7, 0x91, 0x80, 0x52, 0x05, 0x46, 0x7f, 0x64, 0xcd, 0x01, 0xfd, 0x14, 0xfd, 0x3a, 0x4e, 0x44, + 0x9c, 0x5b, 0x01, 0x6a, 0xac, 0x01, 0x5a, 0x98, 0xac, 0xee, 0x44, 0xbe, 0x1a, 0x6a, 0xdb, 0xdf, + 0xce, 0x2b, 0x67, 0xce, 0xf6, 0xcd, 0xe3, 0xeb, 0xdd, 0x8f, 0x96, 0xf5, 0x9f, 0xae, 0x25, 0xf1, + 0x01, 0x3c, 0x38, 0x99, 0xcc, 0xb1, 0x39, 0x9d, 0x63, 0xf3, 0x65, 0x8e, 0xcd, 0xdb, 0x05, 0x36, + 0xa6, 0x0b, 0x6c, 0x3c, 0x2d, 0xb0, 0x71, 0xba, 0xbf, 0x66, 0xc3, 0x4b, 0x42, 0x5e, 0x1c, 0x37, + 0xa3, 0x5e, 0xd6, 0xe5, 0x2a, 0x16, 0x14, 0x44, 0x9c, 0x8a, 0x98, 0xca, 0x38, 0xe2, 0x85, 0x5a, + 0x29, 0x56, 0x07, 0x4c, 0xd3, 0xbe, 0xfb, 0xbb, 0x0c, 0x61, 0xf7, 0x3d, 0x00, 0x00, 0xff, 0xff, + 0xac, 0xdd, 0xe5, 0x20, 0xff, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -226,7 +226,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "fx/base/v1/query.proto", + Metadata: "fx/base/v1/legacy.proto", } func (m *GetGasPriceRequest) Marshal() (dAtA []byte, err error) { @@ -280,7 +280,7 @@ func (m *GetGasPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + i = encodeVarintLegacy(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -289,8 +289,8 @@ func (m *GetGasPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) +func encodeVarintLegacy(dAtA []byte, offset int, v uint64) int { + offset -= sovLegacy(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -318,17 +318,17 @@ func (m *GetGasPriceResponse) Size() (n int) { if len(m.GasPrices) > 0 { for _, e := range m.GasPrices { l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + n += 1 + l + sovLegacy(uint64(l)) } } return n } -func sovQuery(x uint64) (n int) { +func sovLegacy(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozQuery(x uint64) (n int) { - return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozLegacy(x uint64) (n int) { + return sovLegacy(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *GetGasPriceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -338,7 +338,7 @@ func (m *GetGasPriceRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -361,12 +361,12 @@ func (m *GetGasPriceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) + skippy, err := skipLegacy(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -388,7 +388,7 @@ func (m *GetGasPriceResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -416,7 +416,7 @@ func (m *GetGasPriceResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowQuery + return ErrIntOverflowLegacy } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -429,11 +429,11 @@ func (m *GetGasPriceResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if postIndex > l { return io.ErrUnexpectedEOF @@ -445,12 +445,12 @@ func (m *GetGasPriceResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) + skippy, err := skipLegacy(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery + return ErrInvalidLengthLegacy } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -464,7 +464,7 @@ func (m *GetGasPriceResponse) Unmarshal(dAtA []byte) error { } return nil } -func skipQuery(dAtA []byte) (n int, err error) { +func skipLegacy(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -472,7 +472,7 @@ func skipQuery(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -489,7 +489,7 @@ func skipQuery(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -505,7 +505,7 @@ func skipQuery(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowQuery + return 0, ErrIntOverflowLegacy } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -518,14 +518,14 @@ func skipQuery(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthQuery + return 0, ErrInvalidLengthLegacy } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupQuery + return 0, ErrUnexpectedEndOfGroupLegacy } depth-- case 5: @@ -534,7 +534,7 @@ func skipQuery(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthQuery + return 0, ErrInvalidLengthLegacy } if depth == 0 { return iNdEx, nil @@ -544,7 +544,7 @@ func skipQuery(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthQuery = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowQuery = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthLegacy = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowLegacy = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupLegacy = fmt.Errorf("proto: unexpected end of group") ) diff --git a/server/grpc/gasprice/legacy/v2/query.pb.gw.go b/server/grpc/gasprice/legacy/v2/legacy.pb.gw.go similarity index 99% rename from server/grpc/gasprice/legacy/v2/query.pb.gw.go rename to server/grpc/gasprice/legacy/v2/legacy.pb.gw.go index fb27fae27..6347e6ab4 100644 --- a/server/grpc/gasprice/legacy/v2/query.pb.gw.go +++ b/server/grpc/gasprice/legacy/v2/legacy.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: fx/base/v1/query.proto +// source: fx/base/v1/legacy.proto /* Package v2 is a reverse proxy.