Merge pull request #3443 from ipfs/feat/retain-cid-type

merkledag: retain cid types when roundtripping through a ProtoNode

merkledag/coding.go

@@ -7,7 +7,6 @@ import (
 	pb "github.com/ipfs/go-ipfs/merkledag/pb"
 
 	node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
-	u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
 	cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
 )
 
@@ -84,7 +83,15 @@ func (n *ProtoNode) EncodeProtobuf(force bool) ([]byte, error) {
 	}
 
 	if n.cached == nil {
-		n.cached = cid.NewCidV0(u.Hash(n.encoded))
+		if n.Prefix.Codec == 0 { // unset
+			n.Prefix = defaultCidPrefix
+		}
+		c, err := n.Prefix.Sum(n.encoded)
+		if err != nil {
+			return nil, err
+		}
+
+		n.cached = c
 	}
 
 	return n.encoded, nil

merkledag/merkledag.go

@@ -103,6 +103,7 @@ func decodeBlock(b blocks.Block) (node.Node, error) {
 		}
 
 		decnd.cached = b.Cid()
+		decnd.Prefix = b.Cid().Prefix()
 		return decnd, nil
 	case cid.Raw:
 		return NewRawNode(b.RawData()), nil

merkledag/merkledag_test.go

@@ -11,6 +11,7 @@ import (
 	"sync"
 	"testing"
 
+	blocks "github.com/ipfs/go-ipfs/blocks"
 	bserv "github.com/ipfs/go-ipfs/blockservice"
 	bstest "github.com/ipfs/go-ipfs/blockservice/test"
 	offline "github.com/ipfs/go-ipfs/exchange/offline"
@@ -450,3 +451,37 @@ func TestProtoNodeResolve(t *testing.T) {
 		t.Fatal("expected tree to return []{\"foo\"}")
 	}
 }
+
+func TestCidRetention(t *testing.T) {
+	nd := new(ProtoNode)
+	nd.SetData([]byte("fooooo"))
+
+	pref := nd.Cid().Prefix()
+	pref.Version = 1
+
+	c2, err := pref.Sum(nd.RawData())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	blk, err := blocks.NewBlockWithCid(nd.RawData(), c2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	bs := dstest.Bserv()
+	_, err = bs.AddBlock(blk)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ds := NewDAGService(bs)
+	out, err := ds.Get(context.Background(), c2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !out.Cid().Equals(c2) {
+		t.Fatal("output cid didnt match")
+	}
+}

merkledag/node.go

@@ -22,6 +22,16 @@ type ProtoNode struct {
 	encoded []byte
 
 	cached *cid.Cid
+
+	// Prefix specifies cid version and hashing function
+	Prefix cid.Prefix
+}
+
+var defaultCidPrefix = cid.Prefix{
+	Codec:    cid.DagProtobuf,
+	MhLength: -1,
+	MhType:   mh.SHA2_256,
+	Version:  0,
 }
 
 type LinkSlice []*node.Link
@@ -219,9 +229,22 @@ func (n *ProtoNode) Loggable() map[string]interface{} {
 }
 
 func (n *ProtoNode) Cid() *cid.Cid {
-	h := n.Multihash()
+	if n.encoded != nil && n.cached != nil {
+		return n.cached
+	}
+
+	if n.Prefix.Codec == 0 {
+		n.Prefix = defaultCidPrefix
+	}
+
+	c, err := n.Prefix.Sum(n.RawData())
+	if err != nil {
+		// programmer error
+		panic(err)
+	}
 
-	return cid.NewCidV0(h)
+	n.cached = c
+	return c
 }
 
 func (n *ProtoNode) String() string {

merkledag/test/utils.go

@@ -10,7 +10,10 @@ import (
 )
 
 func Mock() dag.DAGService {
+	return dag.NewDAGService(Bserv())
+}
+
+func Bserv() bsrv.BlockService {
 	bstore := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
-	bserv := bsrv.New(bstore, offline.Exchange(bstore))
-	return dag.NewDAGService(bserv)
+	return bsrv.New(bstore, offline.Exchange(bstore))
 }