gofmt
Juan Batiz-Benet committed
Jul 4, 2014 at 15:29 UTC
09ba4343752741c026ff3e713359e837ec89f8a8
2 files changed
+61
-65
merkledag/coding.go
+42
-43
@@ -1,62 +1,61 @@
1
package merkledag
2
3
import (
4
- "fmt"
5
- mh "github.com/jbenet/go-multihash"
4
+ "fmt"
5
+ mh "github.com/jbenet/go-multihash"
6
)
7
8
// for now, we use a PBNode intermediate thing.
9
// because native go objects are nice.
10
11
func (n *Node) Unmarshal(encoded []byte) error {
12
- var pbn PBNode
13
- if err := pbn.Unmarshal(encoded); err != nil {
14
- return fmt.Errorf("Unmarshal failed. %v", err)
15
- }
16
-
17
- pbnl := pbn.GetLinks()
18
- n.Links = make([]*Link, len(pbnl))
19
- for i, l := range(pbnl) {
20
- n.Links[i] = &Link{Name: l.GetName(), Size: l.GetTsize()}
21
- h, err := mh.Cast(l.GetHash())
22
- if err != nil {
23
- return fmt.Errorf("Link hash is not valid multihash. %v", err)
24
- }
25
- n.Links[i].Hash = h
26
- }
27
-
28
- n.Data = pbn.GetData()
29
- return nil
12
+ var pbn PBNode
13
+ if err := pbn.Unmarshal(encoded); err != nil {
14
+ return fmt.Errorf("Unmarshal failed. %v", err)
15
+ }
16
+
17
+ pbnl := pbn.GetLinks()
18
+ n.Links = make([]*Link, len(pbnl))
19
+ for i, l := range pbnl {
20
+ n.Links[i] = &Link{Name: l.GetName(), Size: l.GetTsize()}
21
+ h, err := mh.Cast(l.GetHash())
22
+ if err != nil {
23
+ return fmt.Errorf("Link hash is not valid multihash. %v", err)
24
+ }
25
+ n.Links[i].Hash = h
26
+ }
27
+
28
+ n.Data = pbn.GetData()
29
+ return nil
30
}
31
32
func (n *Node) MarshalTo(encoded []byte) error {
33
- pbn := n.getPBNode()
34
- if _, err := pbn.MarshalTo(encoded); err != nil {
35
- return fmt.Errorf("Marshal failed. %v", err)
36
- }
37
- return nil
33
+ pbn := n.getPBNode()
34
+ if _, err := pbn.MarshalTo(encoded); err != nil {
35
+ return fmt.Errorf("Marshal failed. %v", err)
36
+ }
37
+ return nil
38
}
39
40
func (n *Node) Marshal() ([]byte, error) {
41
- pbn := n.getPBNode()
42
- data, err := pbn.Marshal()
43
- if err != nil {
44
- return data, fmt.Errorf("Marshal failed. %v", err)
45
- }
46
- return data, nil
41
+ pbn := n.getPBNode()
42
+ data, err := pbn.Marshal()
43
+ if err != nil {
44
+ return data, fmt.Errorf("Marshal failed. %v", err)
45
+ }
46
+ return data, nil
47
}
48
49
func (n *Node) getPBNode() *PBNode {
50
- pbn := &PBNode{}
51
- pbn.Links = make([]*PBLink, len(n.Links))
52
- for i, l := range(n.Links) {
53
- pbn.Links[i] = &PBLink{}
54
- pbn.Links[i].Name = &l.Name
55
- pbn.Links[i].Tsize = &l.Size
56
- pbn.Links[i].Hash = []byte(l.Hash)
57
- }
58
-
59
- pbn.Data = n.Data
60
- return pbn
50
+ pbn := &PBNode{}
51
+ pbn.Links = make([]*PBLink, len(n.Links))
52
+ for i, l := range n.Links {
53
+ pbn.Links[i] = &PBLink{}
54
+ pbn.Links[i].Name = &l.Name
55
+ pbn.Links[i].Tsize = &l.Size
56
+ pbn.Links[i].Hash = []byte(l.Hash)
57
+ }
58
+
59
+ pbn.Data = n.Data
60
+ return pbn
61
}
62
-
merkledag/merkledag.go
+19
-22
@@ -1,42 +1,39 @@
1
package merkledag
2
3
import (
4
- mh "github.com/jbenet/go-multihash"
4
+ mh "github.com/jbenet/go-multihash"
5
)
6
7
// A node in the IPFS Merkle DAG.
8
// nodes have opaque data and a set of navigable links.
9
type Node struct {
10
- Links []*Link
11
- Data []byte
10
+ Links []*Link
11
+ Data []byte
12
}
13
14
-
14
// An IPFS Merkle DAG Link
15
type Link struct {
17
- // utf string name. should be unique per object
18
- Name string // utf8
16
+ // utf string name. should be unique per object
17
+ Name string // utf8
18
20
- // cumulative size of target object
21
- Size uint64
19
+ // cumulative size of target object
20
+ Size uint64
21
23
- // multihash of the target object
24
- Hash mh.Multihash
22
+ // multihash of the target object
23
+ Hash mh.Multihash
24
}
25
27
-
26
type EncodedNode []byte
27
30
-
28
func (n *Node) Size() (uint64, error) {
32
- d, err := n.Marshal()
33
- if err != nil {
34
- return 0, err
35
- }
36
-
37
- s := uint64(len(d))
38
- for _, l := range(n.Links) {
39
- s += l.Size
40
- }
41
- return s, nil
29
+ d, err := n.Marshal()
30
+ if err != nil {
31
+ return 0, err
32
+ }
33
+
34
+ s := uint64(len(d))
35
+ for _, l := range n.Links {
36
+ s += l.Size
37
+ }
38
+ return s, nil
39
}