Merge pull request ipld/go-car#31 from ipld/update-ipld-libs

Update go-ipld-prime to the era of NodeAssembler. This commit was moved from ipld/go-car@c222d79
ipfs · Apr 29, 2020 · b02a0a3 · b02a0a3
2 parents 78ba42a + 9237b40
commit b02a0a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/ipld/car/car_test.go b/ipld/car/car_test.go
@@ -9,7 +9,7 @@ import (
 	format "github.com/ipfs/go-ipld-format"
 	dag "github.com/ipfs/go-merkledag"
 	dstest "github.com/ipfs/go-merkledag/test"
-	ipldfree "github.com/ipld/go-ipld-prime/impl/free"
+	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/stretchr/testify/require"
@@ -96,7 +96,7 @@ func TestRoundtripSelective(t *testing.T) {
 
 	assertAddNodes(t, dserv, a, b, c, nd1, nd2, nd3)
 
-	ssb := builder.NewSelectorSpecBuilder(ipldfree.NodeBuilder())
+	ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
 
 	// the graph assembled above looks as follows, in order:
 	// nd3 -> [c, nd2 -> [nd1 -> a, b, nd1 -> a]]

diff --git a/ipld/car/selectivecar.go b/ipld/car/selectivecar.go
@@ -11,8 +11,8 @@ import (
 	util "github.com/ipld/go-car/util"
 	"github.com/ipld/go-ipld-prime"
 	dagpb "github.com/ipld/go-ipld-prime-proto"
-	ipldfree "github.com/ipld/go-ipld-prime/impl/free"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
+	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	"github.com/ipld/go-ipld-prime/traversal"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 )
@@ -221,8 +221,8 @@ func (sct *selectiveCarTraverser) loader(lnk ipld.Link, ctx ipld.LinkContext) (i
 
 func (sct *selectiveCarTraverser) traverseBlocks() error {
 
-	nbc := dagpb.AddDagPBSupportToChooser(func(ipld.Link, ipld.LinkContext) ipld.NodeBuilder {
-		return ipldfree.NodeBuilder()
+	nsc := dagpb.AddDagPBSupportToChooser(func(ipld.Link, ipld.LinkContext) (ipld.NodeStyle, error) {
+		return basicnode.Style.Any, nil
 	})
 
 	for _, carDag := range sct.sc.dags {
@@ -231,16 +231,21 @@ func (sct *selectiveCarTraverser) traverseBlocks() error {
 			return err
 		}
 		lnk := cidlink.Link{Cid: carDag.Root}
-		nb := nbc(lnk, ipld.LinkContext{})
-		nd, err := lnk.Load(sct.sc.ctx, ipld.LinkContext{}, nb, sct.loader)
+		ns, err := nsc(lnk, ipld.LinkContext{})
 		if err != nil {
 			return err
 		}
+		nb := ns.NewBuilder()
+		err = lnk.Load(sct.sc.ctx, ipld.LinkContext{}, nb, sct.loader)
+		if err != nil {
+			return err
+		}
+		nd := nb.Build()
 		err = traversal.Progress{
 			Cfg: &traversal.Config{
-				Ctx:                    sct.sc.ctx,
-				LinkLoader:             sct.loader,
-				LinkNodeBuilderChooser: nbc,
+				Ctx:                        sct.sc.ctx,
+				LinkLoader:                 sct.loader,
+				LinkTargetNodeStyleChooser: nsc,
 			},
 		}.WalkAdv(nd, parsed, func(traversal.Progress, ipld.Node, traversal.VisitReason) error { return nil })
 		if err != nil {