gx update and fix code to use new Cid type

Author: kevina

io/pbdagreader.go

@@ -29,7 +29,7 @@ type PBDagReader struct {
 	promises []*ipld.NodePromise
 
 	// the cid of each child of the current node
-	links []*cid.Cid
+	links []cid.Cid
 
 	// the index of the child link currently being read from
 	linkPosition int
@@ -151,9 +151,9 @@ func (dr *PBDagReader) loadBufNode(node ipld.Node) error {
 	}
 }
 
-func getLinkCids(n ipld.Node) []*cid.Cid {
+func getLinkCids(n ipld.Node) []cid.Cid {
 	links := n.Links()
-	out := make([]*cid.Cid, 0, len(links))
+	out := make([]cid.Cid, 0, len(links))
 	for _, l := range links {
 		out = append(out, l.Cid)
 	}

mod/dagmodifier.go

@@ -233,33 +233,33 @@ func (dm *DagModifier) Sync() error {
 
 // modifyDag writes the data in 'dm.wrBuf' over the data in 'node' starting at 'offset'
 // returns the new key of the passed in node.
-func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (*cid.Cid, error) {
+func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (cid.Cid, error) {
 	// If we've reached a leaf node.
 	if len(n.Links()) == 0 {
 		switch nd0 := n.(type) {
 		case *mdag.ProtoNode:
 			f, err := ft.FromBytes(nd0.Data())
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			_, err = dm.wrBuf.Read(f.Data[offset:])
 			if err != nil && err != io.EOF {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			// Update newly written node..
 			b, err := proto.Marshal(f)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			nd := new(mdag.ProtoNode)
 			nd.SetData(b)
 			nd.SetCidBuilder(nd0.CidBuilder())
 			err = dm.dagserv.Add(dm.ctx, nd)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			return nd.Cid(), nil
@@ -273,7 +273,7 @@ func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (*cid.Cid, error) {
 			// copy in new data
 			n, err := dm.wrBuf.Read(bytes[offset:])
 			if err != nil && err != io.EOF {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			// copy remaining data
@@ -284,11 +284,11 @@ func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (*cid.Cid, error) {
 
 			nd, err := mdag.NewRawNodeWPrefix(bytes, nd0.Cid().Prefix())
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 			err = dm.dagserv.Add(dm.ctx, nd)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			return nd.Cid(), nil
@@ -297,12 +297,12 @@ func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (*cid.Cid, error) {
 
 	node, ok := n.(*mdag.ProtoNode)
 	if !ok {
-		return nil, ErrNotUnixfs
+		return cid.Cid{}, ErrNotUnixfs
 	}
 
 	f, err := ft.FromBytes(node.Data())
 	if err != nil {
-		return nil, err
+		return cid.Cid{}, err
 	}
 
 	var cur uint64
@@ -311,20 +311,20 @@ func (dm *DagModifier) modifyDag(n ipld.Node, offset uint64) (*cid.Cid, error) {
 		if cur+bs > offset {
 			child, err := node.Links()[i].GetNode(dm.ctx, dm.dagserv)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			k, err := dm.modifyDag(child, offset-cur)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			node.Links()[i].Cid = k
 
 			// Recache serialized node
 			_, err = node.EncodeProtobuf(true)
 			if err != nil {
-				return nil, err
+				return cid.Cid{}, err
 			}
 
 			if dm.wrBuf.Len() == 0 {

package.json

@@ -32,15 +32,15 @@
     },
     {
       "author": "why",
-      "hash": "QmRDaC5z6yXkXTTSWzaxs2sSVBon5RRCN6eNtMmpuHtKCr",
+      "hash": "QmSRe5UvVPLJ6LAtVH9gQZwEL4nbck5b5zNe4MChh3LJHk",
       "name": "go-merkledag",
-      "version": "1.0.13"
+      "version": "1.1.0"
     },
     {
       "author": "hector",
-      "hash": "QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU",
+      "hash": "QmNkDLE6uKA69ucLesAjHkE3y7XAHTbn9tKYcpFtR2CuXE",
       "name": "go-ipfs-posinfo",
-      "version": "0.0.6"
+      "version": "0.1.0"
     },
     {
       "author": "Stebalien",
@@ -50,15 +50,15 @@
     },
     {
       "author": "hsanjuan",
-      "hash": "QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK",
+      "hash": "QmSfbTprAMaCPSVJhAnDyCHs4ohsnrAE4x2dQLSvSmYqZu",
       "name": "go-ipfs-chunker",
-      "version": "0.0.11"
+      "version": "0.1.0"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb",
+      "hash": "QmcRoKTXnq18qQRZFa4jWwWvMQkxzWRpxCwcpCCFgnLUGi",
       "name": "go-cid",
-      "version": "0.8.0"
+      "version": "1.0.0"
     },
     {
       "author": "whyrusleeping",
@@ -68,9 +68,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC",
+      "hash": "QmRurKMTJEe88d8LQHeDDqc1sBf4wZVJ8PvjVqu6gEw5ee",
       "name": "go-ipld-format",
-      "version": "0.5.8"
+      "version": "0.6.0"
     }
   ],
   "gxVersion": "0.12.1",