Bump go-ipld-prime to 092ea9a7696d

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/ipfs/go-ipfs-blocksutil v0.0.1
 	github.com/ipfs/go-log v0.0.1
 	github.com/ipfs/go-peertaskqueue v0.0.4
-	github.com/ipld/go-ipld-prime v0.0.1-filecoin
+	github.com/ipld/go-ipld-prime v0.0.2-0.20191025153308-092ea9a7696d
 	github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
 	github.com/libp2p/go-eventbus v0.0.3 // indirect
 	github.com/libp2p/go-libp2p v0.2.1

go.sum

@@ -114,6 +114,10 @@ github.com/ipld/go-ipld-prime v0.0.0-20190730002952-369bb56ad071 h1:+jRGf/jb5Mnx
 github.com/ipld/go-ipld-prime v0.0.0-20190730002952-369bb56ad071/go.mod h1:bDDSvVz7vaK12FNvMeRYnpRFkSUPNQOiCYQezMD/P3w=
 github.com/ipld/go-ipld-prime v0.0.1-filecoin h1:jK1bUG/z73GNeKrNlVfdexkEIIWp0BEsBVjHkh9WvXo=
 github.com/ipld/go-ipld-prime v0.0.1-filecoin/go.mod h1:bDDSvVz7vaK12FNvMeRYnpRFkSUPNQOiCYQezMD/P3w=
+github.com/ipld/go-ipld-prime v0.0.1 h1:ZTjkYODUmJAca7w5hfzP9emyJfUxTy/Xi4zsUoqHggQ=
+github.com/ipld/go-ipld-prime v0.0.1/go.mod h1:bDDSvVz7vaK12FNvMeRYnpRFkSUPNQOiCYQezMD/P3w=
+github.com/ipld/go-ipld-prime v0.0.2-0.20191025153308-092ea9a7696d h1:GX/4EYCQVPPCe3Yk7rIo6cao9vHoqQZSqGelZmTkiUs=
+github.com/ipld/go-ipld-prime v0.0.2-0.20191025153308-092ea9a7696d/go.mod h1:bDDSvVz7vaK12FNvMeRYnpRFkSUPNQOiCYQezMD/P3w=
 github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA=

graphsync_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/ipfs/go-graphsync/testbridge"
 	"github.com/ipfs/go-graphsync/testutil"
 	ipld "github.com/ipld/go-ipld-prime"
