Commit 05e10f8e authored by Brian Tiger Chow's avatar Brian Tiger Chow

refactor(merkledag) move proto to internal pb package

https://docs.google.com/document/d/1e8kOo3r51b2BWtTs_1uADIA5djfXhPT36s6eHVRIvaU/edit
parent 45092e19
...@@ -3,9 +3,10 @@ package merkledag ...@@ -3,9 +3,10 @@ package merkledag
import ( import (
"fmt" "fmt"
u "github.com/jbenet/go-ipfs/util"
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
pb "github.com/jbenet/go-ipfs/merkledag/internal/pb"
u "github.com/jbenet/go-ipfs/util"
) )
// for now, we use a PBNode intermediate thing. // for now, we use a PBNode intermediate thing.
...@@ -14,7 +15,7 @@ import ( ...@@ -14,7 +15,7 @@ import (
// Unmarshal decodes raw data into a *Node instance. // Unmarshal decodes raw data into a *Node instance.
// The conversion uses an intermediate PBNode. // The conversion uses an intermediate PBNode.
func (n *Node) Unmarshal(encoded []byte) error { func (n *Node) Unmarshal(encoded []byte) error {
var pbn PBNode var pbn pb.PBNode
if err := pbn.Unmarshal(encoded); err != nil { if err := pbn.Unmarshal(encoded); err != nil {
return fmt.Errorf("Unmarshal failed. %v", err) return fmt.Errorf("Unmarshal failed. %v", err)
} }
...@@ -55,11 +56,11 @@ func (n *Node) Marshal() ([]byte, error) { ...@@ -55,11 +56,11 @@ func (n *Node) Marshal() ([]byte, error) {
return data, nil return data, nil
} }
func (n *Node) getPBNode() *PBNode { func (n *Node) getPBNode() *pb.PBNode {
pbn := &PBNode{} pbn := &pb.PBNode{}
pbn.Links = make([]*PBLink, len(n.Links)) pbn.Links = make([]*pb.PBLink, len(n.Links))
for i, l := range n.Links { for i, l := range n.Links {
pbn.Links[i] = &PBLink{} pbn.Links[i] = &pb.PBLink{}
pbn.Links[i].Name = &l.Name pbn.Links[i].Name = &l.Name
pbn.Links[i].Tsize = &l.Size pbn.Links[i].Tsize = &l.Size
pbn.Links[i].Hash = []byte(l.Hash) pbn.Links[i].Hash = []byte(l.Hash)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment