Merge pull request ipfs/go-merkledag#4 from ipfs/fix/upgrade-protobuf

update gogo protobuf

This commit was moved from ipfs/go-merkledag@64bc844

Author: Stebalien

ipld/merkledag/coding.go

@@ -13,6 +13,11 @@ import (
 	ipld "github.com/ipfs/go-ipld-format"
 )
 
+// Make sure the user doesn't upgrade this file.
+// We need to check *here* as well as inside the `pb` package *just* in case the
+// user replaces *all* go files in that package.
+const _ = pb.DoNotUpgradeFileEverItWillChangeYourHashes
+
 // for now, we use a PBNode intermediate thing.
 // because native go objects are nice.
 

ipld/merkledag/node_test.go

@@ -9,8 +9,26 @@ import (
 	mdtest "github.com/ipfs/go-merkledag/test"
 
 	ipld "github.com/ipfs/go-ipld-format"
+	cid "github.com/ipfs/go-cid"
 )
 
+func TestStableCID(t *testing.T) {
+	nd := &ProtoNode{}
+	nd.SetData([]byte("foobar"))
+	nd.SetLinks([]*ipld.Link{
+		{Name: "a"},
+		{Name: "b"},
+		{Name: "c"},
+	})
+	expected, err := cid.Decode("QmSN3WED2xPLbYvBbfvew2ZLtui8EbFYYcbfkpKH5jwG9C")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !nd.Cid().Equals(expected) {
+		t.Fatalf("Got CID %s, expected CID %s", nd.Cid(), expected)
+	}
+}
+
 func TestRemoveLink(t *testing.T) {
 	nd := &ProtoNode{}
 	nd.SetLinks([]*ipld.Link{

ipld/merkledag/pb/merkledag.pb.go

@@ -0,0 +1,5 @@
+package merkledag_pb
+
+// Make sure the user doesn't upgrade this package!
+// This will fail to build if the user does.
+const _ = DoNotUpgradeFileEverItWillChangeYourHashes