+	ipldselector "github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/libp2p/go-libp2p-core/peer"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 	mh "github.com/multiformats/go-multihash"
@@ -164,7 +165,7 @@ func TestMakeRequestToNetwork(t *testing.T) {
 	blockChain := setupBlockChain(ctx, t, storer, bridge, 100, blockChainLength)
 
 	spec, err := bridge.BuildSelector(func(ssb ipldbridge.SelectorSpecBuilder) ipldbridge.SelectorSpec {
-		return ssb.ExploreRecursive(blockChainLength,
+		return ssb.ExploreRecursive(ipldselector.RecursionLimitDepth(blockChainLength),
 			ssb.ExploreFields(func(efsb ipldbridge.ExploreFieldsSpecBuilder) {
 				efsb.Insert("Parents", ssb.ExploreAll(
 					ssb.ExploreRecursiveEdge()))
@@ -248,7 +249,7 @@ func TestSendResponseToIncomingRequest(t *testing.T) {
 	blockChainLength := 100
 	blockChain := setupBlockChain(ctx, t, storer, bridge, 100, blockChainLength)
 	spec, err := bridge.BuildSelector(func(ssb ipldbridge.SelectorSpecBuilder) ipldbridge.SelectorSpec {
-		return ssb.ExploreRecursive(blockChainLength,
+		return ssb.ExploreRecursive(ipldselector.RecursionLimitDepth(blockChainLength),
 			ssb.ExploreFields(func(efsb ipldbridge.ExploreFieldsSpecBuilder) {
 				efsb.Insert("Parents", ssb.ExploreAll(
 					ssb.ExploreRecursiveEdge()))
@@ -346,7 +347,7 @@ func TestGraphsyncRoundTrip(t *testing.T) {
 	New(ctx, gsnet2, bridge2, loader2, storer2)
 
 	spec, err := bridge1.BuildSelector(func(ssb ipldbridge.SelectorSpecBuilder) ipldbridge.SelectorSpec {
-		return ssb.ExploreRecursive(blockChainLength,
+		return ssb.ExploreRecursive(ipldselector.RecursionLimitDepth(blockChainLength),
 			ssb.ExploreFields(func(efsb ipldbridge.ExploreFieldsSpecBuilder) {
 				efsb.Insert("Parents", ssb.ExploreAll(
 					ssb.ExploreRecursiveEdge()))
@@ -444,7 +445,7 @@ func TestRoundTripLargeBlocksSlowNetwork(t *testing.T) {
 	New(ctx, gsnet2, bridge2, loader2, storer2)
 
 	spec, err := bridge1.BuildSelector(func(ssb ipldbridge.SelectorSpecBuilder) ipldbridge.SelectorSpec {
-		return ssb.ExploreRecursive(blockChainLength,
+		return ssb.ExploreRecursive(ipldselector.RecursionLimitDepth(blockChainLength),
 			ssb.ExploreFields(func(efsb ipldbridge.ExploreFieldsSpecBuilder) {
 				efsb.Insert("Parents", ssb.ExploreAll(
 					ssb.ExploreRecursiveEdge()))

ipldbridge/ipld_impl.go

@@ -15,7 +15,7 @@ import (
 )
 
 // TraversalConfig is an alias from ipld, in case it's renamed/moved.
-type TraversalConfig = ipldtraversal.TraversalConfig
+type TraversalConfig = ipldtraversal.Config
 
 type ipldBridge struct {
 }
@@ -71,7 +71,7 @@ func (rb *ipldBridge) Traverse(ctx context.Context, loader Loader, root ipld.Lin
 			Ctx:        ctx,
 			LinkLoader: loader,
 		},
-	}.TraverseInformatively(node, s, fn)
+	}.WalkAdv(node, s, fn)
 }
 
 func (rb *ipldBridge) EncodeNode(node ipld.Node) ([]byte, error) {

ipldbridge/ipldbridge.go

@@ -47,10 +47,10 @@ type ExploreFieldsSpecBuilder = selectorbuilder.ExploreFieldsSpecBuilder
 type LinkContext = ipld.LinkContext
 
 // TraversalProgress is an alias from ipld, in case it's renamed/moved.
-type TraversalProgress = ipldtraversal.TraversalProgress
+type TraversalProgress = ipldtraversal.Progress
 
 // TraversalReason is an alias from ipld, in case it's renamed/moved.
-type TraversalReason = ipldtraversal.TraversalReason
+type TraversalReason = ipldtraversal.VisitReason
 
 // NodeBuilder is an alias from the ipld fluent nodebuilder, in case it's moved
 type NodeBuilder = fluent.NodeBuilder

metadata/metadata.go

@@ -31,8 +31,8 @@ func DecodeMetadata(data []byte, ipldBridge ipldbridge.IPLDBridge) (Metadata, er
 
 		for !iterator.Done() {
 			_, item := iterator.Next()
-			link := item.TraverseField("link").AsLink()
-			blockPresent := item.TraverseField("blockPresent").AsBool()
+			link := item.LookupString("link").AsLink()
+			blockPresent := item.LookupString("blockPresent").AsBool()
 			metadata = append(metadata, Item{link, blockPresent})
 		}
 		return metadata

testbridge/mocknodes.go

@@ -32,10 +32,16 @@ func NewUnencodableSelectorSpec(cidsVisited []cid.Cid) ipld.Node {
 }
 
 func (mss *mockSelectorSpec) ReprKind() ipld.ReprKind { return ipld.ReprKind_Null }
-func (mss *mockSelectorSpec) TraverseField(key string) (ipld.Node, error) {
+func (mss *mockSelectorSpec) Lookup(key ipld.Node) (ipld.Node, error) {
 	return nil, fmt.Errorf("404")
 }
-func (mss *mockSelectorSpec) TraverseIndex(idx int) (ipld.Node, error) {
+func (mss *mockSelectorSpec) LookupString(key string) (ipld.Node, error) {
+	return nil, fmt.Errorf("404")
+}
+func (mss *mockSelectorSpec) LookupIndex(idx int) (ipld.Node, error) {
+	return nil, fmt.Errorf("404")
+}
+func (mss *mockSelectorSpec) LookupSegment(seg ipld.PathSegment) (ipld.Node, error) {
 	return nil, fmt.Errorf("404")
 }
 func (mss *mockSelectorSpec) ListIterator() ipld.ListIterator { return nil }
@@ -62,10 +68,16 @@ func NewMockBlockNode(data []byte) ipld.Node {
 }
 
 func (mbn *mockBlockNode) ReprKind() ipld.ReprKind { return ipld.ReprKind_Bytes }
-func (mbn *mockBlockNode) TraverseField(key string) (ipld.Node, error) {
+func (mbn *mockBlockNode) Lookup(key ipld.Node) (ipld.Node, error) {
+	return nil, fmt.Errorf("404")
+}
+func (mbn *mockBlockNode) LookupString(key string) (ipld.Node, error) {
+	return nil, fmt.Errorf("404")
+}
+func (mbn *mockBlockNode) LookupIndex(idx int) (ipld.Node, error) {
 	return nil, fmt.Errorf("404")
 }
-func (mbn *mockBlockNode) TraverseIndex(idx int) (ipld.Node, error) {
+func (mbn *mockBlockNode) LookupSegment(seg ipld.PathSegment) (ipld.Node, error) {
 	return nil, fmt.Errorf("404")
 }
 

testbridge/mockselector.go

 package testbridge
 
 import (
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	ipldbridge "github.com/ipfs/go-graphsync/ipldbridge"
 	ipld "github.com/ipld/go-ipld-prime"
-	ipldselector "github.com/ipld/go-ipld-prime/traversal/selector"
 )
 
 type mockSelector struct {
@@ -15,12 +14,12 @@ func newMockSelector(mss *mockSelectorSpec) ipldbridge.Selector {
 	return &mockSelector{mss.cidsVisited}
 }
 
-func (ms *mockSelector) Explore(ipld.Node, ipldselector.PathSegment) ipldbridge.Selector {
+func (ms *mockSelector) Explore(ipld.Node, ipld.PathSegment) ipldbridge.Selector {
 	return ms
 }
 
-func (ms *mockSelector) Interests() []ipldselector.PathSegment {
-	return []ipldselector.PathSegment{}
+func (ms *mockSelector) Interests() []ipld.PathSegment {
+	return []ipld.PathSegment{}
 }
 
 func (ms *mockSelector) Decide(ipld.Node) bool { return false }