Skip to content

Commit a0cc6f0

Browse files
warpforkhannahhoward
warpfork
and
hannahhoward
authored
* Update [email protected] Simultaneously updates go-ipld-prime-proto, which also has changes to match that version of go-ipld-prime. * feat(deps): update ipld-prime near master update to lastest needed sha for filecoin, reinstitute generated node tests * feat(deps): update go-ipld-prime-prot Co-authored-by: hannahhoward <[email protected]>
1 parent abebf0f commit a0cc6f0

39 files changed

+2919
-121
lines changed

‎benchmarks/benchmark_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func p2pStrestTest(ctx context.Context, b *testing.B, numfiles int, df distFunc,
7171
thisCids := df(ctx, b, instances[:1])
7272
allCids = append(allCids, thisCids...)
7373
}
74-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
74+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
7575

7676
allSelector := ssb.ExploreRecursive(ipldselector.RecursionLimitNone(),
7777
ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node()
@@ -140,7 +140,7 @@ func subtestDistributeAndFetch(ctx context.Context, b *testing.B, numnodes int,
140140
i.SetBlockstoreLatency(bstoreLatency)
141141
}
142142
}
143-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
143+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
144144

145145
allSelector := ssb.ExploreRecursive(ipldselector.RecursionLimitNone(),
146146
ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node()

‎cidset/cidset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
// EncodeCidSet encodes a cid set into bytes for the do-no-send-cids extension
1515
func EncodeCidSet(cids *cid.Set) ([]byte, error) {
16-
list := fluent.MustBuildList(basicnode.Style.List, cids.Len(), func(la fluent.ListAssembler) {
16+
list := fluent.MustBuildList(basicnode.Prototype.List, cids.Len(), func(la fluent.ListAssembler) {
1717
_ = cids.ForEach(func(c cid.Cid) error {
1818
la.AssembleValue().AssignLink(cidlink.Link{Cid: c})
1919
return nil

‎dedupkey/dedupkey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
// EncodeDedupKey returns encoded cbor data for string key
1010
func EncodeDedupKey(key string) ([]byte, error) {
11-
nb := basicnode.Style.String.NewBuilder()
11+
nb := basicnode.Prototype.String.NewBuilder()
1212
err := nb.AssignString(key)
1313
if err != nil {
1414
return nil, err

‎docs/go-graphsync.puml

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ package "go-filecoin" {
413413
"go-filecoin" .. goGraphSyncNetworkPF
414414
"go-filecoin" *-- RawLoader
415415
"go-filecoin" *-- MulticodecDecodeTable
416-
"go-filecoin" *-- LinkTargetNodeStyleChooser
416+
"go-filecoin" *-- LinkTargetNodePrototypeChooser
417417

418418
}
419419

‎go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ require (
2626
github.com/ipfs/go-merkledag v0.3.1
2727
github.com/ipfs/go-peertaskqueue v0.2.0
2828
github.com/ipfs/go-unixfs v0.2.4
29-
github.com/ipld/go-ipld-prime v0.0.4-0.20200828224805-5ff8c8b0b6ef
30-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200828231332-ae0aea07222b
29+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f
30+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922192210-9a2bfd4440a6
3131
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
3232
github.com/jbenet/goprocess v0.1.4 // indirect
3333
github.com/libp2p/go-libp2p v0.6.0
@@ -39,7 +39,6 @@ require (
3939
github.com/multiformats/go-multihash v0.0.13
4040
github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a // indirect
4141
github.com/smartystreets/assertions v1.0.1 // indirect
42-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
4342
github.com/stretchr/testify v1.5.1
4443
github.com/whyrusleeping/cbor-gen v0.0.0-20200710004633-5379fc63235d
4544
go.uber.org/multierr v1.4.0 // indirect

‎go.sum

+6-8
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,10 @@ github.com/ipfs/go-unixfs v0.2.4 h1:6NwppOXefWIyysZ4LR/qUBPvXd5//8J3jiMdvpbw6Lo=
229229
github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
230230
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
231231
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
232-
github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e h1:ZISbJlM0urTANR9KRfRaqlBmyOj5uUtxs2r4Up9IXsA=
233-
github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
234-
github.com/ipld/go-ipld-prime v0.0.4-0.20200828224805-5ff8c8b0b6ef h1:/yPelt/0CuzZsmRkYzBBnJ499JnAOGaIaAXHujx96ic=
235-
github.com/ipld/go-ipld-prime v0.0.4-0.20200828224805-5ff8c8b0b6ef/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
236-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200828231332-ae0aea07222b h1:ZtlW6pubN17TDaStlxgrwEXXwwUfJaXu9RobwczXato=
237-
github.com/ipld/go-ipld-prime-proto v0.0.0-20200828231332-ae0aea07222b/go.mod h1:OAV6xBmuTLsPZ+epzKkPB1e25FHk/vCtyatkdHcArLs=
232+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f h1:XpOuNQ5GbXxUcSukbQcW9jkE7REpaFGJU2/T00fo9kA=
233+
github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f/go.mod h1:0xEgdD6MKbZ1vF0GC+YcR/C4SQCAlRuOjIJ2i0HxqzM=
234+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922192210-9a2bfd4440a6 h1:6Mq+tZGSEMEoJJ1NbJRhddeelkXZcU8yfH/ZRYUo/Es=
235+
github.com/ipld/go-ipld-prime-proto v0.0.0-20200922192210-9a2bfd4440a6/go.mod h1:3pHYooM9Ea65jewRwrb2u5uHZCNkNTe9ABsVB+SrkH0=
238236
github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
239237
github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
240238
github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA=
@@ -545,8 +543,8 @@ github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUr
545543
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
546544
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
547545
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
548-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
549-
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
546+
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
547+
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
550548
github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
551549
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a h1:/eS3yfGjQKG+9kayBkj0ip1BGhq6zJ3eaVksphxAaek=
552550
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=

‎graphsync.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ type BlockData interface {
203203
type IncomingRequestHookActions interface {
204204
SendExtensionData(ExtensionData)
205205
UsePersistenceOption(name string)
206-
UseLinkTargetNodeStyleChooser(traversal.LinkTargetNodeStyleChooser)
206+
UseLinkTargetNodePrototypeChooser(traversal.LinkTargetNodePrototypeChooser)
207207
TerminateWithError(error)
208208
ValidateRequest()
209209
PauseResponse()
@@ -221,7 +221,7 @@ type OutgoingBlockHookActions interface {
221221
// to change the execution of a request
222222
type OutgoingRequestHookActions interface {
223223
UsePersistenceOption(name string)
224-
UseLinkTargetNodeStyleChooser(traversal.LinkTargetNodeStyleChooser)
224+
UseLinkTargetNodePrototypeChooser(traversal.LinkTargetNodePrototypeChooser)
225225
}
226226

227227
// IncomingResponseHookActions are actions that incoming response hook can take

‎impl/graphsync_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func TestGraphsyncRoundTripPartial(t *testing.T) {
260260
}
261261
})
262262
// create a selector to traverse the whole tree
263-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
263+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
264264
allSelector := ssb.ExploreRecursive(selector.RecursionLimitDepth(10),
265265
ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node()
266266

@@ -587,14 +587,14 @@ func TestGraphsyncRoundTripAlternatePersistenceAndNodes(t *testing.T) {
587587
requestor.RegisterOutgoingRequestHook(func(p peer.ID, requestData graphsync.RequestData, hookActions graphsync.OutgoingRequestHookActions) {
588588
_, has := requestData.Extension(extensionName)
589589
if has {
590-
hookActions.UseLinkTargetNodeStyleChooser(blockChain.Chooser)
590+
hookActions.UseLinkTargetNodePrototypeChooser(blockChain.Chooser)
591591
hookActions.UsePersistenceOption("chainstore")
592592
}
593593
})
594594
responder.RegisterIncomingRequestHook(func(p peer.ID, requestData graphsync.RequestData, hookActions graphsync.IncomingRequestHookActions) {
595595
_, has := requestData.Extension(extensionName)
596596
if has {
597-
hookActions.UseLinkTargetNodeStyleChooser(blockChain.Chooser)
597+
hookActions.UseLinkTargetNodePrototypeChooser(blockChain.Chooser)
598598
hookActions.UsePersistenceOption("chainstore")
599599
}
600600
})
@@ -828,7 +828,7 @@ func TestUnixFSFetch(t *testing.T) {
828828
clink := cidlink.Link{Cid: nd.Cid()}
829829

830830
// create a selector for the whole UnixFS dag
831-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
831+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
832832

833833
allSelector := ssb.ExploreRecursive(ipldselector.RecursionLimitNone(),
834834
ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node()

‎ipldutil/ipldutil.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
)
1616

1717
var (
18-
defaultChooser traversal.LinkTargetNodeStyleChooser = dagpb.AddDagPBSupportToChooser(func(ipld.Link, ipld.LinkContext) (ipld.NodeStyle, error) {
19-
return basicnode.Style.Any, nil
18+
defaultChooser traversal.LinkTargetNodePrototypeChooser = dagpb.AddDagPBSupportToChooser(func(ipld.Link, ipld.LinkContext) (ipld.NodePrototype, error) {
19+
return basicnode.Prototype.Any, nil
2020
})
2121
)
2222

23-
func Traverse(ctx context.Context, loader ipld.Loader, chooser traversal.LinkTargetNodeStyleChooser, root ipld.Link, s selector.Selector, fn traversal.AdvVisitFn) error {
23+
func Traverse(ctx context.Context, loader ipld.Loader, chooser traversal.LinkTargetNodePrototypeChooser, root ipld.Link, s selector.Selector, fn traversal.AdvVisitFn) error {
2424
if chooser == nil {
2525
chooser = defaultChooser
2626
}
@@ -38,7 +38,7 @@ func Traverse(ctx context.Context, loader ipld.Loader, chooser traversal.LinkTar
3838
Cfg: &traversal.Config{
3939
Ctx: ctx,
4040
LinkLoader: loader,
41-
LinkTargetNodeStyleChooser: chooser,
41+
LinkTargetNodePrototypeChooser: chooser,
4242
},
4343
}.WalkAdv(node, s, fn)
4444
}
@@ -57,7 +57,7 @@ func EncodeNode(node ipld.Node) ([]byte, error) {
5757
}
5858

5959
func DecodeNode(encoded []byte) (ipld.Node, error) {
60-
nb := basicnode.Style.Any.NewBuilder()
60+
nb := basicnode.Prototype.Any.NewBuilder()
6161
if err := dagcbor.Decoder(nb, bytes.NewReader(encoded)); err != nil {
6262
return nil, err
6363
}

‎ipldutil/traverser.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type TraversalBuilder struct {
2525
Root ipld.Link
2626
Selector ipld.Node
2727
Visitor traversal.AdvVisitFn
28-
Chooser traversal.LinkTargetNodeStyleChooser
28+
Chooser traversal.LinkTargetNodePrototypeChooser
2929
}
3030

3131
// Traverser is an interface for performing a selector traversal that operates iteratively --
@@ -91,7 +91,7 @@ type traverser struct {
9191
root ipld.Link
9292
selector ipld.Node
9393
visitor traversal.AdvVisitFn
94-
chooser traversal.LinkTargetNodeStyleChooser
94+
chooser traversal.LinkTargetNodePrototypeChooser
9595
currentLink ipld.Link
9696
currentContext ipld.LinkContext
9797
isDone bool
@@ -169,7 +169,7 @@ func (t *traverser) start() {
169169
Cfg: &traversal.Config{
170170
Ctx: t.ctx,
171171
LinkLoader: loader,
172-
LinkTargetNodeStyleChooser: t.chooser,
172+
LinkTargetNodePrototypeChooser: t.chooser,
173173
},
174174
}.WalkAdv(nd, sel, t.visitor)
175175
t.writeDone(err)

‎ipldutil/traverser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestTraverser(t *testing.T) {
2323

2424
t.Run("traverses correctly, simple struct", func(t *testing.T) {
2525
testdata := testutil.NewTestIPLDTree()
26-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
26+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
2727
sel := ssb.ExploreRecursive(selector.RecursionLimitNone(), ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node()
2828
traverser := TraversalBuilder{
2929
Root: testdata.RootNodeLnk,

‎message/message_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestAppendingRequests(t *testing.T) {
2424
Data: testutil.RandomBytes(100),
2525
}
2626
root := testutil.GenerateCids(1)[0]
27-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
27+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
2828
selector := ssb.Matcher().Node()
2929
id := graphsync.RequestID(rand.Int31())
3030
priority := graphsync.Priority(rand.Int31())
@@ -145,7 +145,7 @@ func contains(strs []string, x string) bool {
145145
}
146146

147147
func TestRequestCancel(t *testing.T) {
148-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
148+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
149149
selector := ssb.Matcher().Node()
150150
id := graphsync.RequestID(rand.Int31())
151151
priority := graphsync.Priority(rand.Int31())
@@ -218,7 +218,7 @@ func TestRequestUpdate(t *testing.T) {
218218

219219
func TestToNetFromNetEquivalency(t *testing.T) {
220220
root := testutil.GenerateCids(1)[0]
221-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
221+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
222222
selector := ssb.Matcher().Node()
223223
extensionName := graphsync.ExtensionName("graphsync/awesome")
224224
extension := graphsync.ExtensionData{
@@ -311,7 +311,7 @@ func TestMergeExtensions(t *testing.T) {
311311
return []byte(string(oldData) + " " + string(newData)), nil
312312
}
313313
root := testutil.GenerateCids(1)[0]
314-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
314+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
315315
selector := ssb.Matcher().Node()
316316
id := graphsync.RequestID(rand.Int31())
317317
priority := graphsync.Priority(rand.Int31())

‎messagequeue/messagequeue_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestStartupAndShutdown(t *testing.T) {
6969
messageQueue.Startup()
7070
id := graphsync.RequestID(rand.Int31())
7171
priority := graphsync.Priority(rand.Int31())
72-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
72+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
7373
selector := ssb.Matcher().Node()
7474
root := testutil.GenerateCids(1)[0]
7575

@@ -104,7 +104,7 @@ func TestShutdownDuringMessageSend(t *testing.T) {
104104
messageQueue.Startup()
105105
id := graphsync.RequestID(rand.Int31())
106106
priority := graphsync.Priority(rand.Int31())
107-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
107+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
108108
selector := ssb.Matcher().Node()
109109
root := testutil.GenerateCids(1)[0]
110110

@@ -198,7 +198,7 @@ func TestDedupingMessages(t *testing.T) {
198198
waitGroup.Add(1)
199199
id := graphsync.RequestID(rand.Int31())
200200
priority := graphsync.Priority(rand.Int31())
201-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
201+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
202202
selector := ssb.Matcher().Node()
203203
root := testutil.GenerateCids(1)[0]
204204

‎metadata/metadata_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
func TestDecodeEncodeMetadata(t *testing.T) {
1818
cids := testutil.GenerateCids(10)
1919
initialMetadata := make(Metadata, 0, 10)
20-
nd := fluent.MustBuildList(basicnode.Style.List, 10, func(fla fluent.ListAssembler) {
20+
nd := fluent.MustBuildList(basicnode.Prototype.List, 10, func(fla fluent.ListAssembler) {
2121
for _, k := range cids {
2222
blockPresent := rand.Int31()%2 == 0
2323
initialMetadata = append(initialMetadata, Item{k, blockPresent})
@@ -44,12 +44,12 @@ func TestDecodeEncodeMetadata(t *testing.T) {
4444
require.NoError(t, err)
4545
require.Equal(t, decodedMetadata, decodedMetadataFromNode, "metadata not equal to IPLD encoding")
4646

47-
nb := basicnode.Style.List.NewBuilder()
47+
nb := basicnode.Prototype.List.NewBuilder()
4848
err = dagcbor.Decoder(nb, encodedNode)
4949
require.NoError(t, err)
5050
decodedNode := nb.Build()
5151
require.Equal(t, nd, decodedNode)
52-
nb = basicnode.Style.List.NewBuilder()
52+
nb = basicnode.Prototype.List.NewBuilder()
5353
err = dagcbor.Decoder(nb, bytes.NewReader(encoded))
5454
require.NoError(t, err)
5555
decodedNodeFromMetadata := nb.Build()

‎network/libp2p_impl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestMessageSendAndReceive(t *testing.T) {
7070
gsnet2.SetDelegate(r)
7171

7272
root := testutil.GenerateCids(1)[0]
73-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
73+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
7474
selector := ssb.Matcher().Node()
7575
extensionName := graphsync.ExtensionName("graphsync/awesome")
7676
extension := graphsync.ExtensionData{

‎peermanager/peermessagemanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestSendingMessagesToPeers(t *testing.T) {
6161
id := graphsync.RequestID(rand.Int31())
6262
priority := graphsync.Priority(rand.Int31())
6363
root := testutil.GenerateCids(1)[0]
64-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
64+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
6565
selector := ssb.Matcher().Node()
6666

6767
peerManager := NewMessageManager(ctx, peerQueueFactory)

‎requestmanager/executor/executor.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type RequestExecution struct {
4242
Request gsmsg.GraphSyncRequest
4343
LastResponse *atomic.Value
4444
DoNotSendCids *cid.Set
45-
NodeStyleChooser traversal.LinkTargetNodeStyleChooser
45+
NodePrototypeChooser traversal.LinkTargetNodePrototypeChooser
4646
ResumeMessages chan []graphsync.ExtensionData
4747
PauseMessages chan struct{}
4848
}
@@ -58,7 +58,7 @@ func (ee ExecutionEnv) Start(re RequestExecution) (chan graphsync.ResponseProgre
5858
request: re.Request,
5959
lastResponse: re.LastResponse,
6060
doNotSendCids: re.DoNotSendCids,
61-
nodeStyleChooser: re.NodeStyleChooser,
61+
nodeStyleChooser: re.NodePrototypeChooser,
6262
resumeMessages: re.ResumeMessages,
6363
pauseMessages: re.PauseMessages,
6464
env: ee,
@@ -76,7 +76,7 @@ type requestExecutor struct {
7676
networkError chan error
7777
request gsmsg.GraphSyncRequest
7878
lastResponse *atomic.Value
79-
nodeStyleChooser traversal.LinkTargetNodeStyleChooser
79+
nodeStyleChooser traversal.LinkTargetNodePrototypeChooser
8080
resumeMessages chan []graphsync.ExtensionData
8181
pauseMessages chan struct{}
8282
doNotSendCids *cid.Set

‎requestmanager/executor/executor_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ func (ree *requestExecutionEnv) sendRequest(p peer.ID, request gsmsg.GraphSyncRe
384384
}
385385
}
386386

387-
func (ree *requestExecutionEnv) nodeStyleChooser(ipld.Link, ipld.LinkContext) (ipld.NodeStyle, error) {
387+
func (ree *requestExecutionEnv) nodeStyleChooser(ipld.Link, ipld.LinkContext) (ipld.NodePrototype, error) {
388388
ree.nodeStyleChooserCalled = true
389-
return basicnode.Style.Any, nil
389+
return basicnode.Prototype.Any, nil
390390
}
391391

392392
func (ree *requestExecutionEnv) checkPause(requestID graphsync.RequestID, link ipld.Link, result <-chan types.AsyncLoadResult) {
@@ -435,7 +435,7 @@ func (ree *requestExecutionEnv) requestExecution() (chan graphsync.ResponseProgr
435435
LastResponse: &lastResponse,
436436
Request: ree.request,
437437
DoNotSendCids: ree.doNotSendCids,
438-
NodeStyleChooser: ree.nodeStyleChooser,
438+
NodePrototypeChooser: ree.nodeStyleChooser,
439439
ResumeMessages: ree.resumeMessages,
440440
PauseMessages: ree.pauseMessages,
441441
})

‎requestmanager/hooks/hooks_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
)
1919

2020
func TestRequestHookProcessing(t *testing.T) {
21-
fakeChooser := func(ipld.Link, ipld.LinkContext) (ipld.NodeStyle, error) {
22-
return basicnode.Style.Any, nil
21+
fakeChooser := func(ipld.Link, ipld.LinkContext) (ipld.NodePrototype, error) {
22+
return basicnode.Prototype.Any, nil
2323
}
2424
extensionData := testutil.RandomBytes(100)
2525
extensionName := graphsync.ExtensionName("AppleSauce/McGee")
@@ -30,7 +30,7 @@ func TestRequestHookProcessing(t *testing.T) {
3030

3131
root := testutil.GenerateCids(1)[0]
3232
requestID := graphsync.RequestID(rand.Int31())
33-
ssb := builder.NewSelectorSpecBuilder(basicnode.Style.Any)
33+
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
3434
request := gsmsg.NewRequest(requestID, root, ssb.Matcher().Node(), graphsync.Priority(0), extension)
3535
p := testutil.GeneratePeers(1)[0]
3636
testCases := map[string]struct {
@@ -47,7 +47,7 @@ func TestRequestHookProcessing(t *testing.T) {
4747
configure: func(t *testing.T, hooks *hooks.OutgoingRequestHooks) {
4848
hooks.Register(func(p peer.ID, requestData graphsync.RequestData, hookActions graphsync.OutgoingRequestHookActions) {
4949
if _, found := requestData.Extension(extensionName); found {
50-
hookActions.UseLinkTargetNodeStyleChooser(fakeChooser)
50+
hookActions.UseLinkTargetNodePrototypeChooser(fakeChooser)
5151
}
5252
})
5353
},

0 commit comments

Comments
 (0)