feat: mega migration

bitswap/benchmarks_test.go

@@ -18,11 +18,11 @@ import (
 
 	cid "github.com/ipfs/go-cid"
 	delay "github.com/ipfs/go-ipfs-delay"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	"github.com/ipfs/go-libipfs/bitswap"
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 	testinstance "github.com/ipfs/go-libipfs/bitswap/testinstance"
 	tn "github.com/ipfs/go-libipfs/bitswap/testnet"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 )
 
 type fetchFunc func(b *testing.B, bs *bitswap.Bitswap, ks []cid.Cid)

bitswap/bitswap.go

@@ -13,9 +13,9 @@ import (
 	"github.com/ipfs/go-metrics-interface"
 
 	"github.com/ipfs/go-cid"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	exchange "github.com/ipfs/go-ipfs-exchange-interface"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
+	exchange "github.com/ipfs/go-libipfs/exchange"
 	logging "github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p/core/peer"
 

bitswap/bitswap_test.go

@@ -13,7 +13,6 @@ import (
 	detectrace "github.com/ipfs/go-detect-race"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
 	delay "github.com/ipfs/go-ipfs-delay"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	ipld "github.com/ipfs/go-ipld-format"
 	"github.com/ipfs/go-libipfs/bitswap"
 	bsmsg "github.com/ipfs/go-libipfs/bitswap/message"
@@ -22,6 +21,7 @@ import (
 	tn "github.com/ipfs/go-libipfs/bitswap/testnet"
 	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-libipfs/internal/test"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 	tu "github.com/libp2p/go-libp2p-testing/etc"
 	p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil"
 	peer "github.com/libp2p/go-libp2p/core/peer"

bitswap/client/bitswap_with_sessions_test.go

@@ -9,13 +9,13 @@ import (
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
 	delay "github.com/ipfs/go-ipfs-delay"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	"github.com/ipfs/go-libipfs/bitswap"
 	"github.com/ipfs/go-libipfs/bitswap/client/internal/session"
 	testinstance "github.com/ipfs/go-libipfs/bitswap/testinstance"
 	tn "github.com/ipfs/go-libipfs/bitswap/testnet"
 	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-libipfs/internal/test"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 	tu "github.com/libp2p/go-libp2p-testing/etc"
 )
 

bitswap/client/client.go

@@ -14,8 +14,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/ipfs/go-cid"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	exchange "github.com/ipfs/go-ipfs-exchange-interface"
 	bsbpm "github.com/ipfs/go-libipfs/bitswap/client/internal/blockpresencemanager"
 	bsgetter "github.com/ipfs/go-libipfs/bitswap/client/internal/getter"
 	bsmq "github.com/ipfs/go-libipfs/bitswap/client/internal/messagequeue"
@@ -33,6 +31,8 @@ import (
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 	"github.com/ipfs/go-libipfs/bitswap/tracer"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
+	exchange "github.com/ipfs/go-libipfs/exchange"
 	logging "github.com/ipfs/go-log"
 	"github.com/ipfs/go-metrics-interface"
 	process "github.com/jbenet/goprocess"

bitswap/client/internal/sessionmanager/sessionmanager.go

@@ -11,12 +11,12 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 
-	exchange "github.com/ipfs/go-ipfs-exchange-interface"
 	"github.com/ipfs/go-libipfs/bitswap/client/internal"
 	bsbpm "github.com/ipfs/go-libipfs/bitswap/client/internal/blockpresencemanager"
 	notifications "github.com/ipfs/go-libipfs/bitswap/client/internal/notifications"
 	bssession "github.com/ipfs/go-libipfs/bitswap/client/internal/session"
 	bssim "github.com/ipfs/go-libipfs/bitswap/client/internal/sessioninterestmanager"
+	exchange "github.com/ipfs/go-libipfs/exchange"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 

bitswap/internal/defaults/defaults.go

@@ -29,7 +29,7 @@ const (
 	// Maximum size of the wantlist we are willing to keep in memory.
 	MaxQueuedWantlistEntiresPerPeer = 1024
 
-	// Copied from github.com/ipfs/go-verifcid#maximumHashLength
+	// Copied from github.com/ipfs/go-libipfs/verifcid#maximumHashLength
 	// FIXME: expose this in go-verifcid.
 	MaximumHashLength = 128
 	MaximumAllowedCid = binary.MaxVarintLen64*4 + MaximumHashLength

bitswap/message/message.go

@@ -13,7 +13,7 @@ import (
 	pool "github.com/libp2p/go-buffer-pool"
 	msgio "github.com/libp2p/go-msgio"
 
-	u "github.com/ipfs/go-ipfs-util"
+	u "github.com/ipfs/go-libipfs/util"
 	"github.com/libp2p/go-libp2p/core/network"
 )
 

bitswap/message/message_test.go

@@ -9,8 +9,8 @@ import (
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
 
 	cid "github.com/ipfs/go-cid"
-	u "github.com/ipfs/go-ipfs-util"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	u "github.com/ipfs/go-libipfs/util"
 )
 
 func mkFakeCid(s string) cid.Cid {

bitswap/message/pb/cid_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-cid"
-	u "github.com/ipfs/go-ipfs-util"
+	u "github.com/ipfs/go-libipfs/util"
 
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
 )

bitswap/network/ipfs_impl_test.go

@@ -9,13 +9,13 @@ import (
 
 	ds "github.com/ipfs/go-datastore"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	bsmsg "github.com/ipfs/go-libipfs/bitswap/message"
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 	"github.com/ipfs/go-libipfs/bitswap/network/internal"
 	tn "github.com/ipfs/go-libipfs/bitswap/testnet"
 	"github.com/ipfs/go-libipfs/internal/test"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/network"

bitswap/server/internal/decision/blockstoremanager.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 
 	cid "github.com/ipfs/go-cid"
-	bstore "github.com/ipfs/go-ipfs-blockstore"
 	ipld "github.com/ipfs/go-ipld-format"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	bstore "github.com/ipfs/go-libipfs/blockstore"
 	"github.com/ipfs/go-metrics-interface"
 )
 

bitswap/server/internal/decision/blockstoremanager_test.go

@@ -11,10 +11,10 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/delayed"
 	ds_sync "github.com/ipfs/go-datastore/sync"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	delay "github.com/ipfs/go-ipfs-delay"
 	"github.com/ipfs/go-libipfs/bitswap/internal/testutil"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
 	"github.com/ipfs/go-libipfs/internal/test"
 	"github.com/ipfs/go-metrics-interface"
 )

bitswap/server/internal/decision/engine.go

@@ -11,13 +11,13 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/ipfs/go-cid"
-	bstore "github.com/ipfs/go-ipfs-blockstore"
 	wl "github.com/ipfs/go-libipfs/bitswap/client/wantlist"
 	"github.com/ipfs/go-libipfs/bitswap/internal/defaults"
 	bsmsg "github.com/ipfs/go-libipfs/bitswap/message"
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
 	bmetrics "github.com/ipfs/go-libipfs/bitswap/metrics"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	bstore "github.com/ipfs/go-libipfs/blockstore"
 	logging "github.com/ipfs/go-log"
 	"github.com/ipfs/go-metrics-interface"
 	"github.com/ipfs/go-peertaskqueue"

bitswap/server/internal/decision/engine_test.go

@@ -16,11 +16,11 @@ import (
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	"github.com/ipfs/go-libipfs/bitswap/internal/testutil"
 	message "github.com/ipfs/go-libipfs/bitswap/message"
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
 	"github.com/ipfs/go-libipfs/internal/test"
 	process "github.com/jbenet/goprocess"
 	peer "github.com/libp2p/go-libp2p/core/peer"

bitswap/server/server.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	"github.com/ipfs/go-libipfs/bitswap/internal/defaults"
 	"github.com/ipfs/go-libipfs/bitswap/message"
 	pb "github.com/ipfs/go-libipfs/bitswap/message/pb"
@@ -18,6 +17,7 @@ import (
 	"github.com/ipfs/go-libipfs/bitswap/server/internal/decision"
 	"github.com/ipfs/go-libipfs/bitswap/tracer"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
 	logging "github.com/ipfs/go-log"
 	"github.com/ipfs/go-metrics-interface"
 	process "github.com/jbenet/goprocess"

bitswap/testinstance/testinstance.go

@@ -7,11 +7,11 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	delayed "github.com/ipfs/go-datastore/delayed"
 	ds_sync "github.com/ipfs/go-datastore/sync"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	delay "github.com/ipfs/go-ipfs-delay"
 	"github.com/ipfs/go-libipfs/bitswap"
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 	tn "github.com/ipfs/go-libipfs/bitswap/testnet"
+	blockstore "github.com/ipfs/go-libipfs/blockstore"
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil"
 	peer "github.com/libp2p/go-libp2p/core/peer"

bitswap/testnet/network_test.go

@@ -9,8 +9,8 @@ import (
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 
 	delay "github.com/ipfs/go-ipfs-delay"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	blocks "github.com/ipfs/go-libipfs/blocks"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/peer"

bitswap/testnet/peernet.go

@@ -6,7 +6,7 @@ import (
 	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
 
 	ds "github.com/ipfs/go-datastore"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/peer"

bitswap/testnet/virtual.go

@@ -13,7 +13,7 @@ import (
 
 	cid "github.com/ipfs/go-cid"
 	delay "github.com/ipfs/go-ipfs-delay"
-	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
+	mockrouting "github.com/ipfs/go-libipfs/routing/mock"
 
 	tnet "github.com/libp2p/go-libp2p-testing/net"
 	"github.com/libp2p/go-libp2p/core/connmgr"

blocks/blocks.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	cid "github.com/ipfs/go-cid"
-	u "github.com/ipfs/go-ipfs-util"
+	u "github.com/ipfs/go-libipfs/util"
 	mh "github.com/multiformats/go-multihash"
 )
 

blocks/blocks_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	cid "github.com/ipfs/go-cid"
-	u "github.com/ipfs/go-ipfs-util"
+	u "github.com/ipfs/go-libipfs/util"
 	mh "github.com/multiformats/go-multihash"
 )