From 05f55f1b4385e71df19b7d545bd685ed27af58bd Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 2 Dec 2019 15:39:35 -0500
Subject: [PATCH] chore(pb): regenerate protobufs and add a makefile
---
internal/pb/Makefile | 11 ++++
internal/pb/header.pb.go | 120 +++++++++++++++------------------------
2 files changed, 58 insertions(+), 73 deletions(-)
create mode 100644 internal/pb/Makefile
diff --git a/internal/pb/Makefile b/internal/pb/Makefile
new file mode 100644
index 0000000..df34e54
--- /dev/null
+++ b/internal/pb/Makefile
@@ -0,0 +1,11 @@
+PB = $(wildcard *.proto)
+GO = $(PB:.proto=.pb.go)
+
+all: $(GO)
+
+%.pb.go: %.proto
+ protoc --proto_path=$(GOPATH)/src:. --gogofaster_out=. $<
+
+clean:
+ rm -f *.pb.go
+ rm -f *.go
diff --git a/internal/pb/header.pb.go b/internal/pb/header.pb.go
index 71196b2..b8b3b0e 100644
--- a/internal/pb/header.pb.go
+++ b/internal/pb/header.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: pin/internal/pb/header.proto
+// source: header.proto
package pb
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -20,7 +21,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Set struct {
// 1 for now, library will refuse to handle entries with an unrecognized version.
@@ -35,7 +36,7 @@ func (m *Set) Reset() { *m = Set{} }
func (m *Set) String() string { return proto.CompactTextString(m) }
func (*Set) ProtoMessage() {}
func (*Set) Descriptor() ([]byte, []int) {
- return fileDescriptor_cda303a5a3ed87e7, []int{0}
+ return fileDescriptor_6398613e36d6c2ce, []int{0}
}
func (m *Set) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -45,7 +46,7 @@ func (m *Set) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Set.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -89,12 +90,11 @@ func init() {
proto.RegisterType((*Set)(nil), "ipfs.pin.Set")
}
-func init() { proto.RegisterFile("pin/internal/pb/header.proto", fileDescriptor_cda303a5a3ed87e7) }
+func init() { proto.RegisterFile("header.proto", fileDescriptor_6398613e36d6c2ce) }
-var fileDescriptor_cda303a5a3ed87e7 = []byte{
- // 162 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0xc8, 0xcc, 0xd3,
- 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0xd1, 0x2f, 0x48, 0xd2, 0xcf, 0x48, 0x4d, 0x4c,
+var fileDescriptor_6398613e36d6c2ce = []byte{
+ // 146 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xc9, 0x48, 0x4d, 0x4c,
0x49, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xc8, 0x2c, 0x48, 0x2b, 0xd6, 0x2b,
0xc8, 0xcc, 0x53, 0x8a, 0xe5, 0x62, 0x0e, 0x4e, 0x2d, 0x11, 0x92, 0xe3, 0x62, 0x2f, 0x4b, 0x2d,
0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x75, 0x62, 0x39, 0x71, 0x4f, 0x9e,
@@ -102,14 +102,14 @@ var fileDescriptor_cda303a5a3ed87e7 = []byte{
0x24, 0x0d, 0x15, 0x13, 0x92, 0xe0, 0x62, 0x29, 0x4e, 0x4d, 0x4d, 0x91, 0x60, 0x56, 0x60, 0xd4,
0x60, 0x87, 0xca, 0x81, 0x45, 0x9c, 0x64, 0x4e, 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, 0x8a, 0xa9, 0x20, 0x09, 0x10, 0x00, 0x00, 0xff, 0xff, 0x20, 0x85, 0x2f, 0x24, 0xa5, 0x00,
+ 0x21, 0x8a, 0xa9, 0x20, 0x09, 0x10, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x49, 0x19, 0x51, 0x95, 0x00,
0x00, 0x00,
}
func (m *Set) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -117,31 +117,38 @@ func (m *Set) Marshal() (dAtA []byte, err error) {
}
func (m *Set) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Set) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- dAtA[i] = 0x8
- i++
- i = encodeVarintHeader(dAtA, i, uint64(m.Version))
- dAtA[i] = 0x10
- i++
- i = encodeVarintHeader(dAtA, i, uint64(m.Fanout))
- dAtA[i] = 0x1d
- i++
+ i -= 4
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Seed))
- i += 4
- return i, nil
+ i--
+ dAtA[i] = 0x1d
+ i = encodeVarintHeader(dAtA, i, uint64(m.Fanout))
+ i--
+ dAtA[i] = 0x10
+ i = encodeVarintHeader(dAtA, i, uint64(m.Version))
+ i--
+ dAtA[i] = 0x8
+ return len(dAtA) - i, nil
}
func encodeVarintHeader(dAtA []byte, offset int, v uint64) int {
+ offset -= sovHeader(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func (m *Set) Size() (n int) {
if m == nil {
@@ -156,14 +163,7 @@ func (m *Set) Size() (n int) {
}
func sovHeader(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozHeader(x uint64) (n int) {
return sovHeader(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -272,6 +272,7 @@ func (m *Set) Unmarshal(dAtA []byte) error {
func skipHeader(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -303,10 +304,8 @@ func skipHeader(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -327,55 +326,30 @@ func skipHeader(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthHeader
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthHeader
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowHeader
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipHeader(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthHeader
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupHeader
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthHeader
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthHeader = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowHeader = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthHeader = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowHeader = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupHeader = fmt.Errorf("proto: unexpected end of group")
)
--
GitLab