Rename Encoded() to EncodeProtobuf()
License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Mildred Ki'Lya committed
Feb 25, 2016 at 07:35 UTC
7c11fe57cb45fb58862cb06dce7e4f71a2c5d15c
5 files changed
+13
-13
merkledag/coding.go
+2
-2
@@ -68,9 +68,9 @@ func (n *Node) getPBNode() *pb.PBNode {
68
return pbn
69
}
70
71
-// Encoded returns the encoded raw data version of a Node instance.
71
+// EncodeProtobuf returns the encoded raw data version of a Node instance.
72
// It may use a cached encoded version, unless the force flag is given.
73
-func (n *Node) Encoded(force bool) ([]byte, error) {
73
+func (n *Node) EncodeProtobuf(force bool) ([]byte, error) {
74
sort.Stable(LinkSlice(n.Links)) // keep links sorted
75
if n.encoded == nil || force {
76
var err error
merkledag/merkledag.go
+2
-2
@@ -49,7 +49,7 @@ func (n *dagService) Add(nd *Node) (key.Key, error) {
49
return "", fmt.Errorf("dagService is nil")
50
}
51
52
- d, err := nd.Encoded(false)
52
+ d, err := nd.EncodeProtobuf(false)
53
if err != nil {
54
return "", err
55
}
@@ -313,7 +313,7 @@ type Batch struct {
313
}
314
315
func (t *Batch) Add(nd *Node) (key.Key, error) {
316
- d, err := nd.Encoded(false)
316
+ d, err := nd.EncodeProtobuf(false)
317
if err != nil {
318
return "", err
319
}
merkledag/merkledag_test.go
+3
-3
@@ -64,7 +64,7 @@ func TestNode(t *testing.T) {
64
fmt.Println("-", l.Name, l.Size, l.Hash)
65
}
66
67
- e, err := n.Encoded(false)
67
+ e, err := n.EncodeProtobuf(false)
68
if err != nil {
69
t.Error(err)
70
} else {
@@ -96,9 +96,9 @@ func TestNode(t *testing.T) {
96
}
97
98
func SubtestNodeStat(t *testing.T, n *Node) {
99
- enc, err := n.Encoded(true)
99
+ enc, err := n.EncodeProtobuf(true)
100
if err != nil {
101
- t.Error("n.Encoded(true) failed")
101
+ t.Error("n.EncodeProtobuf(true) failed")
102
return
103
}
104
merkledag/node.go
+4
-4
@@ -203,7 +203,7 @@ func (n *Node) UpdateNodeLink(name string, that *Node) (*Node, error) {
203
// Size returns the total size of the data addressed by node,
204
// including the total sizes of references.
205
func (n *Node) Size() (uint64, error) {
206
- b, err := n.Encoded(false)
206
+ b, err := n.EncodeProtobuf(false)
207
if err != nil {
208
return 0, err
209
}
@@ -217,7 +217,7 @@ func (n *Node) Size() (uint64, error) {
217
218
// Stat returns statistics on the node.
219
func (n *Node) Stat() (*NodeStat, error) {
220
- enc, err := n.Encoded(false)
220
+ enc, err := n.EncodeProtobuf(false)
221
if err != nil {
222
return nil, err
223
}
@@ -244,8 +244,8 @@ func (n *Node) Stat() (*NodeStat, error) {
244
245
// Multihash hashes the encoded data of this node.
246
func (n *Node) Multihash() (mh.Multihash, error) {
247
- // Note: Encoded generates the hash and puts it in n.cached.
248
- _, err := n.Encoded(false)
247
+ // Note: EncodeProtobuf generates the hash and puts it in n.cached.
248
+ _, err := n.EncodeProtobuf(false)
249
if err != nil {
250
return nil, err
251
}
unixfs/mod/dagmodifier.go
+2
-2
@@ -258,7 +258,7 @@ func (dm *DagModifier) modifyDag(node *mdag.Node, offset uint64, data io.Reader)
258
node.Links[i].Hash = mh.Multihash(k)
259
260
// Recache serialized node
261
- _, err = node.Encoded(true)
261
+ _, err = node.EncodeProtobuf(true)
262
if err != nil {
263
return "", false, err
264
}
@@ -489,7 +489,7 @@ func dagTruncate(ctx context.Context, nd *mdag.Node, size uint64, ds mdag.DAGSer
489
nd.Data = d
490
491
// invalidate cache and recompute serialized data
492
- _, err = nd.Encoded(true)
492
+ _, err = nd.EncodeProtobuf(true)
493
if err != nil {
494
return nil, err
495
}