update gogo protobuf

.gx/lastpubver

@@ -1 +1 @@
-1.0.4: QmVxjT67BU1QZUPzSLNZT6DkDzVNfPfkzqNyJYFXxSH2hA
+1.0.5: QmYaUq9tSbWNzaVMVAMeP4CV9iQ4bWoefetfYS9H5GF2o6

importer/importer_test.go

@@ -7,12 +7,13 @@ import (
 	"io/ioutil"
 	"testing"
 
-	mdtest "github.com/ipfs/go-merkledag/test"
 	uio "github.com/ipfs/go-unixfs/io"
 
+	cid "github.com/ipfs/go-cid"
 	chunker "github.com/ipfs/go-ipfs-chunker"
 	u "github.com/ipfs/go-ipfs-util"
 	ipld "github.com/ipfs/go-ipld-format"
+	mdtest "github.com/ipfs/go-merkledag/test"
 )
 
 func getBalancedDag(t testing.TB, size int64, blksize int64) (ipld.Node, ipld.DAGService) {
@@ -35,6 +36,40 @@ func getTrickleDag(t testing.TB, size int64, blksize int64) (ipld.Node, ipld.DAG
 	return nd, ds
 }
 
+func TestStableCid(t *testing.T) {
+	ds := mdtest.Mock()
+	buf := make([]byte, 10 * 1024 * 1024)
+	u.NewSeededRand(0xdeadbeef).Read(buf)
+	r := bytes.NewReader(buf)
+
+	nd, err := BuildDagFromReader(ds, chunker.DefaultSplitter(r))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected, err := cid.Decode("QmZN1qquw84zhV4j6vT56tCcmFxaDaySL1ezTXFvMdNmrK")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !expected.Equals(nd.Cid()) {
+		t.Fatalf("expected CID %s, got CID %s", expected, nd)
+	}
+
+	dr, err := uio.NewDagReader(context.Background(), nd, ds)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	out, err := ioutil.ReadAll(dr)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !bytes.Equal(out, buf) {
+		t.Fatal("bad read")
+	}
+}
+
 func TestBalancedDag(t *testing.T) {
 	ds := mdtest.Mock()
 	buf := make([]byte, 10000)

package.json

@@ -32,9 +32,9 @@
     },
     {
       "author": "why",
-      "hash": "QmfKKGzisaoP4oiHQSHz1zLbXDCTeXe7NVfX1FAMKzcHmt",
+      "hash": "QmeVFsd5aE3U2N9ivM7MniNynZA82RqCgEMEpDgTowCnHK",
       "name": "go-merkledag",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     {
       "author": "hector",
@@ -62,7 +62,7 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV",
+      "hash": "QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8",
       "name": "gogo-protobuf",
       "version": "0.0.0"
     },
@@ -78,6 +78,6 @@
   "license": "",
   "name": "go-unixfs",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "1.0.4"
+  "version": "1.0.5"
 }
 

pb/Makefile

@@ -0,0 +1,11 @@
+PB = $(wildcard *.proto)
+GO = $(PB:.proto=.pb.go)
+
+all: $(GO)
+
+%.pb.go: %.proto
+		protoc --proto_path=$(GOPATH)/src:. --gogo_out=. $<
+
+clean:
+		rm -f *.pb.go
+		rm -f *.go

pb/unixfs.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package unixfs.pb;
 
 message Data {