refactor(bitswap) mv proto PBMessage -> Message
Brian Tiger Chow committed
Oct 22, 2014 at 21:44 UTC
80b573425b48cca89e9f5ed59d95e3175d61949b
4 files changed
+14
-14
exchange/bitswap/message/internal/pb/message.pb.go
+7
-7
@@ -9,7 +9,7 @@ It is generated from these files:
9
message.proto
10
11
It has these top-level messages:
12
- PBMessage
12
+ Message
13
*/
14
package bitswap_message_pb
15
@@ -20,24 +20,24 @@ import math "math"
20
var _ = proto.Marshal
21
var _ = math.Inf
22
23
-type PBMessage struct {
23
+type Message struct {
24
Wantlist []string `protobuf:"bytes,1,rep,name=wantlist" json:"wantlist,omitempty"`
25
Blocks [][]byte `protobuf:"bytes,2,rep,name=blocks" json:"blocks,omitempty"`
26
XXX_unrecognized []byte `json:"-"`
27
}
28
29
-func (m *PBMessage) Reset() { *m = PBMessage{} }
30
-func (m *PBMessage) String() string { return proto.CompactTextString(m) }
31
-func (*PBMessage) ProtoMessage() {}
29
+func (m *Message) Reset() { *m = Message{} }
30
+func (m *Message) String() string { return proto.CompactTextString(m) }
31
+func (*Message) ProtoMessage() {}
32
33
-func (m *PBMessage) GetWantlist() []string {
33
+func (m *Message) GetWantlist() []string {
34
if m != nil {
35
return m.Wantlist
36
}
37
return nil
38
}
39
40
-func (m *PBMessage) GetBlocks() [][]byte {
40
+func (m *Message) GetBlocks() [][]byte {
41
if m != nil {
42
return m.Blocks
43
}
exchange/bitswap/message/internal/pb/message.proto
+1
-1
@@ -1,6 +1,6 @@
1
package bitswap.message.pb;
2
3
-message PBMessage {
3
+message Message {
4
repeated string wantlist = 1;
5
repeated bytes blocks = 2;
6
}
exchange/bitswap/message/message.go
+5
-5
@@ -22,7 +22,7 @@ type BitSwapMessage interface {
22
}
23
24
type Exportable interface {
25
- ToProto() *pb.PBMessage
25
+ ToProto() *pb.Message
26
ToNet(p peer.Peer) (nm.NetMessage, error)
27
}
28
@@ -36,7 +36,7 @@ func New() *message {
36
return new(message)
37
}
38
39
-func newMessageFromProto(pbm pb.PBMessage) BitSwapMessage {
39
+func newMessageFromProto(pbm pb.Message) BitSwapMessage {
40
m := New()
41
for _, s := range pbm.GetWantlist() {
42
m.AppendWanted(u.Key(s))
@@ -67,7 +67,7 @@ func (m *message) AppendBlock(b blocks.Block) {
67
}
68
69
func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
70
- pb := new(pb.PBMessage)
70
+ pb := new(pb.Message)
71
if err := proto.Unmarshal(nmsg.Data(), pb); err != nil {
72
return nil, err
73
}
@@ -75,8 +75,8 @@ func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
75
return m, nil
76
}
77
78
-func (m *message) ToProto() *pb.PBMessage {
79
- pb := new(pb.PBMessage)
78
+func (m *message) ToProto() *pb.Message {
79
+ pb := new(pb.Message)
80
for _, k := range m.Wantlist() {
81
pb.Wantlist = append(pb.Wantlist, string(k))
82
}
exchange/bitswap/message/message_test.go
+1
-1
@@ -22,7 +22,7 @@ func TestAppendWanted(t *testing.T) {
22
23
func TestNewMessageFromProto(t *testing.T) {
24
const str = "a_key"
25
- protoMessage := new(pb.PBMessage)
25
+ protoMessage := new(pb.Message)
26
protoMessage.Wantlist = []string{string(str)}
27
if !contains(protoMessage.Wantlist, str) {
28
t.Fail()