refactor(exchange/bitswap) move proto to internal pb package
Brian Tiger Chow committed
Oct 22, 2014 at 05:09 UTC
15605fb18f5f006063d2351d3f84443c98fb5101
5 files changed
+11
-9
exchange/bitswap/message/internal/pb/Makefile
renamed
exchange/bitswap/message/internal/pb/message.pb.go
renamed
+1
-1
@@ -11,7 +11,7 @@ It is generated from these files:
11
It has these top-level messages:
12
PBMessage
13
*/
14
-package message
14
+package pb
15
16
import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
17
import math "math"
exchange/bitswap/message/internal/pb/message.proto
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package message;
1
+package pb;
2
3
message PBMessage {
4
repeated string wantlist = 1;
exchange/bitswap/message/message.go
+6
-5
@@ -3,6 +3,7 @@ package message
3
import (
4
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
5
blocks "github.com/jbenet/go-ipfs/blocks"
6
+ pb "github.com/jbenet/go-ipfs/exchange/bitswap/message/internal/pb"
7
netmsg "github.com/jbenet/go-ipfs/net/message"
8
nm "github.com/jbenet/go-ipfs/net/message"
9
peer "github.com/jbenet/go-ipfs/peer"
@@ -18,7 +19,7 @@ type BitSwapMessage interface {
19
}
20
21
type Exportable interface {
21
- ToProto() *PBMessage
22
+ ToProto() *pb.PBMessage
23
ToNet(p peer.Peer) (nm.NetMessage, error)
24
}
25
@@ -32,7 +33,7 @@ func New() *message {
33
return new(message)
34
}
35
35
-func newMessageFromProto(pbm PBMessage) BitSwapMessage {
36
+func newMessageFromProto(pbm pb.PBMessage) BitSwapMessage {
37
m := New()
38
for _, s := range pbm.GetWantlist() {
39
m.AppendWanted(u.Key(s))
@@ -63,7 +64,7 @@ func (m *message) AppendBlock(b blocks.Block) {
64
}
65
66
func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
66
- pb := new(PBMessage)
67
+ pb := new(pb.PBMessage)
68
if err := proto.Unmarshal(nmsg.Data(), pb); err != nil {
69
return nil, err
70
}
@@ -71,8 +72,8 @@ func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
72
return m, nil
73
}
74
74
-func (m *message) ToProto() *PBMessage {
75
- pb := new(PBMessage)
75
+func (m *message) ToProto() *pb.PBMessage {
76
+ pb := new(pb.PBMessage)
77
for _, k := range m.Wantlist() {
78
pb.Wantlist = append(pb.Wantlist, string(k))
79
}
exchange/bitswap/message/message_test.go
+3
-2
@@ -4,7 +4,8 @@ import (
4
"bytes"
5
"testing"
6
7
- "github.com/jbenet/go-ipfs/blocks"
7
+ blocks "github.com/jbenet/go-ipfs/blocks"
8
+ pb "github.com/jbenet/go-ipfs/exchange/bitswap/message/internal/pb"
9
peer "github.com/jbenet/go-ipfs/peer"
10
u "github.com/jbenet/go-ipfs/util"
11
)
@@ -21,7 +22,7 @@ func TestAppendWanted(t *testing.T) {
22
23
func TestNewMessageFromProto(t *testing.T) {
24
const str = "a_key"
24
- protoMessage := new(PBMessage)
25
+ protoMessage := new(pb.PBMessage)
26
protoMessage.Wantlist = []string{string(str)}
27
if !contains(protoMessage.Wantlist, str) {
28
t.Fail()