From dfe2dcc85301bc8d5049e07cef2108a7dee46d5b Mon Sep 17 00:00:00 2001 From: Dirk McCormick Date: Fri, 24 Mar 2023 15:11:35 +0100 Subject: [PATCH] refactor: move from ipfs/go-graphsync to filecoin-project/boost-graphsync --- README.md | 10 ++--- allocator/allocator.go | 2 +- allocator/allocator_test.go | 4 +- benchmarks/benchmark_test.go | 6 +-- benchmarks/testinstance/testinstance.go | 10 ++--- benchmarks/testnet/interface.go | 2 +- .../internet_latency_delay_generator_test.go | 2 +- benchmarks/testnet/network_test.go | 6 +-- benchmarks/testnet/peernet.go | 2 +- benchmarks/testnet/virtual.go | 6 +-- cidset/cidset_test.go | 2 +- go.mod | 2 +- impl/graphsync.go | 38 +++++++++---------- impl/graphsync_test.go | 26 ++++++------- ipldutil/traverser.go | 2 +- ipldutil/traverser_test.go | 4 +- linktracker/linktracker.go | 2 +- linktracker/linktracker_test.go | 4 +- listeners/listeners.go | 2 +- message/bench/bench_test.go | 10 ++--- message/builder.go | 2 +- message/builder_test.go | 4 +- message/ipldbind/message.go | 4 +- message/message.go | 2 +- message/v1/message.go | 8 ++-- message/v1/message_test.go | 6 +-- message/v1/metadata/metadata.go | 4 +- message/v1/metadata/metadata_test.go | 2 +- message/v1/pb_roundtrip_test.go | 8 ++-- message/v2/ipld_roundtrip_test.go | 8 ++-- message/v2/message.go | 6 +-- message/v2/message_test.go | 6 +-- messagequeue/builder.go | 6 +-- messagequeue/messagequeue.go | 8 ++-- messagequeue/messagequeue_test.go | 12 +++--- network/interface.go | 2 +- network/libp2p_impl.go | 8 ++-- network/libp2p_impl_test.go | 6 +-- notifications/notifications_test.go | 4 +- peermanager/peermanager_test.go | 2 +- peermanager/peermessagemanager.go | 2 +- peermanager/peermessagemanager_test.go | 8 ++-- peerstate/peerstate.go | 2 +- peerstate/peerstate_test.go | 4 +- requestmanager/client.go | 26 ++++++------- requestmanager/executor/executor.go | 12 +++--- requestmanager/executor/executor_test.go | 16 ++++---- requestmanager/hooks/blockhooks.go | 2 +- requestmanager/hooks/hooks_test.go | 8 ++-- requestmanager/hooks/requesthooks.go | 2 +- requestmanager/hooks/responsehooks.go | 2 +- requestmanager/messages.go | 8 ++-- requestmanager/reconciledloader/injest.go | 2 +- requestmanager/reconciledloader/load.go | 4 +- .../reconciledloader/pathtracker.go | 2 +- .../reconciledloader/reconciledloader.go | 6 +-- .../reconciledloader/reconciledloader_test.go | 12 +++--- .../reconciledloader/remotequeue.go | 2 +- .../traversalrecord/traversalrecord.go | 2 +- .../traversalrecord/traversalrecord_test.go | 8 ++-- requestmanager/requestmanager_test.go | 20 +++++----- requestmanager/responsecollector.go | 2 +- requestmanager/responsecollector_test.go | 4 +- requestmanager/server.go | 18 ++++----- responsemanager/client.go | 22 +++++------ responsemanager/hooks/blockhooks.go | 2 +- responsemanager/hooks/hooks_test.go | 8 ++-- responsemanager/hooks/requesthook.go | 2 +- responsemanager/hooks/requestupdatehooks.go | 2 +- responsemanager/messages.go | 8 ++-- .../queryexecutor/queryexecutor.go | 10 ++--- .../queryexecutor/queryexecutor_test.go | 12 +++--- responsemanager/querypreparer.go | 18 ++++----- .../responseassembler/peerlinktracker.go | 4 +- .../responseassembler/responseBuilder.go | 4 +- .../responseassembler/responseassembler.go | 8 ++-- .../responseassembler_test.go | 10 ++--- responsemanager/responsemanager_test.go | 30 +++++++-------- responsemanager/server.go | 14 +++---- responsemanager/subscriber.go | 10 ++--- scripts/fiximports | 2 +- selectorvalidator/selectorvalidator.go | 2 +- storeutil/storeutil_test.go | 2 +- taskqueue/taskqueue.go | 2 +- testplans/graphsync/main.go | 7 ++-- testutil/testchain.go | 4 +- testutil/testnotifications.go | 2 +- testutil/testutil.go | 2 +- 88 files changed, 305 insertions(+), 306 deletions(-) diff --git a/README.md b/README.md index eb7594ca..053b9a00 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ If your existing library (i.e. `go-ipfs` or `go-filecoin`) uses these other olde ```golang import ( - graphsync "github.com/ipfs/go-graphsync/impl" - gsnet "github.com/ipfs/go-graphsync/network" + graphsync "github.com/filecoin-project/boost-graphsync/impl" + gsnet "github.com/filecoin-project/boost-graphsync/network" ipld "github.com/ipld/go-ipld-prime" ) @@ -78,9 +78,9 @@ integrating with BlockStore's from IPFS. ```golang import ( - graphsync "github.com/ipfs/go-graphsync/impl" - gsnet "github.com/ipfs/go-graphsync/network" - storeutil "github.com/ipfs/go-graphsync/storeutil" + graphsync "github.com/filecoin-project/boost-graphsync/impl" + gsnet "github.com/filecoin-project/boost-graphsync/network" + storeutil "github.com/filecoin-project/boost-graphsync/storeutil" ipld "github.com/ipld/go-ipld-prime" blockstore "github.com/ipfs/go-ipfs-blockstore" ) diff --git a/allocator/allocator.go b/allocator/allocator.go index eff90e54..dd1872b0 100644 --- a/allocator/allocator.go +++ b/allocator/allocator.go @@ -8,7 +8,7 @@ import ( logging "github.com/ipfs/go-log/v2" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) var log = logging.Logger("graphsync_allocator") diff --git a/allocator/allocator_test.go b/allocator/allocator_test.go index 434d76cf..b5207cd8 100644 --- a/allocator/allocator_test.go +++ b/allocator/allocator_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/allocator" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/allocator" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestAllocator(t *testing.T) { diff --git a/benchmarks/benchmark_test.go b/benchmarks/benchmark_test.go index 7699b1f9..625f3975 100644 --- a/benchmarks/benchmark_test.go +++ b/benchmarks/benchmark_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/ipfs/go-graphsync/benchmarks/testinstance" - tn "github.com/ipfs/go-graphsync/benchmarks/testnet" - graphsync "github.com/ipfs/go-graphsync/impl" + "github.com/filecoin-project/boost-graphsync/benchmarks/testinstance" + tn "github.com/filecoin-project/boost-graphsync/benchmarks/testnet" + graphsync "github.com/filecoin-project/boost-graphsync/impl" ) type runStats struct { diff --git a/benchmarks/testinstance/testinstance.go b/benchmarks/testinstance/testinstance.go index d69ae7fb..cc125987 100644 --- a/benchmarks/testinstance/testinstance.go +++ b/benchmarks/testinstance/testinstance.go @@ -15,11 +15,11 @@ import ( p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil" peer "github.com/libp2p/go-libp2p/core/peer" - graphsync "github.com/ipfs/go-graphsync" - tn "github.com/ipfs/go-graphsync/benchmarks/testnet" - gsimpl "github.com/ipfs/go-graphsync/impl" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/storeutil" + graphsync "github.com/filecoin-project/boost-graphsync" + tn "github.com/filecoin-project/boost-graphsync/benchmarks/testnet" + gsimpl "github.com/filecoin-project/boost-graphsync/impl" + gsnet "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/storeutil" ) // TempDirGenerator is any interface that can generate temporary directories diff --git a/benchmarks/testnet/interface.go b/benchmarks/testnet/interface.go index 5a947aef..47ab72e5 100644 --- a/benchmarks/testnet/interface.go +++ b/benchmarks/testnet/interface.go @@ -4,7 +4,7 @@ import ( tnet "github.com/libp2p/go-libp2p-testing/net" "github.com/libp2p/go-libp2p/core/peer" - gsnet "github.com/ipfs/go-graphsync/network" + gsnet "github.com/filecoin-project/boost-graphsync/network" ) // Network is an interface for generating graphsync network interfaces diff --git a/benchmarks/testnet/internet_latency_delay_generator_test.go b/benchmarks/testnet/internet_latency_delay_generator_test.go index 4680420c..2de98561 100644 --- a/benchmarks/testnet/internet_latency_delay_generator_test.go +++ b/benchmarks/testnet/internet_latency_delay_generator_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/benchmarks/testnet" + "github.com/filecoin-project/boost-graphsync/benchmarks/testnet" ) const testSeed = 99 diff --git a/benchmarks/testnet/network_test.go b/benchmarks/testnet/network_test.go index 69966173..ddea77db 100644 --- a/benchmarks/testnet/network_test.go +++ b/benchmarks/testnet/network_test.go @@ -11,9 +11,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/benchmarks/testnet" - gsmsg "github.com/ipfs/go-graphsync/message" - gsnet "github.com/ipfs/go-graphsync/network" + "github.com/filecoin-project/boost-graphsync/benchmarks/testnet" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + gsnet "github.com/filecoin-project/boost-graphsync/network" ) func TestSendMessageAsyncButWaitForResponse(t *testing.T) { diff --git a/benchmarks/testnet/peernet.go b/benchmarks/testnet/peernet.go index 9c918323..fb34acc5 100644 --- a/benchmarks/testnet/peernet.go +++ b/benchmarks/testnet/peernet.go @@ -7,7 +7,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" mockpeernet "github.com/libp2p/go-libp2p/p2p/net/mock" - gsnet "github.com/ipfs/go-graphsync/network" + gsnet "github.com/filecoin-project/boost-graphsync/network" ) type peernet struct { diff --git a/benchmarks/testnet/virtual.go b/benchmarks/testnet/virtual.go index a8505079..9dd13dce 100644 --- a/benchmarks/testnet/virtual.go +++ b/benchmarks/testnet/virtual.go @@ -15,9 +15,9 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "google.golang.org/protobuf/proto" - gsmsg "github.com/ipfs/go-graphsync/message" - gsmsgv1 "github.com/ipfs/go-graphsync/message/v1" - gsnet "github.com/ipfs/go-graphsync/network" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + gsmsgv1 "github.com/filecoin-project/boost-graphsync/message/v1" + gsnet "github.com/filecoin-project/boost-graphsync/network" ) // VirtualNetwork generates a new testnet instance - a fake network that diff --git a/cidset/cidset_test.go b/cidset/cidset_test.go index 741a0b7c..36cd3379 100644 --- a/cidset/cidset_test.go +++ b/cidset/cidset_test.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestDecodeEncodeCidSet(t *testing.T) { diff --git a/go.mod b/go.mod index f11670c6..a15375b0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ipfs/go-graphsync +module github.com/filecoin-project/boost-graphsync go 1.18 diff --git a/impl/graphsync.go b/impl/graphsync.go index 395912fe..8676f97e 100644 --- a/impl/graphsync.go +++ b/impl/graphsync.go @@ -13,25 +13,25 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/allocator" - "github.com/ipfs/go-graphsync/listeners" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/panics" - "github.com/ipfs/go-graphsync/peermanager" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/persistenceoptions" - "github.com/ipfs/go-graphsync/requestmanager" - "github.com/ipfs/go-graphsync/requestmanager/executor" - requestorhooks "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager" - responderhooks "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" - "github.com/ipfs/go-graphsync/selectorvalidator" - "github.com/ipfs/go-graphsync/taskqueue" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/allocator" + "github.com/filecoin-project/boost-graphsync/listeners" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + gsnet "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/panics" + "github.com/filecoin-project/boost-graphsync/peermanager" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/persistenceoptions" + "github.com/filecoin-project/boost-graphsync/requestmanager" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" + requestorhooks "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager" + responderhooks "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" + "github.com/filecoin-project/boost-graphsync/selectorvalidator" + "github.com/filecoin-project/boost-graphsync/taskqueue" ) var log = logging.Logger("graphsync") diff --git a/impl/graphsync_test.go b/impl/graphsync_test.go index 6c5aaee4..3be25d7b 100644 --- a/impl/graphsync_test.go +++ b/impl/graphsync_test.go @@ -42,15 +42,15 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/cidset" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/ipldutil" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/storeutil" - "github.com/ipfs/go-graphsync/taskqueue" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/cidset" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsnet "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/storeutil" + "github.com/filecoin-project/boost-graphsync/taskqueue" + "github.com/filecoin-project/boost-graphsync/testutil" ) // nil means use the default protocols @@ -109,7 +109,7 @@ func TestRejectRequestsByDefault(t *testing.T) { // has ContextCancelError exception recorded in the right place tracing.SingleExceptionEvent(t, "request(0)->executeTask(0)", "ContextCancelError", ipldutil.ContextCancelError{}.Error(), false) // RejectAllRequestsByDefault() causes no request validator to be set, so they are all invalid - tracing.SingleExceptionEvent(t, "response(0)", "github.com/ipfs/go-graphsync/responsemanager.errorString", "request not valid", true) + tracing.SingleExceptionEvent(t, "response(0)", "github.com/filecoin-project/boost-graphsync/responsemanager.errorString", "request not valid", true) } func TestGraphsyncRoundTripRequestBudgetRequestor(t *testing.T) { @@ -624,7 +624,7 @@ func TestPauseResume(t *testing.T) { require.Contains(t, traceStrings, "request(0)->verifyBlock(0)") // should have one of these per block // pause recorded - tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/ipfs/go-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) + tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/filecoin-project/boost-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) } func TestPauseResumeRequest(t *testing.T) { @@ -798,7 +798,7 @@ func TestPauseResumeViaUpdate(t *testing.T) { processUpdateSpan := tracing.FindSpanByTraceString("response(0)->processUpdate(0)") require.Equal(t, []string{string(td.extensionName)}, testutil.AttributeValueInTraceSpan(t, *processUpdateSpan, "extensions").AsStringSlice()) // pause recorded - tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/ipfs/go-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) + tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/filecoin-project/boost-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) message0Span := tracing.FindSpanByTraceString("processRequests(0)") message1Span := tracing.FindSpanByTraceString("processRequests(1)") @@ -902,7 +902,7 @@ func TestPauseResumeViaUpdateOnBlockHook(t *testing.T) { processUpdateSpan := tracing.FindSpanByTraceString("response(0)->processUpdate(0)") require.Equal(t, []string{string(td.extensionName)}, testutil.AttributeValueInTraceSpan(t, *processUpdateSpan, "extensions").AsStringSlice()) // pause recorded - tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/ipfs/go-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) + tracing.SingleExceptionEvent(t, "response(0)->executeTask(0)", "github.com/filecoin-project/boost-graphsync/responsemanager/hooks.ErrPaused", hooks.ErrPaused{}.Error(), false) } func TestNetworkDisconnect(t *testing.T) { diff --git a/ipldutil/traverser.go b/ipldutil/traverser.go index 1aa95150..9ebbaacc 100644 --- a/ipldutil/traverser.go +++ b/ipldutil/traverser.go @@ -13,7 +13,7 @@ import ( "github.com/ipld/go-ipld-prime/traversal" "github.com/ipld/go-ipld-prime/traversal/selector" - "github.com/ipfs/go-graphsync/panics" + "github.com/filecoin-project/boost-graphsync/panics" ) /* TODO: This traverser creates an extra go-routine and is quite complicated, in order to give calling code control of diff --git a/ipldutil/traverser_test.go b/ipldutil/traverser_test.go index 9a159c20..6c10805e 100644 --- a/ipldutil/traverser_test.go +++ b/ipldutil/traverser_test.go @@ -18,8 +18,8 @@ import ( "github.com/ipld/go-ipld-prime/traversal/selector/builder" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestTraverser(t *testing.T) { diff --git a/linktracker/linktracker.go b/linktracker/linktracker.go index 673c6062..58069606 100644 --- a/linktracker/linktracker.go +++ b/linktracker/linktracker.go @@ -3,7 +3,7 @@ package linktracker import ( "github.com/ipld/go-ipld-prime" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // LinkTracker records links being traversed to determine useful information diff --git a/linktracker/linktracker_test.go b/linktracker/linktracker_test.go index 4ba4c336..60278a30 100644 --- a/linktracker/linktracker_test.go +++ b/linktracker/linktracker_test.go @@ -6,8 +6,8 @@ import ( "github.com/ipld/go-ipld-prime" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/testutil" ) type request struct { diff --git a/listeners/listeners.go b/listeners/listeners.go index 10d0becf..fab999bf 100644 --- a/listeners/listeners.go +++ b/listeners/listeners.go @@ -4,7 +4,7 @@ import ( "github.com/hannahhoward/go-pubsub" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // CompletedResponseListeners is a set of listeners for completed responses diff --git a/message/bench/bench_test.go b/message/bench/bench_test.go index f17a8cf6..89cbc1d6 100644 --- a/message/bench/bench_test.go +++ b/message/bench/bench_test.go @@ -14,11 +14,11 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - v1 "github.com/ipfs/go-graphsync/message/v1" - v2 "github.com/ipfs/go-graphsync/message/v2" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + v1 "github.com/filecoin-project/boost-graphsync/message/v1" + v2 "github.com/filecoin-project/boost-graphsync/message/v2" + "github.com/filecoin-project/boost-graphsync/testutil" ) func BenchmarkMessageEncodingRoundtrip(b *testing.B) { diff --git a/message/builder.go b/message/builder.go index a4bec912..a87fdad1 100644 --- a/message/builder.go +++ b/message/builder.go @@ -6,7 +6,7 @@ import ( "github.com/ipld/go-ipld-prime" cidlink "github.com/ipld/go-ipld-prime/linking/cid" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // Builder captures components of a message across multiple diff --git a/message/builder_test.go b/message/builder_test.go index 25e22c04..ea9cf009 100644 --- a/message/builder_test.go +++ b/message/builder_test.go @@ -9,8 +9,8 @@ import ( "github.com/ipld/go-ipld-prime/node/basicnode" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestMessageBuilding(t *testing.T) { diff --git a/message/ipldbind/message.go b/message/ipldbind/message.go index f0e65f65..289edbb7 100644 --- a/message/ipldbind/message.go +++ b/message/ipldbind/message.go @@ -4,8 +4,8 @@ import ( cid "github.com/ipfs/go-cid" "github.com/ipld/go-ipld-prime/datamodel" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" ) // GraphSyncExtensions is a container for representing extension data for diff --git a/message/message.go b/message/message.go index b26e7e2a..bd8af221 100644 --- a/message/message.go +++ b/message/message.go @@ -13,7 +13,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-msgio" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // MessageHandler provides a consistent interface for maintaining per-peer state diff --git a/message/v1/message.go b/message/v1/message.go index 3ef8fa20..209507b2 100644 --- a/message/v1/message.go +++ b/message/v1/message.go @@ -19,10 +19,10 @@ import ( "github.com/libp2p/go-msgio" "google.golang.org/protobuf/proto" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - pb "github.com/ipfs/go-graphsync/message/pb" - "github.com/ipfs/go-graphsync/message/v1/metadata" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + pb "github.com/filecoin-project/boost-graphsync/message/pb" + "github.com/filecoin-project/boost-graphsync/message/v1/metadata" ) const extensionMetadata = string("graphsync/response-metadata") diff --git a/message/v1/message_test.go b/message/v1/message_test.go index ee0c4812..9632515c 100644 --- a/message/v1/message_test.go +++ b/message/v1/message_test.go @@ -16,9 +16,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestAppendingRequests(t *testing.T) { diff --git a/message/v1/metadata/metadata.go b/message/v1/metadata/metadata.go index eea20884..d8b72e2c 100644 --- a/message/v1/metadata/metadata.go +++ b/message/v1/metadata/metadata.go @@ -5,8 +5,8 @@ import ( "github.com/ipld/go-ipld-prime/datamodel" "github.com/ipld/go-ipld-prime/node/bindnode" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" ) // Item is a single link traversed in a repsonse diff --git a/message/v1/metadata/metadata_test.go b/message/v1/metadata/metadata_test.go index d2454972..311a4d09 100644 --- a/message/v1/metadata/metadata_test.go +++ b/message/v1/metadata/metadata_test.go @@ -9,7 +9,7 @@ import ( "github.com/ipld/go-ipld-prime/node/basicnode" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestDecodeEncodeMetadata(t *testing.T) { diff --git a/message/v1/pb_roundtrip_test.go b/message/v1/pb_roundtrip_test.go index 57ff87b7..990e6cad 100644 --- a/message/v1/pb_roundtrip_test.go +++ b/message/v1/pb_roundtrip_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - pb "github.com/ipfs/go-graphsync/message/pb" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + pb "github.com/filecoin-project/boost-graphsync/message/pb" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestIPLDRoundTrip(t *testing.T) { diff --git a/message/v2/ipld_roundtrip_test.go b/message/v2/ipld_roundtrip_test.go index 1b83b6d8..2c23e9d5 100644 --- a/message/v2/ipld_roundtrip_test.go +++ b/message/v2/ipld_roundtrip_test.go @@ -13,10 +13,10 @@ import ( selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/message/ipldbind" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/message/ipldbind" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestIPLDRoundTrip(t *testing.T) { diff --git a/message/v2/message.go b/message/v2/message.go index 25658da8..dd4a9c82 100644 --- a/message/v2/message.go +++ b/message/v2/message.go @@ -16,9 +16,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-msgio" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/message/ipldbind" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/message/ipldbind" ) // MessageHandler is used to hold per-peer state for each connection. There is diff --git a/message/v2/message_test.go b/message/v2/message_test.go index d11c19ba..217419c6 100644 --- a/message/v2/message_test.go +++ b/message/v2/message_test.go @@ -14,9 +14,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestAppendingRequests(t *testing.T) { diff --git a/messagequeue/builder.go b/messagequeue/builder.go index 073f8e87..18a263ee 100644 --- a/messagequeue/builder.go +++ b/messagequeue/builder.go @@ -4,9 +4,9 @@ import ( "context" "io" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/notifications" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/notifications" ) // Builder wraps a message builder with additional functions related to metadata diff --git a/messagequeue/messagequeue.go b/messagequeue/messagequeue.go index 2af79e13..0a0b8dfa 100644 --- a/messagequeue/messagequeue.go +++ b/messagequeue/messagequeue.go @@ -15,10 +15,10 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/notifications" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + gsnet "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/notifications" ) var log = logging.Logger("graphsync") diff --git a/messagequeue/messagequeue_test.go b/messagequeue/messagequeue_test.go index 4cad4f14..22d4570e 100644 --- a/messagequeue/messagequeue_test.go +++ b/messagequeue/messagequeue_test.go @@ -15,12 +15,12 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - allocator2 "github.com/ipfs/go-graphsync/allocator" - gsmsg "github.com/ipfs/go-graphsync/message" - gsnet "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + allocator2 "github.com/filecoin-project/boost-graphsync/allocator" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + gsnet "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestStartupAndShutdown(t *testing.T) { diff --git a/network/interface.go b/network/interface.go index 302d025d..cd4307a2 100644 --- a/network/interface.go +++ b/network/interface.go @@ -7,7 +7,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" - gsmsg "github.com/ipfs/go-graphsync/message" + gsmsg "github.com/filecoin-project/boost-graphsync/message" ) var ( diff --git a/network/libp2p_impl.go b/network/libp2p_impl.go index 8fad9060..d35a460e 100644 --- a/network/libp2p_impl.go +++ b/network/libp2p_impl.go @@ -14,10 +14,10 @@ import ( "github.com/libp2p/go-msgio" ma "github.com/multiformats/go-multiaddr" - gsmsg "github.com/ipfs/go-graphsync/message" - gsmsgv1 "github.com/ipfs/go-graphsync/message/v1" - gsmsgv2 "github.com/ipfs/go-graphsync/message/v2" - "github.com/ipfs/go-graphsync/panics" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + gsmsgv1 "github.com/filecoin-project/boost-graphsync/message/v1" + gsmsgv2 "github.com/filecoin-project/boost-graphsync/message/v2" + "github.com/filecoin-project/boost-graphsync/panics" ) var log = logging.Logger("graphsync_network") diff --git a/network/libp2p_impl_test.go b/network/libp2p_impl_test.go index e71e217f..2f6788a6 100644 --- a/network/libp2p_impl_test.go +++ b/network/libp2p_impl_test.go @@ -12,9 +12,9 @@ import ( mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/testutil" ) // Receiver is an interface for receiving messages from the GraphSyncNetwork. diff --git a/notifications/notifications_test.go b/notifications/notifications_test.go index 73af3099..becc7f72 100644 --- a/notifications/notifications_test.go +++ b/notifications/notifications_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestSubscribeWithData(t *testing.T) { diff --git a/peermanager/peermanager_test.go b/peermanager/peermanager_test.go index 2c4cb3d0..1559b810 100644 --- a/peermanager/peermanager_test.go +++ b/peermanager/peermanager_test.go @@ -6,7 +6,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/testutil" ) type fakePeerProcess struct { diff --git a/peermanager/peermessagemanager.go b/peermanager/peermessagemanager.go index f21acc29..e7240954 100644 --- a/peermanager/peermessagemanager.go +++ b/peermanager/peermessagemanager.go @@ -5,7 +5,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/messagequeue" ) // PeerQueue is a process that sends messages to a peer diff --git a/peermanager/peermessagemanager_test.go b/peermanager/peermessagemanager_test.go index ac814b14..5bcf269c 100644 --- a/peermanager/peermessagemanager_test.go +++ b/peermanager/peermessagemanager_test.go @@ -11,10 +11,10 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/testutil" ) type messageSent struct { diff --git a/peerstate/peerstate.go b/peerstate/peerstate.go index 36622f1e..53f568b4 100644 --- a/peerstate/peerstate.go +++ b/peerstate/peerstate.go @@ -3,7 +3,7 @@ package peerstate import ( "fmt" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // TaskQueueState describes the the set of requests for a given peer in a task queue diff --git a/peerstate/peerstate_test.go b/peerstate/peerstate_test.go index 46e8efd7..3cf977a1 100644 --- a/peerstate/peerstate_test.go +++ b/peerstate/peerstate_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/peerstate" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/peerstate" ) func TestDiagnostics(t *testing.T) { diff --git a/requestmanager/client.go b/requestmanager/client.go index 2359fdb8..6df2adae 100644 --- a/requestmanager/client.go +++ b/requestmanager/client.go @@ -18,19 +18,19 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - "github.com/ipfs/go-graphsync/listeners" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/panics" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/requestmanager/executor" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/requestmanager/reconciledloader" - "github.com/ipfs/go-graphsync/taskqueue" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + "github.com/filecoin-project/boost-graphsync/listeners" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/panics" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/requestmanager/reconciledloader" + "github.com/filecoin-project/boost-graphsync/taskqueue" ) // The code in this file implements the public interface of the request manager. diff --git a/requestmanager/executor/executor.go b/requestmanager/executor/executor.go index 734c1293..98d742a0 100644 --- a/requestmanager/executor/executor.go +++ b/requestmanager/executor/executor.go @@ -15,12 +15,12 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/requestmanager/types" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/requestmanager/types" ) var log = logging.Logger("gs_request_executor") diff --git a/requestmanager/executor/executor_test.go b/requestmanager/executor/executor_test.go index d27986d1..6e57ae6f 100644 --- a/requestmanager/executor/executor_test.go +++ b/requestmanager/executor/executor_test.go @@ -21,14 +21,14 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/requestmanager/executor" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/requestmanager/types" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/requestmanager/types" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestRequestExecutionBlockChain(t *testing.T) { diff --git a/requestmanager/hooks/blockhooks.go b/requestmanager/hooks/blockhooks.go index ff8cc46e..760e5d60 100644 --- a/requestmanager/hooks/blockhooks.go +++ b/requestmanager/hooks/blockhooks.go @@ -4,7 +4,7 @@ import ( "github.com/hannahhoward/go-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // IncomingBlockHooks is a set of incoming block hooks that can be processed diff --git a/requestmanager/hooks/hooks_test.go b/requestmanager/hooks/hooks_test.go index 39d3530a..37affdf7 100644 --- a/requestmanager/hooks/hooks_test.go +++ b/requestmanager/hooks/hooks_test.go @@ -10,10 +10,10 @@ import ( peer "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestRequestHookProcessing(t *testing.T) { diff --git a/requestmanager/hooks/requesthooks.go b/requestmanager/hooks/requesthooks.go index 56efa26c..9d1b49c7 100644 --- a/requestmanager/hooks/requesthooks.go +++ b/requestmanager/hooks/requesthooks.go @@ -5,7 +5,7 @@ import ( "github.com/ipld/go-ipld-prime/traversal" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // OutgoingRequestHooks is a set of incoming request hooks that can be processed diff --git a/requestmanager/hooks/responsehooks.go b/requestmanager/hooks/responsehooks.go index cc7cf649..71d70527 100644 --- a/requestmanager/hooks/responsehooks.go +++ b/requestmanager/hooks/responsehooks.go @@ -4,7 +4,7 @@ import ( "github.com/hannahhoward/go-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // ErrPaused indicates a request should stop processing, but only cause it's paused diff --git a/requestmanager/messages.go b/requestmanager/messages.go index e61ac8e1..a9eca687 100644 --- a/requestmanager/messages.go +++ b/requestmanager/messages.go @@ -7,10 +7,10 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/requestmanager/executor" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" ) type updateRequestMessage struct { diff --git a/requestmanager/reconciledloader/injest.go b/requestmanager/reconciledloader/injest.go index d2533378..4f68778e 100644 --- a/requestmanager/reconciledloader/injest.go +++ b/requestmanager/reconciledloader/injest.go @@ -4,7 +4,7 @@ import ( "github.com/ipfs/go-cid" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // IngestResponse ingests new remote items into the reconciled loader diff --git a/requestmanager/reconciledloader/load.go b/requestmanager/reconciledloader/load.go index d96581af..40ad8cf8 100644 --- a/requestmanager/reconciledloader/load.go +++ b/requestmanager/reconciledloader/load.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/requestmanager/types" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/requestmanager/types" ) // BlockReadOpener synchronously loads the next block result diff --git a/requestmanager/reconciledloader/pathtracker.go b/requestmanager/reconciledloader/pathtracker.go index 0d2cd3d7..e2249338 100644 --- a/requestmanager/reconciledloader/pathtracker.go +++ b/requestmanager/reconciledloader/pathtracker.go @@ -3,7 +3,7 @@ package reconciledloader import ( "github.com/ipld/go-ipld-prime/datamodel" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // pathTracker is just a simple utility to track whether we're on a missing diff --git a/requestmanager/reconciledloader/reconciledloader.go b/requestmanager/reconciledloader/reconciledloader.go index b41f0811..efd20837 100644 --- a/requestmanager/reconciledloader/reconciledloader.go +++ b/requestmanager/reconciledloader/reconciledloader.go @@ -31,9 +31,9 @@ import ( "github.com/ipld/go-ipld-prime/datamodel" "github.com/ipld/go-ipld-prime/linking" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/requestmanager/reconciledloader/traversalrecord" - "github.com/ipfs/go-graphsync/requestmanager/types" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/requestmanager/reconciledloader/traversalrecord" + "github.com/filecoin-project/boost-graphsync/requestmanager/types" ) var log = logging.Logger("gs-reconciledlaoder") diff --git a/requestmanager/reconciledloader/reconciledloader_test.go b/requestmanager/reconciledloader/reconciledloader_test.go index a63d0db6..6c689c49 100644 --- a/requestmanager/reconciledloader/reconciledloader_test.go +++ b/requestmanager/reconciledloader/reconciledloader_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/requestmanager/reconciledloader" - "github.com/ipfs/go-graphsync/requestmanager/types" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/requestmanager/reconciledloader" + "github.com/filecoin-project/boost-graphsync/requestmanager/types" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestReconciledLoader(t *testing.T) { diff --git a/requestmanager/reconciledloader/remotequeue.go b/requestmanager/reconciledloader/remotequeue.go index 18c59854..d800b510 100644 --- a/requestmanager/reconciledloader/remotequeue.go +++ b/requestmanager/reconciledloader/remotequeue.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/go-cid" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) var linkedRemoteItemPool = sync.Pool{ diff --git a/requestmanager/reconciledloader/traversalrecord/traversalrecord.go b/requestmanager/reconciledloader/traversalrecord/traversalrecord.go index 3035c501..3c3a48a3 100644 --- a/requestmanager/reconciledloader/traversalrecord/traversalrecord.go +++ b/requestmanager/reconciledloader/traversalrecord/traversalrecord.go @@ -7,7 +7,7 @@ import ( "github.com/ipld/go-ipld-prime/datamodel" cidlink "github.com/ipld/go-ipld-prime/linking/cid" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // TraversalRecord records the links traversed by a selector and their paths in a space efficient manner diff --git a/requestmanager/reconciledloader/traversalrecord/traversalrecord_test.go b/requestmanager/reconciledloader/traversalrecord/traversalrecord_test.go index 4b283fcd..2d7ed512 100644 --- a/requestmanager/reconciledloader/traversalrecord/traversalrecord_test.go +++ b/requestmanager/reconciledloader/traversalrecord/traversalrecord_test.go @@ -14,10 +14,10 @@ import ( selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - "github.com/ipfs/go-graphsync/requestmanager/reconciledloader/traversalrecord" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + "github.com/filecoin-project/boost-graphsync/requestmanager/reconciledloader/traversalrecord" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestTraversalRecord(t *testing.T) { diff --git a/requestmanager/requestmanager_test.go b/requestmanager/requestmanager_test.go index 96746a1f..1706035d 100644 --- a/requestmanager/requestmanager_test.go +++ b/requestmanager/requestmanager_test.go @@ -16,16 +16,16 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/dedupkey" - "github.com/ipfs/go-graphsync/listeners" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/persistenceoptions" - "github.com/ipfs/go-graphsync/requestmanager/executor" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/taskqueue" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/dedupkey" + "github.com/filecoin-project/boost-graphsync/listeners" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/persistenceoptions" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/taskqueue" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestNormalSimultaneousFetch(t *testing.T) { diff --git a/requestmanager/responsecollector.go b/requestmanager/responsecollector.go index f348c61c..981d2c4e 100644 --- a/requestmanager/responsecollector.go +++ b/requestmanager/responsecollector.go @@ -3,7 +3,7 @@ package requestmanager import ( "context" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) type responseCollector struct { diff --git a/requestmanager/responsecollector_test.go b/requestmanager/responsecollector_test.go index 5108f10c..a9f36781 100644 --- a/requestmanager/responsecollector_test.go +++ b/requestmanager/responsecollector_test.go @@ -10,8 +10,8 @@ import ( cidlink "github.com/ipld/go-ipld-prime/linking/cid" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestBufferingResponseProgress(t *testing.T) { diff --git a/requestmanager/server.go b/requestmanager/server.go index 7a22fa81..b67d0dd3 100644 --- a/requestmanager/server.go +++ b/requestmanager/server.go @@ -25,15 +25,15 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/dedupkey" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/requestmanager/executor" - "github.com/ipfs/go-graphsync/requestmanager/hooks" - "github.com/ipfs/go-graphsync/requestmanager/reconciledloader" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/dedupkey" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/requestmanager/executor" + "github.com/filecoin-project/boost-graphsync/requestmanager/hooks" + "github.com/filecoin-project/boost-graphsync/requestmanager/reconciledloader" ) // The code in this file implements the internal thread for the request manager. diff --git a/responsemanager/client.go b/responsemanager/client.go index 79eb841b..ce63015e 100644 --- a/responsemanager/client.go +++ b/responsemanager/client.go @@ -11,17 +11,17 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/panics" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" - "github.com/ipfs/go-graphsync/taskqueue" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/panics" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" + "github.com/filecoin-project/boost-graphsync/taskqueue" ) // The code in this file implements the public interface of the response manager. diff --git a/responsemanager/hooks/blockhooks.go b/responsemanager/hooks/blockhooks.go index 6000b470..4a0c7aed 100644 --- a/responsemanager/hooks/blockhooks.go +++ b/responsemanager/hooks/blockhooks.go @@ -4,7 +4,7 @@ import ( "github.com/hannahhoward/go-pubsub" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // ErrPaused indicates a request should stop processing, but only cause it's paused diff --git a/responsemanager/hooks/hooks_test.go b/responsemanager/hooks/hooks_test.go index 385fef7b..50bac2ed 100644 --- a/responsemanager/hooks/hooks_test.go +++ b/responsemanager/hooks/hooks_test.go @@ -12,10 +12,10 @@ import ( peer "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/testutil" ) type fakePersistenceOptions struct { diff --git a/responsemanager/hooks/requesthook.go b/responsemanager/hooks/requesthook.go index b6cd3bc4..7c9a22f0 100644 --- a/responsemanager/hooks/requesthook.go +++ b/responsemanager/hooks/requesthook.go @@ -9,7 +9,7 @@ import ( "github.com/ipld/go-ipld-prime/traversal" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // PersistenceOptions is an interface for getting loaders by name diff --git a/responsemanager/hooks/requestupdatehooks.go b/responsemanager/hooks/requestupdatehooks.go index b89e31cf..995c6f57 100644 --- a/responsemanager/hooks/requestupdatehooks.go +++ b/responsemanager/hooks/requestupdatehooks.go @@ -4,7 +4,7 @@ import ( "github.com/hannahhoward/go-pubsub" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) // RequestUpdatedHooks manages and runs hooks for request updates diff --git a/responsemanager/messages.go b/responsemanager/messages.go index b61121c6..78366111 100644 --- a/responsemanager/messages.go +++ b/responsemanager/messages.go @@ -4,10 +4,10 @@ import ( "github.com/ipfs/go-peertaskqueue/peertask" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" ) type processRequestsMessage struct { diff --git a/responsemanager/queryexecutor/queryexecutor.go b/responsemanager/queryexecutor/queryexecutor.go index b344d67e..025c7ed5 100644 --- a/responsemanager/queryexecutor/queryexecutor.go +++ b/responsemanager/queryexecutor/queryexecutor.go @@ -15,11 +15,11 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" ) var log = logging.Logger("gs-queryexecutor") diff --git a/responsemanager/queryexecutor/queryexecutor_test.go b/responsemanager/queryexecutor/queryexecutor_test.go index 28645f9e..0bac808b 100644 --- a/responsemanager/queryexecutor/queryexecutor_test.go +++ b/responsemanager/queryexecutor/queryexecutor_test.go @@ -21,12 +21,12 @@ import ( "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestEmptyTask(t *testing.T) { diff --git a/responsemanager/querypreparer.go b/responsemanager/querypreparer.go index 035f03ee..0960bfec 100644 --- a/responsemanager/querypreparer.go +++ b/responsemanager/querypreparer.go @@ -12,15 +12,15 @@ import ( "github.com/ipld/go-ipld-prime/traversal" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/cidset" - "github.com/ipfs/go-graphsync/dedupkey" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/panics" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/cidset" + "github.com/filecoin-project/boost-graphsync/dedupkey" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/panics" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" ) type errorString string diff --git a/responsemanager/responseassembler/peerlinktracker.go b/responsemanager/responseassembler/peerlinktracker.go index b41e5784..3ea16f3f 100644 --- a/responsemanager/responseassembler/peerlinktracker.go +++ b/responsemanager/responseassembler/peerlinktracker.go @@ -5,8 +5,8 @@ import ( "github.com/ipld/go-ipld-prime" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/linktracker" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/linktracker" ) type peerLinkTracker struct { diff --git a/responsemanager/responseassembler/responseBuilder.go b/responsemanager/responseassembler/responseBuilder.go index 4973c16a..033d70a3 100644 --- a/responsemanager/responseassembler/responseBuilder.go +++ b/responsemanager/responseassembler/responseBuilder.go @@ -9,8 +9,8 @@ import ( "github.com/ipld/go-ipld-prime/codec/dagcbor" cidlink "github.com/ipld/go-ipld-prime/linking/cid" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/messagequeue" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/messagequeue" ) var log = logging.Logger("graphsync") diff --git a/responsemanager/responseassembler/responseassembler.go b/responsemanager/responseassembler/responseassembler.go index 48607ab1..d5e01b4f 100644 --- a/responsemanager/responseassembler/responseassembler.go +++ b/responsemanager/responseassembler/responseassembler.go @@ -16,10 +16,10 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/peermanager" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/peermanager" ) // Transaction is a series of operations that should be send together in a single response diff --git a/responsemanager/responseassembler/responseassembler_test.go b/responsemanager/responseassembler/responseassembler_test.go index 314cd5a7..34e07305 100644 --- a/responsemanager/responseassembler/responseassembler_test.go +++ b/responsemanager/responseassembler/responseassembler_test.go @@ -14,11 +14,11 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestResponseAssemblerSendsResponses(t *testing.T) { diff --git a/responsemanager/responsemanager_test.go b/responsemanager/responsemanager_test.go index f8f6ab11..f4bc8eae 100644 --- a/responsemanager/responsemanager_test.go +++ b/responsemanager/responsemanager_test.go @@ -21,21 +21,21 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/cidset" - "github.com/ipfs/go-graphsync/dedupkey" - "github.com/ipfs/go-graphsync/donotsendfirstblocks" - "github.com/ipfs/go-graphsync/listeners" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/notifications" - "github.com/ipfs/go-graphsync/persistenceoptions" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" - "github.com/ipfs/go-graphsync/selectorvalidator" - "github.com/ipfs/go-graphsync/taskqueue" - "github.com/ipfs/go-graphsync/testutil" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/cidset" + "github.com/filecoin-project/boost-graphsync/dedupkey" + "github.com/filecoin-project/boost-graphsync/donotsendfirstblocks" + "github.com/filecoin-project/boost-graphsync/listeners" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/persistenceoptions" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" + "github.com/filecoin-project/boost-graphsync/selectorvalidator" + "github.com/filecoin-project/boost-graphsync/taskqueue" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestIncomingQuery(t *testing.T) { diff --git a/responsemanager/server.go b/responsemanager/server.go index ff3aca22..57e04727 100644 --- a/responsemanager/server.go +++ b/responsemanager/server.go @@ -14,13 +14,13 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/ipldutil" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/peerstate" - "github.com/ipfs/go-graphsync/responsemanager/hooks" - "github.com/ipfs/go-graphsync/responsemanager/queryexecutor" - "github.com/ipfs/go-graphsync/responsemanager/responseassembler" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/ipldutil" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/peerstate" + "github.com/filecoin-project/boost-graphsync/responsemanager/hooks" + "github.com/filecoin-project/boost-graphsync/responsemanager/queryexecutor" + "github.com/filecoin-project/boost-graphsync/responsemanager/responseassembler" ) // The code in this file implements the internal thread for the response manager. diff --git a/responsemanager/subscriber.go b/responsemanager/subscriber.go index 0fd0f728..e5f73db1 100644 --- a/responsemanager/subscriber.go +++ b/responsemanager/subscriber.go @@ -3,11 +3,11 @@ package responsemanager import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" - gsmsg "github.com/ipfs/go-graphsync/message" - "github.com/ipfs/go-graphsync/messagequeue" - "github.com/ipfs/go-graphsync/network" - "github.com/ipfs/go-graphsync/notifications" + graphsync "github.com/filecoin-project/boost-graphsync" + gsmsg "github.com/filecoin-project/boost-graphsync/message" + "github.com/filecoin-project/boost-graphsync/messagequeue" + "github.com/filecoin-project/boost-graphsync/network" + "github.com/filecoin-project/boost-graphsync/notifications" ) // RequestCloser can cancel request on a network error diff --git a/scripts/fiximports b/scripts/fiximports index 0a1edbdb..6daa6982 100755 --- a/scripts/fiximports +++ b/scripts/fiximports @@ -7,7 +7,7 @@ find . -type f -name \*.go -not -name \*_cbor_gen.go | xargs -I '{}' sed -i.bak /)/!b1 }' '{}' git clean -fd -find . -type f -name \*.go -not -name \*_cbor_gen.go | xargs -I '{}' goimports -w -local "github.com/ipfs/go-graphsync" '{}' +find . -type f -name \*.go -not -name \*_cbor_gen.go | xargs -I '{}' goimports -w -local "github.com/filecoin-project/boost-graphsync" '{}' diff --git a/selectorvalidator/selectorvalidator.go b/selectorvalidator/selectorvalidator.go index aab8f727..31cc7798 100644 --- a/selectorvalidator/selectorvalidator.go +++ b/selectorvalidator/selectorvalidator.go @@ -10,7 +10,7 @@ import ( "github.com/ipld/go-ipld-prime/traversal/selector/builder" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) var ( diff --git a/storeutil/storeutil_test.go b/storeutil/storeutil_test.go index fb1f6193..c9810017 100644 --- a/storeutil/storeutil_test.go +++ b/storeutil/storeutil_test.go @@ -12,7 +12,7 @@ import ( cidlink "github.com/ipld/go-ipld-prime/linking/cid" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/testutil" + "github.com/filecoin-project/boost-graphsync/testutil" ) func TestLinkSystem(t *testing.T) { diff --git a/taskqueue/taskqueue.go b/taskqueue/taskqueue.go index 2791cb36..dc459441 100644 --- a/taskqueue/taskqueue.go +++ b/taskqueue/taskqueue.go @@ -10,7 +10,7 @@ import ( "github.com/ipfs/go-peertaskqueue/peertracker" peer "github.com/libp2p/go-libp2p/core/peer" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) const thawSpeed = time.Millisecond * 100 diff --git a/testplans/graphsync/main.go b/testplans/graphsync/main.go index 617da307..4bdb3e08 100644 --- a/testplans/graphsync/main.go +++ b/testplans/graphsync/main.go @@ -49,11 +49,10 @@ import ( "github.com/testground/sdk-go/sync" "golang.org/x/sync/errgroup" - gs "github.com/ipfs/go-graphsync" - gsi "github.com/ipfs/go-graphsync/impl" - gsnet "github.com/ipfs/go-graphsync/network" +gs graphsync "github.com/filecoin-project/boost-graphsync" +gsi "github.com/filecoin-project/boost-graphsync/impl" +gsnet "github.com/filecoin-project/boost-graphsync/network" ) - type AddrInfo struct { peerAddr *peer.AddrInfo ip net.IP diff --git a/testutil/testchain.go b/testutil/testchain.go index f2541af9..1f063f61 100644 --- a/testutil/testchain.go +++ b/testutil/testchain.go @@ -17,8 +17,8 @@ import ( mh "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" - "github.com/ipfs/go-graphsync/testutil/chaintypes" + graphsync "github.com/filecoin-project/boost-graphsync" + "github.com/filecoin-project/boost-graphsync/testutil/chaintypes" ) const blockChainTraversedNodesPerBlock = 2 diff --git a/testutil/testnotifications.go b/testutil/testnotifications.go index 4fdab9e2..5ee7ddb1 100644 --- a/testutil/testnotifications.go +++ b/testutil/testnotifications.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync/notifications" + "github.com/filecoin-project/boost-graphsync/notifications" ) type TestSubscriber struct { diff --git a/testutil/testutil.go b/testutil/testutil.go index fc35ed49..e4de8a2c 100644 --- a/testutil/testutil.go +++ b/testutil/testutil.go @@ -17,7 +17,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ipfs/go-graphsync" + graphsync "github.com/filecoin-project/boost-graphsync" ) var blockGenerator = blocksutil.NewBlockGenerator()