opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-04 05:16:23 +08:00
Code Issues Projects Releases Wiki Activity

refactor(net/service) move proto to internal pb package

Browse Source
This commit is contained in:
Brian Tiger Chow
2014-10-22 04:24:39 -07:00
parent 15605fb18f
commit d94e764e4a
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
net/service/Makefile → net/service/internal/pb/Makefile
View File

0
net/service/request.pb.go → net/service/internal/pb/request.pb.go
View File

0
net/service/request.proto → net/service/internal/pb/request.proto
View File

5
net/service/request.go
View File

@ -4,6 +4,7 @@ import (
crand "crypto/rand" crand "crypto/rand"
msg "github.com/jbenet/go-ipfs/net/message" msg "github.com/jbenet/go-ipfs/net/message"
pb "github.com/jbenet/go-ipfs/net/service/internal/pb"
peer "github.com/jbenet/go-ipfs/peer" peer "github.com/jbenet/go-ipfs/peer"
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
@ -104,7 +105,7 @@ func RequestKey(pid peer.ID, rid RequestID) string {
func wrapData(data []byte, rid RequestID) ([]byte, error) { func wrapData(data []byte, rid RequestID) ([]byte, error) {
// Marshal // Marshal
pbm := new(PBRequest) pbm := new(pb.PBRequest)
pbm.Data = data pbm.Data = data
pbm.Tag = rid pbm.Tag = rid
b, err := proto.Marshal(pbm) b, err := proto.Marshal(pbm)
@ -117,7 +118,7 @@ func wrapData(data []byte, rid RequestID) ([]byte, error) {
func unwrapData(data []byte) ([]byte, RequestID, error) { func unwrapData(data []byte) ([]byte, RequestID, error) {
// Unmarshal // Unmarshal
pbm := new(PBRequest) pbm := new(pb.PBRequest)
err := proto.Unmarshal(data, pbm) err := proto.Unmarshal(data, pbm)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err