fix(merkledag/pb) rename proto package -> merkledag_pb
Brian Tiger Chow committed
Oct 22, 2014 at 05:10 UTC
f620f87cd1a1691ababbb2e414ef6332f20feabb
4 files changed
+60
-57
merkledag/internal/pb/Makefile
+7
-4
@@ -1,8 +1,11 @@
1
+PB = $(wildcard *.proto)
2
+GO = $(PB:.proto=.pb.go)
3
2
-all: node.pb.go
4
+all: $(GO)
5
4
-node.pb.go: node.proto
5
- protoc --gogo_out=. --proto_path=../../../../:/usr/local/opt/protobuf/include:. $<
6
+%.pb.go: %.proto
7
+ protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
8
9
clean:
8
- rm node.pb.go
10
+ rm -f *.pb.go
11
+ rm -f *.go
merkledag/internal/pb/merkledag.pb.go
renamed
+48
-48
@@ -1,18 +1,18 @@
1
// Code generated by protoc-gen-gogo.
2
-// source: node.proto
2
+// source: merkledag.proto
3
// DO NOT EDIT!
4
5
/*
6
- Package merkledag is a generated protocol buffer package.
6
+ Package merkledag_pb is a generated protocol buffer package.
7
8
It is generated from these files:
9
- node.proto
9
+ merkledag.proto
10
11
It has these top-level messages:
12
PBLink
13
PBNode
14
*/
15
-package merkledag
15
+package merkledag_pb
16
17
import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
18
import math "math"
@@ -300,9 +300,9 @@ func (this *PBLink) String() string {
300
return "nil"
301
}
302
s := strings.Join([]string{`&PBLink{`,
303
- `Hash:` + valueToStringNode(this.Hash) + `,`,
304
- `Name:` + valueToStringNode(this.Name) + `,`,
305
- `Tsize:` + valueToStringNode(this.Tsize) + `,`,
303
+ `Hash:` + valueToStringMerkledag(this.Hash) + `,`,
304
+ `Name:` + valueToStringMerkledag(this.Name) + `,`,
305
+ `Tsize:` + valueToStringMerkledag(this.Tsize) + `,`,
306
`XXX_unrecognized:` + fmt1.Sprintf("%v", this.XXX_unrecognized) + `,`,
307
`}`,
308
}, "")
@@ -314,13 +314,13 @@ func (this *PBNode) String() string {
314
}
315
s := strings.Join([]string{`&PBNode{`,
316
`Links:` + strings.Replace(fmt1.Sprintf("%v", this.Links), "PBLink", "PBLink", 1) + `,`,
317
- `Data:` + valueToStringNode(this.Data) + `,`,
317
+ `Data:` + valueToStringMerkledag(this.Data) + `,`,
318
`XXX_unrecognized:` + fmt1.Sprintf("%v", this.XXX_unrecognized) + `,`,
319
`}`,
320
}, "")
321
return s
322
}
323
-func valueToStringNode(v interface{}) string {
323
+func valueToStringMerkledag(v interface{}) string {
324
rv := reflect.ValueOf(v)
325
if rv.IsNil() {
326
return "nil"
@@ -333,14 +333,14 @@ func (m *PBLink) Size() (n int) {
333
_ = l
334
if m.Hash != nil {
335
l = len(m.Hash)
336
- n += 1 + l + sovNode(uint64(l))
336
+ n += 1 + l + sovMerkledag(uint64(l))
337
}
338
if m.Name != nil {
339
l = len(*m.Name)
340
- n += 1 + l + sovNode(uint64(l))
340
+ n += 1 + l + sovMerkledag(uint64(l))
341
}
342
if m.Tsize != nil {
343
- n += 1 + sovNode(uint64(*m.Tsize))
343
+ n += 1 + sovMerkledag(uint64(*m.Tsize))
344
}
345
if m.XXX_unrecognized != nil {
346
n += len(m.XXX_unrecognized)
@@ -353,12 +353,12 @@ func (m *PBNode) Size() (n int) {
353
if len(m.Links) > 0 {
354
for _, e := range m.Links {
355
l = e.Size()
356
- n += 1 + l + sovNode(uint64(l))
356
+ n += 1 + l + sovMerkledag(uint64(l))
357
}
358
}
359
if m.Data != nil {
360
l = len(m.Data)
361
- n += 1 + l + sovNode(uint64(l))
361
+ n += 1 + l + sovMerkledag(uint64(l))
362
}
363
if m.XXX_unrecognized != nil {
364
n += len(m.XXX_unrecognized)
@@ -366,7 +366,7 @@ func (m *PBNode) Size() (n int) {
366
return n
367
}
368
369
-func sovNode(x uint64) (n int) {
369
+func sovMerkledag(x uint64) (n int) {
370
for {
371
n++
372
x >>= 7
@@ -376,10 +376,10 @@ func sovNode(x uint64) (n int) {
376
}
377
return n
378
}
379
-func sozNode(x uint64) (n int) {
380
- return sovNode(uint64((x << 1) ^ uint64((int64(x) >> 63))))
379
+func sozMerkledag(x uint64) (n int) {
380
+ return sovMerkledag(uint64((x << 1) ^ uint64((int64(x) >> 63))))
381
}
382
-func NewPopulatedPBLink(r randyNode, easy bool) *PBLink {
382
+func NewPopulatedPBLink(r randyMerkledag, easy bool) *PBLink {
383
this := &PBLink{}
384
if r.Intn(10) != 0 {
385
v1 := r.Intn(100)
@@ -389,7 +389,7 @@ func NewPopulatedPBLink(r randyNode, easy bool) *PBLink {
389
}
390
}
391
if r.Intn(10) != 0 {
392
- v2 := randStringNode(r)
392
+ v2 := randStringMerkledag(r)
393
this.Name = &v2
394
}
395
if r.Intn(10) != 0 {
@@ -397,12 +397,12 @@ func NewPopulatedPBLink(r randyNode, easy bool) *PBLink {
397
this.Tsize = &v3
398
}
399
if !easy && r.Intn(10) != 0 {
400
- this.XXX_unrecognized = randUnrecognizedNode(r, 4)
400
+ this.XXX_unrecognized = randUnrecognizedMerkledag(r, 4)
401
}
402
return this
403
}
404
405
-func NewPopulatedPBNode(r randyNode, easy bool) *PBNode {
405
+func NewPopulatedPBNode(r randyMerkledag, easy bool) *PBNode {
406
this := &PBNode{}
407
if r.Intn(10) != 0 {
408
v4 := r.Intn(10)
@@ -419,12 +419,12 @@ func NewPopulatedPBNode(r randyNode, easy bool) *PBNode {
419
}
420
}
421
if !easy && r.Intn(10) != 0 {
422
- this.XXX_unrecognized = randUnrecognizedNode(r, 3)
422
+ this.XXX_unrecognized = randUnrecognizedMerkledag(r, 3)
423
}
424
return this
425
}
426
427
-type randyNode interface {
427
+type randyMerkledag interface {
428
Float32() float32
429
Float64() float64
430
Int63() int64
@@ -433,22 +433,22 @@ type randyNode interface {
433
Intn(n int) int
434
}
435
436
-func randUTF8RuneNode(r randyNode) rune {
436
+func randUTF8RuneMerkledag(r randyMerkledag) rune {
437
res := rune(r.Uint32() % 1112064)
438
if 55296 <= res {
439
res += 2047
440
}
441
return res
442
}
443
-func randStringNode(r randyNode) string {
443
+func randStringMerkledag(r randyMerkledag) string {
444
v6 := r.Intn(100)
445
tmps := make([]rune, v6)
446
for i := 0; i < v6; i++ {
447
- tmps[i] = randUTF8RuneNode(r)
447
+ tmps[i] = randUTF8RuneMerkledag(r)
448
}
449
return string(tmps)
450
}
451
-func randUnrecognizedNode(r randyNode, maxFieldNumber int) (data []byte) {
451
+func randUnrecognizedMerkledag(r randyMerkledag, maxFieldNumber int) (data []byte) {
452
l := r.Intn(5)
453
for i := 0; i < l; i++ {
454
wire := r.Intn(4)
@@ -456,37 +456,37 @@ func randUnrecognizedNode(r randyNode, maxFieldNumber int) (data []byte) {
456
wire = 5
457
}
458
fieldNumber := maxFieldNumber + r.Intn(100)
459
- data = randFieldNode(data, r, fieldNumber, wire)
459
+ data = randFieldMerkledag(data, r, fieldNumber, wire)
460
}
461
return data
462
}
463
-func randFieldNode(data []byte, r randyNode, fieldNumber int, wire int) []byte {
463
+func randFieldMerkledag(data []byte, r randyMerkledag, fieldNumber int, wire int) []byte {
464
key := uint32(fieldNumber)<<3 | uint32(wire)
465
switch wire {
466
case 0:
467
- data = encodeVarintPopulateNode(data, uint64(key))
467
+ data = encodeVarintPopulateMerkledag(data, uint64(key))
468
v7 := r.Int63()
469
if r.Intn(2) == 0 {
470
v7 *= -1
471
}
472
- data = encodeVarintPopulateNode(data, uint64(v7))
472
+ data = encodeVarintPopulateMerkledag(data, uint64(v7))
473
case 1:
474
- data = encodeVarintPopulateNode(data, uint64(key))
474
+ data = encodeVarintPopulateMerkledag(data, uint64(key))
475
data = append(data, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)))
476
case 2:
477
- data = encodeVarintPopulateNode(data, uint64(key))
477
+ data = encodeVarintPopulateMerkledag(data, uint64(key))
478
ll := r.Intn(100)
479
- data = encodeVarintPopulateNode(data, uint64(ll))
479
+ data = encodeVarintPopulateMerkledag(data, uint64(ll))
480
for j := 0; j < ll; j++ {
481
data = append(data, byte(r.Intn(256)))
482
}
483
default:
484
- data = encodeVarintPopulateNode(data, uint64(key))
484
+ data = encodeVarintPopulateMerkledag(data, uint64(key))
485
data = append(data, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)))
486
}
487
return data
488
}
489
-func encodeVarintPopulateNode(data []byte, v uint64) []byte {
489
+func encodeVarintPopulateMerkledag(data []byte, v uint64) []byte {
490
for v >= 1<<7 {
491
data = append(data, uint8(uint64(v)&0x7f|0x80))
492
v >>= 7
@@ -512,19 +512,19 @@ func (m *PBLink) MarshalTo(data []byte) (n int, err error) {
512
if m.Hash != nil {
513
data[i] = 0xa
514
i++
515
- i = encodeVarintNode(data, i, uint64(len(m.Hash)))
515
+ i = encodeVarintMerkledag(data, i, uint64(len(m.Hash)))
516
i += copy(data[i:], m.Hash)
517
}
518
if m.Name != nil {
519
data[i] = 0x12
520
i++
521
- i = encodeVarintNode(data, i, uint64(len(*m.Name)))
521
+ i = encodeVarintMerkledag(data, i, uint64(len(*m.Name)))
522
i += copy(data[i:], *m.Name)
523
}
524
if m.Tsize != nil {
525
data[i] = 0x18
526
i++
527
- i = encodeVarintNode(data, i, uint64(*m.Tsize))
527
+ i = encodeVarintMerkledag(data, i, uint64(*m.Tsize))
528
}
529
if m.XXX_unrecognized != nil {
530
i += copy(data[i:], m.XXX_unrecognized)
@@ -550,7 +550,7 @@ func (m *PBNode) MarshalTo(data []byte) (n int, err error) {
550
for _, msg := range m.Links {
551
data[i] = 0x12
552
i++
553
- i = encodeVarintNode(data, i, uint64(msg.Size()))
553
+ i = encodeVarintMerkledag(data, i, uint64(msg.Size()))
554
n, err := msg.MarshalTo(data[i:])
555
if err != nil {
556
return 0, err
@@ -561,7 +561,7 @@ func (m *PBNode) MarshalTo(data []byte) (n int, err error) {
561
if m.Data != nil {
562
data[i] = 0xa
563
i++
564
- i = encodeVarintNode(data, i, uint64(len(m.Data)))
564
+ i = encodeVarintMerkledag(data, i, uint64(len(m.Data)))
565
i += copy(data[i:], m.Data)
566
}
567
if m.XXX_unrecognized != nil {
@@ -569,7 +569,7 @@ func (m *PBNode) MarshalTo(data []byte) (n int, err error) {
569
}
570
return i, nil
571
}
572
-func encodeFixed64Node(data []byte, offset int, v uint64) int {
572
+func encodeFixed64Merkledag(data []byte, offset int, v uint64) int {
573
data[offset] = uint8(v)
574
data[offset+1] = uint8(v >> 8)
575
data[offset+2] = uint8(v >> 16)
@@ -580,14 +580,14 @@ func encodeFixed64Node(data []byte, offset int, v uint64) int {
580
data[offset+7] = uint8(v >> 56)
581
return offset + 8
582
}
583
-func encodeFixed32Node(data []byte, offset int, v uint32) int {
583
+func encodeFixed32Merkledag(data []byte, offset int, v uint32) int {
584
data[offset] = uint8(v)
585
data[offset+1] = uint8(v >> 8)
586
data[offset+2] = uint8(v >> 16)
587
data[offset+3] = uint8(v >> 24)
588
return offset + 4
589
}
590
-func encodeVarintNode(data []byte, offset int, v uint64) int {
590
+func encodeVarintMerkledag(data []byte, offset int, v uint64) int {
591
for v >= 1<<7 {
592
data[offset] = uint8(v&0x7f | 0x80)
593
v >>= 7
@@ -600,17 +600,17 @@ func (this *PBLink) GoString() string {
600
if this == nil {
601
return "nil"
602
}
603
- s := strings1.Join([]string{`&merkledag.PBLink{` + `Hash:` + valueToGoStringNode(this.Hash, "byte"), `Name:` + valueToGoStringNode(this.Name, "string"), `Tsize:` + valueToGoStringNode(this.Tsize, "uint64"), `XXX_unrecognized:` + fmt2.Sprintf("%#v", this.XXX_unrecognized) + `}`}, ", ")
603
+ s := strings1.Join([]string{`&merkledag_pb.PBLink{` + `Hash:` + valueToGoStringMerkledag(this.Hash, "byte"), `Name:` + valueToGoStringMerkledag(this.Name, "string"), `Tsize:` + valueToGoStringMerkledag(this.Tsize, "uint64"), `XXX_unrecognized:` + fmt2.Sprintf("%#v", this.XXX_unrecognized) + `}`}, ", ")
604
return s
605
}
606
func (this *PBNode) GoString() string {
607
if this == nil {
608
return "nil"
609
}
610
- s := strings1.Join([]string{`&merkledag.PBNode{` + `Links:` + fmt2.Sprintf("%#v", this.Links), `Data:` + valueToGoStringNode(this.Data, "byte"), `XXX_unrecognized:` + fmt2.Sprintf("%#v", this.XXX_unrecognized) + `}`}, ", ")
610
+ s := strings1.Join([]string{`&merkledag_pb.PBNode{` + `Links:` + fmt2.Sprintf("%#v", this.Links), `Data:` + valueToGoStringMerkledag(this.Data, "byte"), `XXX_unrecognized:` + fmt2.Sprintf("%#v", this.XXX_unrecognized) + `}`}, ", ")
611
return s
612
}
613
-func valueToGoStringNode(v interface{}, typ string) string {
613
+func valueToGoStringMerkledag(v interface{}, typ string) string {
614
rv := reflect1.ValueOf(v)
615
if rv.IsNil() {
616
return "nil"
@@ -618,7 +618,7 @@ func valueToGoStringNode(v interface{}, typ string) string {
618
pv := reflect1.Indirect(rv).Interface()
619
return fmt2.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
620
}
621
-func extensionToGoStringNode(e map[int32]code_google_com_p_gogoprotobuf_proto1.Extension) string {
621
+func extensionToGoStringMerkledag(e map[int32]code_google_com_p_gogoprotobuf_proto1.Extension) string {
622
if e == nil {
623
return "nil"
624
}
merkledag/internal/pb/merkledag.proto
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package merkledag;
1
+package merkledag.pb;
2
3
import "code.google.com/p/gogoprotobuf/gogoproto/gogo.proto";
4
merkledag/internal/pb/merkledagpb_test.go
renamed
+4
-4
@@ -1,18 +1,18 @@
1
// Code generated by protoc-gen-gogo.
2
-// source: node.proto
2
+// source: merkledag.proto
3
// DO NOT EDIT!
4
5
/*
6
-Package merkledag is a generated protocol buffer package.
6
+Package merkledag_pb is a generated protocol buffer package.
7
8
It is generated from these files:
9
- node.proto
9
+ merkledag.proto
10
11
It has these top-level messages:
12
PBLink
13
PBNode
14
*/
15
-package merkledag
15
+package merkledag_pb
16
17
import testing "testing"
18
import math_rand "math/rand"