From de861dcd2af592509569df5c52f4e114329cd627 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 12 Jul 2023 19:28:59 +1000 Subject: [PATCH] tmp --- pkg/internal/itest/mocknet/mocknet.go | 5 +++++ pkg/internal/itest/trustless_fetch_test.go | 2 +- pkg/retriever/bitswapretriever.go | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/internal/itest/mocknet/mocknet.go b/pkg/internal/itest/mocknet/mocknet.go index 3b32f986..834b23b0 100644 --- a/pkg/internal/itest/mocknet/mocknet.go +++ b/pkg/internal/itest/mocknet/mocknet.go @@ -3,6 +3,7 @@ package mocknet import ( "context" "errors" + "fmt" "sync" "testing" "time" @@ -162,6 +163,10 @@ func (mcf *mockCandidateFinder) FindCandidates(ctx context.Context, cid cid.Cid) candidates = append(candidates, types.RetrievalCandidate{MinerPeer: *h.AddrInfo(), RootCid: cid, Metadata: md}) } } + fmt.Println("Returning candidates:", len(candidates)) + for _, c := range candidates { + fmt.Println("\tCandidate:", c.MinerPeer.Addrs[0]) + } return candidates, nil } diff --git a/pkg/internal/itest/trustless_fetch_test.go b/pkg/internal/itest/trustless_fetch_test.go index aa534a22..9c984e7c 100644 --- a/pkg/internal/itest/trustless_fetch_test.go +++ b/pkg/internal/itest/trustless_fetch_test.go @@ -54,7 +54,6 @@ func TestTrustlessUnixfsFetch(t *testing.T) { case "bitswap": mrn.AddBitswapPeers(1) } - require.NoError(t, mrn.MN.LinkAll()) var finishedChan chan []datatransfer.Event if proto == "graphsync" { finishedChan = mocknet.SetupRetrieval(t, mrn.Remotes[0]) @@ -62,6 +61,7 @@ func TestTrustlessUnixfsFetch(t *testing.T) { mrn.Remotes[0].Blockstore().UseLinkSystem(lsys) mrn.Remotes[0].Cids[tc.Root] = struct{}{} + require.NoError(t, mrn.MN.LinkAll()) lassie, err := lassie.NewLassie( ctx, diff --git a/pkg/retriever/bitswapretriever.go b/pkg/retriever/bitswapretriever.go index bdd2fcf0..463a5b24 100644 --- a/pkg/retriever/bitswapretriever.go +++ b/pkg/retriever/bitswapretriever.go @@ -162,6 +162,10 @@ func (br *bitswapRetrieval) RetrieveFromAsyncCandidates(ayncCandidates types.Inb return nil, nil } + fmt.Println("hasCandidates", hasCandidates, "nextCandidates", len(nextCandidates)) + for _, c := range nextCandidates { + fmt.Println("\tnextCandidates", c.MinerPeer.Addrs) + } br.events(events.StartedRetrieval(br.clock.Now(), br.request.RetrievalID, bitswapCandidate, multicodec.TransportBitswap)) // set initial providers, then start a goroutine to add more as they come in