diff --git a/merkledag/coding.go b/merkledag/coding.go index 884b0277c..3d7b8381c 100644 --- a/merkledag/coding.go +++ b/merkledag/coding.go @@ -68,9 +68,9 @@ func (n *Node) getPBNode() *pb.PBNode { return pbn } -// Encoded returns the encoded raw data version of a Node instance. +// EncodeProtobuf returns the encoded raw data version of a Node instance. // It may use a cached encoded version, unless the force flag is given. -func (n *Node) Encoded(force bool) ([]byte, error) { +func (n *Node) EncodeProtobuf(force bool) ([]byte, error) { sort.Stable(LinkSlice(n.Links)) // keep links sorted if n.encoded == nil || force { var err error diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go index 83d363677..792194002 100644 --- a/merkledag/merkledag.go +++ b/merkledag/merkledag.go @@ -49,7 +49,7 @@ func (n *dagService) Add(nd *Node) (key.Key, error) { return "", fmt.Errorf("dagService is nil") } - d, err := nd.Encoded(false) + d, err := nd.EncodeProtobuf(false) if err != nil { return "", err } @@ -313,7 +313,7 @@ type Batch struct { } func (t *Batch) Add(nd *Node) (key.Key, error) { - d, err := nd.Encoded(false) + d, err := nd.EncodeProtobuf(false) if err != nil { return "", err } diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go index 91bc2c0f7..6816aad52 100644 --- a/merkledag/merkledag_test.go +++ b/merkledag/merkledag_test.go @@ -64,7 +64,7 @@ func TestNode(t *testing.T) { fmt.Println("-", l.Name, l.Size, l.Hash) } - e, err := n.Encoded(false) + e, err := n.EncodeProtobuf(false) if err != nil { t.Error(err) } else { @@ -96,9 +96,9 @@ func TestNode(t *testing.T) { } func SubtestNodeStat(t *testing.T, n *Node) { - enc, err := n.Encoded(true) + enc, err := n.EncodeProtobuf(true) if err != nil { - t.Error("n.Encoded(true) failed") + t.Error("n.EncodeProtobuf(true) failed") return } diff --git a/merkledag/node.go b/merkledag/node.go index 0a17ccca5..5fa05b41a 100644 --- a/merkledag/node.go +++ b/merkledag/node.go @@ -203,7 +203,7 @@ func (n *Node) UpdateNodeLink(name string, that *Node) (*Node, error) { // Size returns the total size of the data addressed by node, // including the total sizes of references. func (n *Node) Size() (uint64, error) { - b, err := n.Encoded(false) + b, err := n.EncodeProtobuf(false) if err != nil { return 0, err } @@ -217,7 +217,7 @@ func (n *Node) Size() (uint64, error) { // Stat returns statistics on the node. func (n *Node) Stat() (*NodeStat, error) { - enc, err := n.Encoded(false) + enc, err := n.EncodeProtobuf(false) if err != nil { return nil, err } @@ -244,8 +244,8 @@ func (n *Node) Stat() (*NodeStat, error) { // Multihash hashes the encoded data of this node. func (n *Node) Multihash() (mh.Multihash, error) { - // Note: Encoded generates the hash and puts it in n.cached. - _, err := n.Encoded(false) + // Note: EncodeProtobuf generates the hash and puts it in n.cached. + _, err := n.EncodeProtobuf(false) if err != nil { return nil, err } diff --git a/unixfs/mod/dagmodifier.go b/unixfs/mod/dagmodifier.go index 33f082417..0f5866716 100644 --- a/unixfs/mod/dagmodifier.go +++ b/unixfs/mod/dagmodifier.go @@ -258,7 +258,7 @@ func (dm *DagModifier) modifyDag(node *mdag.Node, offset uint64, data io.Reader) node.Links[i].Hash = mh.Multihash(k) // Recache serialized node - _, err = node.Encoded(true) + _, err = node.EncodeProtobuf(true) if err != nil { return "", false, err } @@ -489,7 +489,7 @@ func dagTruncate(ctx context.Context, nd *mdag.Node, size uint64, ds mdag.DAGSer nd.Data = d // invalidate cache and recompute serialized data - _, err = nd.Encoded(true) + _, err = nd.EncodeProtobuf(true) if err != nil { return nil, err }