refactor(diagnostics) move proto to internal pb package
https://docs.google.com/document/d/1e8kOo3r51b2BWtTs_1uADIA5djfXhPT36s6eHVRIvaU/edit
Brian Tiger Chow committed
Oct 22, 2014 at 04:08 UTC
528a7cbd51b9203b353fc350ae3c1281a6aeb68c
3 files changed
+8
-7
diagnostics/diag.go
+8
-7
@@ -13,6 +13,7 @@ import (
13
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
15
16
+ pb "github.com/jbenet/go-ipfs/diagnostics/internal/pb"
17
net "github.com/jbenet/go-ipfs/net"
18
msg "github.com/jbenet/go-ipfs/net/message"
19
peer "github.com/jbenet/go-ipfs/peer"
@@ -156,7 +157,7 @@ func AppendDiagnostics(data []byte, cur []*DiagInfo) []*DiagInfo {
157
}
158
159
// TODO: this method no longer needed.
159
-func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.Peer, mes *Message) ([]byte, error) {
160
+func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.Peer, mes *pb.Message) ([]byte, error) {
161
rpmes, err := d.sendRequest(ctx, p, mes)
162
if err != nil {
163
return nil, err
@@ -164,13 +165,13 @@ func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.Peer, me
165
return rpmes.GetData(), nil
166
}
167
167
-func newMessage(diagID string) *Message {
168
- pmes := new(Message)
168
+func newMessage(diagID string) *pb.Message {
169
+ pmes := new(pb.Message)
170
pmes.DiagID = proto.String(diagID)
171
return pmes
172
}
173
173
-func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *Message) (*Message, error) {
174
+func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *pb.Message) (*pb.Message, error) {
175
176
mes, err := msg.FromObject(p, pmes)
177
if err != nil {
@@ -190,7 +191,7 @@ func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *Messag
191
rtt := time.Since(start)
192
log.Info("diagnostic request took: %s", rtt.String())
193
193
- rpmes := new(Message)
194
+ rpmes := new(pb.Message)
195
if err := proto.Unmarshal(rmes.Data(), rpmes); err != nil {
196
return nil, err
197
}
@@ -198,7 +199,7 @@ func (d *Diagnostics) sendRequest(ctx context.Context, p peer.Peer, pmes *Messag
199
return rpmes, nil
200
}
201
201
-func (d *Diagnostics) handleDiagnostic(p peer.Peer, pmes *Message) (*Message, error) {
202
+func (d *Diagnostics) handleDiagnostic(p peer.Peer, pmes *pb.Message) (*pb.Message, error) {
203
log.Debug("HandleDiagnostic from %s for id = %s", p, pmes.GetDiagID())
204
resp := newMessage(pmes.GetDiagID())
205
d.diagLock.Lock()
@@ -259,7 +260,7 @@ func (d *Diagnostics) HandleMessage(ctx context.Context, mes msg.NetMessage) msg
260
}
261
262
// deserialize msg
262
- pmes := new(Message)
263
+ pmes := new(pb.Message)
264
err := proto.Unmarshal(mData, pmes)
265
if err != nil {
266
log.Error("Failed to decode protobuf message: %v", err)