ipldutil: use chooser APIs from dagpb and basicnode (#292)

Saves us a bit of extra code, since they were added in summer. Also avoid making defaultVisitor a variable, which makes it clearer that it's never a nil func. While here, replace node/basic with node/basicnode, as the former has been deprecated in favor of the latter. Co-authored-by: Hannah Howard <[email protected]>
ipfs · Dec 3, 2021 · a511707 · a511707
1 parent 6483bc4
commit a511707
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 33 deletions.
diff --git a/benchmarks/benchmark_test.go b/benchmarks/benchmark_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/ipfs/go-unixfs/importer/balanced"
 	ihelper "github.com/ipfs/go-unixfs/importer/helpers"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	ipldselector "github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"

diff --git a/cidset/cidset.go b/cidset/cidset.go
@@ -6,7 +6,7 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime/fluent"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 
 	"github.com/ipfs/go-graphsync/ipldutil"
 )

diff --git a/dedupkey/dedupkey.go b/dedupkey/dedupkey.go
@@ -1,7 +1,7 @@
 package dedupkey
 
 import (
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 
 	"github.com/ipfs/go-graphsync/ipldutil"
 )

diff --git a/donotsendfirstblocks/donotsendfirstblocks.go b/donotsendfirstblocks/donotsendfirstblocks.go
@@ -1,7 +1,7 @@
 package donotsendfirstblocks
 
 import (
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 
 	"github.com/ipfs/go-graphsync/ipldutil"
 )

diff --git a/impl/graphsync_test.go b/impl/graphsync_test.go
@@ -30,7 +30,7 @@ import (
 	ihelper "github.com/ipfs/go-unixfs/importer/helpers"
 	ipld "github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/libp2p/go-libp2p-core/host"

diff --git a/ipldutil/ipldutil.go b/ipldutil/ipldutil.go
@@ -3,23 +3,12 @@ package ipldutil
 import (
 	"bytes"
 
-	dagpb "github.com/ipld/go-codec-dagpb"
 	ipld "github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
 	_ "github.com/ipld/go-ipld-prime/codec/raw"
-	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 )
 
-var defaultChooser = func(lnk ipld.Link, lctx ipld.LinkContext) (ipld.NodePrototype, error) {
-	// We can decode all nodes into basicnode's Any, except for
-	// dagpb nodes, which must explicitly use the PBNode prototype.
-	if lnk, ok := lnk.(cidlink.Link); ok && lnk.Cid.Prefix().Codec == 0x70 {
-		return dagpb.Type.PBNode, nil
-	}
-	return basicnode.Prototype.Any, nil
-}
-
 func EncodeNode(node ipld.Node) ([]byte, error) {
 	var buffer bytes.Buffer
 	err := dagcbor.Encode(node, &buffer)

diff --git a/ipldutil/traverser.go b/ipldutil/traverser.go
@@ -5,8 +5,10 @@ import (
 	"errors"
 	"io"
 
+	dagpb "github.com/ipld/go-codec-dagpb"
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 )
@@ -19,7 +21,7 @@ can go away */
 
 var defaultLinkSystem = cidlink.DefaultLinkSystem()
 
-var defaultVisitor traversal.AdvVisitFn = func(traversal.Progress, ipld.Node, traversal.VisitReason) error { return nil }
+func defaultVisitor(traversal.Progress, ipld.Node, traversal.VisitReason) error { return nil }
 
 // ContextCancelError is a sentinel that indicates the passed in context
 // was cancelled
@@ -86,7 +88,7 @@ func (tb TraversalBuilder) Start(parentCtx context.Context) Traverser {
 		root:         tb.Root,
 		selector:     tb.Selector,
 		visitor:      defaultVisitor,
-		chooser:      defaultChooser,
+		chooser:      dagpb.AddSupportToChooser(basicnode.Chooser),
 		linkSystem:   tb.LinkSystem,
 		budget:       tb.Budget,
 		awaitRequest: make(chan struct{}, 1),

diff --git a/ipldutil/traverser_test.go b/ipldutil/traverser_test.go
@@ -11,7 +11,7 @@ import (
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"

diff --git a/message/message_test.go b/message/message_test.go
@@ -8,7 +8,7 @@ import (
 
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/stretchr/testify/require"
 

diff --git a/messagequeue/messagequeue_test.go b/messagequeue/messagequeue_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"

diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
 	"github.com/ipld/go-ipld-prime/fluent"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ipfs/go-graphsync/testutil"

diff --git a/network/libp2p_impl_test.go b/network/libp2p_impl_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/libp2p/go-libp2p-core/peer"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"

diff --git a/peermanager/peermessagemanager_test.go b/peermanager/peermessagemanager_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"

diff --git a/requestmanager/hooks/hooks_test.go b/requestmanager/hooks/hooks_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/ipld/go-ipld-prime"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"

diff --git a/responsemanager/hooks/hooks_test.go b/responsemanager/hooks/hooks_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"

diff --git a/responsemanager/responsemanager_test.go b/responsemanager/responsemanager_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/ipfs/go-peertaskqueue/peertask"
 	ipld "github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"
 

diff --git a/selectorvalidator/selectorvalidator.go b/selectorvalidator/selectorvalidator.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	ipld "github.com/ipld/go-ipld-prime"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"

diff --git a/selectorvalidator/selectorvalidator_test.go b/selectorvalidator/selectorvalidator_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	ipld "github.com/ipld/go-ipld-prime"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/stretchr/testify/require"

diff --git a/testutil/test_ipld_tree.go b/testutil/test_ipld_tree.go
@@ -9,7 +9,7 @@ import (
 	_ "github.com/ipld/go-ipld-prime/codec/dagjson"
 	"github.com/ipld/go-ipld-prime/fluent"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 )
 
 // TestIPLDTree is a set of IPLD Data that forms a tree spread across some blocks

diff --git a/testutil/testchain.go b/testutil/testchain.go
@@ -9,7 +9,7 @@ import (
 	cid "github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	mh "github.com/multiformats/go-multihash"

diff --git a/testutil/testnodes.go b/testutil/testnodes.go
@@ -2,7 +2,7 @@ package testutil
 
 import (
 	ipld "github.com/ipld/go-ipld-prime"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 )