diff --git a/api/api_full.go b/api/api_full.go index c00daa000..987f3ce7d 100644 --- a/api/api_full.go +++ b/api/api_full.go @@ -8,7 +8,7 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" diff --git a/api/api_net.go b/api/api_net.go index 32c280828..404c707b4 100644 --- a/api/api_net.go +++ b/api/api_net.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/libp2p/go-libp2p-core/metrics" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/metrics" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" ) // MODIFYING THE API INTERFACE diff --git a/api/api_storage.go b/api/api_storage.go index ca3905c95..4c6d6e941 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go index b2a96f8b7..c0db309ce 100644 --- a/api/docgen/docgen.go +++ b/api/docgen/docgen.go @@ -17,11 +17,11 @@ import ( "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" textselector "github.com/ipld/go-ipld-selector-text-lite" - "github.com/libp2p/go-libp2p-core/metrics" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/metrics" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-address" diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go index 7b7459d5f..23e1ed424 100644 --- a/api/mocks/mock_full.go +++ b/api/mocks/mock_full.go @@ -14,10 +14,10 @@ import ( uuid "github.com/google/uuid" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" - metrics "github.com/libp2p/go-libp2p-core/metrics" - network0 "github.com/libp2p/go-libp2p-core/network" - peer "github.com/libp2p/go-libp2p-core/peer" - protocol "github.com/libp2p/go-libp2p-core/protocol" + metrics "github.com/libp2p/go-libp2p/core/metrics" + network0 "github.com/libp2p/go-libp2p/core/network" + peer "github.com/libp2p/go-libp2p/core/peer" + protocol "github.com/libp2p/go-libp2p/core/protocol" address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" diff --git a/api/proxy_gen.go b/api/proxy_gen.go index a45b96b28..ece923eb6 100644 --- a/api/proxy_gen.go +++ b/api/proxy_gen.go @@ -10,10 +10,10 @@ import ( "github.com/google/uuid" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/metrics" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/metrics" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" diff --git a/api/types.go b/api/types.go index 07c222416..683589ce1 100644 --- a/api/types.go +++ b/api/types.go @@ -8,9 +8,9 @@ import ( "github.com/google/uuid" "github.com/ipfs/go-cid" "github.com/ipfs/go-graphsync" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-address" diff --git a/api/v0api/full.go b/api/v0api/full.go index b9e92224c..cca358ada 100644 --- a/api/v0api/full.go +++ b/api/v0api/full.go @@ -6,7 +6,7 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" textselector "github.com/ipld/go-ipld-selector-text-lite" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" diff --git a/api/v0api/proxy_gen.go b/api/v0api/proxy_gen.go index 9f5645f61..b568fe156 100644 --- a/api/v0api/proxy_gen.go +++ b/api/v0api/proxy_gen.go @@ -7,7 +7,7 @@ import ( blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" diff --git a/api/v0api/v0mocks/mock_full.go b/api/v0api/v0mocks/mock_full.go index ce5e1f59c..7dc9c0d63 100644 --- a/api/v0api/v0mocks/mock_full.go +++ b/api/v0api/v0mocks/mock_full.go @@ -13,10 +13,10 @@ import ( uuid "github.com/google/uuid" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" - metrics "github.com/libp2p/go-libp2p-core/metrics" - network0 "github.com/libp2p/go-libp2p-core/network" - peer "github.com/libp2p/go-libp2p-core/peer" - protocol "github.com/libp2p/go-libp2p-core/protocol" + metrics "github.com/libp2p/go-libp2p/core/metrics" + network0 "github.com/libp2p/go-libp2p/core/network" + peer "github.com/libp2p/go-libp2p/core/peer" + protocol "github.com/libp2p/go-libp2p/core/protocol" address "github.com/filecoin-project/go-address" bitfield "github.com/filecoin-project/go-bitfield" diff --git a/api/v0api/v1_wrapper.go b/api/v0api/v1_wrapper.go index 03757045e..d2b58ccb8 100644 --- a/api/v0api/v1_wrapper.go +++ b/api/v0api/v1_wrapper.go @@ -4,7 +4,7 @@ import ( "context" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" diff --git a/build/bootstrap.go b/build/bootstrap.go index 244c378b3..d86115398 100644 --- a/build/bootstrap.go +++ b/build/bootstrap.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/lotus/lib/addrutil" ) diff --git a/build/params_shared_funcs.go b/build/params_shared_funcs.go index bbeecacfc..d117264ab 100644 --- a/build/params_shared_funcs.go +++ b/build/params_shared_funcs.go @@ -2,7 +2,7 @@ package build import ( "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/protocol" "github.com/filecoin-project/go-address" diff --git a/chain/block_receipt_tracker.go b/chain/block_receipt_tracker.go index 2cdb5f184..58de71e19 100644 --- a/chain/block_receipt_tracker.go +++ b/chain/block_receipt_tracker.go @@ -6,7 +6,7 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/exchange/client.go b/chain/exchange/client.go index 88c36aba3..7c3ea4f7e 100644 --- a/chain/exchange/client.go +++ b/chain/exchange/client.go @@ -7,9 +7,9 @@ import ( "math/rand" "time" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" "go.opencensus.io/trace" "go.uber.org/fx" "golang.org/x/xerrors" @@ -429,7 +429,7 @@ func (c *client) sendRequestToPeer(ctx context.Context, peer peer.ID, req *Reque return nil, err } _ = stream.SetWriteDeadline(time.Time{}) // clear deadline // FIXME: Needs - // its own API (https://github.com/libp2p/go-libp2p-core/issues/162). + // its own API (https://github.com/libp2p/go-libp2p/core/issues/162). // Read response. var res Response diff --git a/chain/exchange/interfaces.go b/chain/exchange/interfaces.go index acc0854da..c95127929 100644 --- a/chain/exchange/interfaces.go +++ b/chain/exchange/interfaces.go @@ -3,8 +3,8 @@ package exchange import ( "context" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" diff --git a/chain/exchange/peer_tracker.go b/chain/exchange/peer_tracker.go index 489408624..00b919d23 100644 --- a/chain/exchange/peer_tracker.go +++ b/chain/exchange/peer_tracker.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/fx" "github.com/filecoin-project/lotus/build" diff --git a/chain/exchange/server.go b/chain/exchange/server.go index c1acb3f61..03dcf0ed7 100644 --- a/chain/exchange/server.go +++ b/chain/exchange/server.go @@ -7,7 +7,7 @@ import ( "time" "github.com/ipfs/go-cid" - inet "github.com/libp2p/go-libp2p-core/network" + inet "github.com/libp2p/go-libp2p/core/network" "go.opencensus.io/trace" "golang.org/x/xerrors" diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go index 41a10042f..bd073e789 100644 --- a/chain/sub/incoming.go +++ b/chain/sub/incoming.go @@ -12,9 +12,9 @@ import ( bserv "github.com/ipfs/go-blockservice" "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/connmgr" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/connmgr" + "github.com/libp2p/go-libp2p/core/peer" "go.opencensus.io/stats" "go.opencensus.io/tag" "golang.org/x/xerrors" diff --git a/chain/sub/incoming_test.go b/chain/sub/incoming_test.go index 7bd98d20d..fbe73d460 100644 --- a/chain/sub/incoming_test.go +++ b/chain/sub/incoming_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" pb "github.com/libp2p/go-libp2p-pubsub/pb" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-legs/dtsync" diff --git a/chain/sync.go b/chain/sync.go index cafbd4815..41775705e 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -16,8 +16,8 @@ import ( cbor "github.com/ipfs/go-ipld-cbor" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/connmgr" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/connmgr" + "github.com/libp2p/go-libp2p/core/peer" cbg "github.com/whyrusleeping/cbor-gen" "go.opencensus.io/stats" "go.opencensus.io/trace" diff --git a/chain/sync_manager.go b/chain/sync_manager.go index a472bafb5..94017c276 100644 --- a/chain/sync_manager.go +++ b/chain/sync_manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" diff --git a/chain/sync_test.go b/chain/sync_test.go index 01fcf0441..ee1fd91ec 100644 --- a/chain/sync_test.go +++ b/chain/sync_test.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" diff --git a/cli/client.go b/cli/client.go index b4c8f5708..5f2342b2b 100644 --- a/cli/client.go +++ b/cli/client.go @@ -25,7 +25,7 @@ import ( "github.com/fatih/color" "github.com/ipfs/go-cid" "github.com/ipfs/go-cidutil/cidenc" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multibase" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cli/net.go b/cli/net.go index b86d72c38..5a141e52d 100644 --- a/cli/net.go +++ b/cli/net.go @@ -13,9 +13,9 @@ import ( "github.com/dustin/go-humanize" "github.com/fatih/color" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-miner/actor.go b/cmd/lotus-miner/actor.go index 15167fc2e..ba7c944d7 100644 --- a/cmd/lotus-miner/actor.go +++ b/cmd/lotus-miner/actor.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" cbor "github.com/ipfs/go-ipld-cbor" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-miner/init.go b/cmd/lotus-miner/init.go index fc7dc03f6..556a7f49f 100644 --- a/cmd/lotus-miner/init.go +++ b/cmd/lotus-miner/init.go @@ -17,8 +17,8 @@ import ( "github.com/google/uuid" "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-miner/init_restore.go b/cmd/lotus-miner/init_restore.go index 483c081c3..a54146fb2 100644 --- a/cmd/lotus-miner/init_restore.go +++ b/cmd/lotus-miner/init_restore.go @@ -8,7 +8,7 @@ import ( "github.com/docker/go-units" "github.com/ipfs/go-datastore" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-miner/init_service.go b/cmd/lotus-miner/init_service.go index 9bbfd18ed..41838965a 100644 --- a/cmd/lotus-miner/init_service.go +++ b/cmd/lotus-miner/init_service.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-miner/market.go b/cmd/lotus-miner/market.go index 2974078d6..37d252efa 100644 --- a/cmd/lotus-miner/market.go +++ b/cmd/lotus-miner/market.go @@ -19,7 +19,7 @@ import ( "github.com/fatih/color" "github.com/ipfs/go-cid" "github.com/ipfs/go-cidutil/cidenc" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multibase" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-seed/seed/seed.go b/cmd/lotus-seed/seed/seed.go index 2816d398e..3b305e3a6 100644 --- a/cmd/lotus-seed/seed/seed.go +++ b/cmd/lotus-seed/seed/seed.go @@ -12,8 +12,8 @@ import ( "github.com/google/uuid" logging "github.com/ipfs/go-log/v2" - ic "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + ic "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" "github.com/minio/blake2b-simd" "golang.org/x/xerrors" diff --git a/cmd/lotus-shed/consensus.go b/cmd/lotus-shed/consensus.go index f235606e0..f6bd7688f 100644 --- a/cmd/lotus-shed/consensus.go +++ b/cmd/lotus-shed/consensus.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" "github.com/urfave/cli/v2" diff --git a/cmd/lotus-shed/hello.go b/cmd/lotus-shed/hello.go index 23a11f118..d16f93735 100644 --- a/cmd/lotus-shed/hello.go +++ b/cmd/lotus-shed/hello.go @@ -7,7 +7,7 @@ import ( "time" "github.com/libp2p/go-libp2p" - inet "github.com/libp2p/go-libp2p-core/network" + inet "github.com/libp2p/go-libp2p/core/network" "github.com/urfave/cli/v2" cborutil "github.com/filecoin-project/go-cbor-util" diff --git a/cmd/lotus-shed/keyinfo.go b/cmd/lotus-shed/keyinfo.go index 683084711..135b5bc9d 100644 --- a/cmd/lotus-shed/keyinfo.go +++ b/cmd/lotus-shed/keyinfo.go @@ -13,8 +13,8 @@ import ( "strings" "text/template" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-base32" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/cmd/lotus-shed/miner-peerid.go b/cmd/lotus-shed/miner-peerid.go index 3d5911a4c..85f720a10 100644 --- a/cmd/lotus-shed/miner-peerid.go +++ b/cmd/lotus-shed/miner-peerid.go @@ -7,7 +7,7 @@ import ( "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/urfave/cli/v2" "golang.org/x/xerrors" diff --git a/genesis/types.go b/genesis/types.go index 021cdd287..822357dd1 100644 --- a/genesis/types.go +++ b/genesis/types.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" diff --git a/itests/api_test.go b/itests/api_test.go index 310160230..ac204dc1b 100644 --- a/itests/api_test.go +++ b/itests/api_test.go @@ -8,7 +8,7 @@ import ( "time" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go index 8ad7a2394..79f4a8743 100644 --- a/itests/kit/ensemble.go +++ b/itests/kit/ensemble.go @@ -15,8 +15,8 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" - libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + libp2pcrypto "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "github.com/stretchr/testify/require" diff --git a/itests/kit/node_miner.go b/itests/kit/node_miner.go index c48a09c17..8805ac36c 100644 --- a/itests/kit/node_miner.go +++ b/itests/kit/node_miner.go @@ -14,8 +14,8 @@ import ( "time" "github.com/google/uuid" - libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + libp2pcrypto "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" diff --git a/itests/net_test.go b/itests/net_test.go index 3501e35c3..e29911aa5 100644 --- a/itests/net_test.go +++ b/itests/net_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" manet "github.com/multiformats/go-multiaddr/net" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/lib/addrutil/parse.go b/lib/addrutil/parse.go index f9ee04c3f..fdeae424a 100644 --- a/lib/addrutil/parse.go +++ b/lib/addrutil/parse.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" madns "github.com/multiformats/go-multiaddr-dns" ) diff --git a/lib/peermgr/peermgr.go b/lib/peermgr/peermgr.go index 1ab81aff2..b6e6e31c0 100644 --- a/lib/peermgr/peermgr.go +++ b/lib/peermgr/peermgr.go @@ -6,11 +6,11 @@ import ( "time" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/event" - "github.com/libp2p/go-libp2p-core/host" - net "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" dht "github.com/libp2p/go-libp2p-kad-dht" + "github.com/libp2p/go-libp2p/core/event" + "github.com/libp2p/go-libp2p/core/host" + net "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" "go.opencensus.io/stats" "go.uber.org/fx" "go.uber.org/multierr" diff --git a/markets/dagstore/wrapper.go b/markets/dagstore/wrapper.go index cb20dccde..b5813dc5e 100644 --- a/markets/dagstore/wrapper.go +++ b/markets/dagstore/wrapper.go @@ -16,7 +16,7 @@ import ( measure "github.com/ipfs/go-ds-measure" logging "github.com/ipfs/go-log/v2" carindex "github.com/ipld/go-car/v2/index" - "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p/core/host" ldbopts "github.com/syndtr/goleveldb/leveldb/opt" "golang.org/x/xerrors" diff --git a/markets/idxprov/mesh.go b/markets/idxprov/mesh.go index 6c94fe9f3..706115a25 100644 --- a/markets/idxprov/mesh.go +++ b/markets/idxprov/mesh.go @@ -5,8 +5,8 @@ import ( "fmt" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/lotus/api/v1api" ) diff --git a/markets/utils/converters.go b/markets/utils/converters.go index f77297070..9562de695 100644 --- a/markets/utils/converters.go +++ b/markets/utils/converters.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-address" diff --git a/node/builder.go b/node/builder.go index a36c8e66d..f25e5f862 100644 --- a/node/builder.go +++ b/node/builder.go @@ -7,15 +7,15 @@ import ( logging "github.com/ipfs/go-log/v2" metricsi "github.com/ipfs/go-metrics-interface" - ci "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" - "github.com/libp2p/go-libp2p-core/routing" dht "github.com/libp2p/go-libp2p-kad-dht" pubsub "github.com/libp2p/go-libp2p-pubsub" record "github.com/libp2p/go-libp2p-record" + ci "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/core/routing" "github.com/libp2p/go-libp2p/p2p/net/conngater" "github.com/multiformats/go-multiaddr" "go.uber.org/fx" diff --git a/node/health.go b/node/health.go index 5c8bde26a..1be11921c 100644 --- a/node/health.go +++ b/node/health.go @@ -7,7 +7,7 @@ import ( "time" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/network" + "github.com/libp2p/go-libp2p/core/network" lapi "github.com/filecoin-project/lotus/api" ) diff --git a/node/hello/hello.go b/node/hello/hello.go index f59a5bc8d..651716da9 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -6,10 +6,10 @@ import ( "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/host" - inet "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/host" + inet "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "golang.org/x/xerrors" cborutil "github.com/filecoin-project/go-cbor-util" diff --git a/node/impl/client/client.go b/node/impl/client/client.go index b92c7f4ad..cefdfbc82 100644 --- a/node/impl/client/client.go +++ b/node/impl/client/client.go @@ -34,8 +34,8 @@ import ( "github.com/ipld/go-ipld-prime/traversal/selector/builder" selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse" textselector "github.com/ipld/go-ipld-selector-text-lite" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multibase" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/impl/full.go b/node/impl/full.go index 0eb5eb109..e1e7ac7a0 100644 --- a/node/impl/full.go +++ b/node/impl/full.go @@ -5,7 +5,7 @@ import ( "time" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" diff --git a/node/impl/full/state.go b/node/impl/full/state.go index d9d4f8644..d52093bff 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" cbg "github.com/whyrusleeping/cbor-gen" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/impl/net/net.go b/node/impl/net/net.go index 6e4e61ccf..c2ccbac0a 100644 --- a/node/impl/net/net.go +++ b/node/impl/net/net.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/metrics" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/metrics" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" basichost "github.com/libp2p/go-libp2p/p2p/host/basic" "github.com/libp2p/go-libp2p/p2p/net/conngater" "github.com/libp2p/go-libp2p/p2p/net/swarm" diff --git a/node/impl/net/protect.go b/node/impl/net/protect.go index 172898504..c6c864a68 100644 --- a/node/impl/net/protect.go +++ b/node/impl/net/protect.go @@ -3,7 +3,7 @@ package net import ( "context" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ) const apiProtectTag = "api" diff --git a/node/impl/net/rcmgr.go b/node/impl/net/rcmgr.go index 9fe4fcdc1..f1fd68694 100644 --- a/node/impl/net/rcmgr.go +++ b/node/impl/net/rcmgr.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" rcmgr "github.com/libp2p/go-libp2p-resource-manager" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "golang.org/x/xerrors" "github.com/filecoin-project/lotus/api" diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 4d1659dbd..a33b943ec 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -16,8 +16,8 @@ import ( "github.com/ipfs/go-graphsync" gsimpl "github.com/ipfs/go-graphsync/impl" "github.com/ipfs/go-graphsync/peerstate" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/chain.go b/node/modules/chain.go index a01feddb2..22a1d618a 100644 --- a/node/modules/chain.go +++ b/node/modules/chain.go @@ -7,8 +7,8 @@ import ( "github.com/ipfs/go-bitswap" "github.com/ipfs/go-bitswap/network" "github.com/ipfs/go-blockservice" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/routing" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/routing" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/client.go b/node/modules/client.go index f1262983d..22fcbb00d 100644 --- a/node/modules/client.go +++ b/node/modules/client.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" - "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p/core/host" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/core.go b/node/modules/core.go index e089333e7..c74cc2143 100644 --- a/node/modules/core.go +++ b/node/modules/core.go @@ -12,9 +12,9 @@ import ( "github.com/gbrlsnchs/jwt/v3" logging "github.com/ipfs/go-log/v2" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" record "github.com/libp2p/go-libp2p-record" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/peerstore" "github.com/raulk/go-watchdog" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/dtypes/bootstrap.go b/node/modules/dtypes/bootstrap.go index 96cd2f673..bc19f741d 100644 --- a/node/modules/dtypes/bootstrap.go +++ b/node/modules/dtypes/bootstrap.go @@ -1,6 +1,6 @@ package dtypes -import "github.com/libp2p/go-libp2p-core/peer" +import "github.com/libp2p/go-libp2p/core/peer" type BootstrapPeers []peer.AddrInfo type DrandBootstrap []peer.AddrInfo diff --git a/node/modules/dtypes/scorekeeper.go b/node/modules/dtypes/scorekeeper.go index 7154bbe8b..343b787b7 100644 --- a/node/modules/dtypes/scorekeeper.go +++ b/node/modules/dtypes/scorekeeper.go @@ -3,8 +3,8 @@ package dtypes import ( "sync" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/peer" ) type ScoreKeeper struct { diff --git a/node/modules/graphsync.go b/node/modules/graphsync.go index 724c57ef0..ca69cd2d2 100644 --- a/node/modules/graphsync.go +++ b/node/modules/graphsync.go @@ -8,8 +8,8 @@ import ( graphsyncimpl "github.com/ipfs/go-graphsync/impl" gsnet "github.com/ipfs/go-graphsync/network" "github.com/ipfs/go-graphsync/storeutil" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "go.opencensus.io/stats" "go.uber.org/fx" diff --git a/node/modules/lp2p/addrs.go b/node/modules/lp2p/addrs.go index d092ff0ab..52ee8c852 100644 --- a/node/modules/lp2p/addrs.go +++ b/node/modules/lp2p/addrs.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p/core/host" p2pbhost "github.com/libp2p/go-libp2p/p2p/host/basic" mafilter "github.com/libp2p/go-maddr-filter" ma "github.com/multiformats/go-multiaddr" diff --git a/node/modules/lp2p/discovery.go b/node/modules/lp2p/discovery.go index f281c66c7..ca68a7b9c 100644 --- a/node/modules/lp2p/discovery.go +++ b/node/modules/lp2p/discovery.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/fx" "github.com/filecoin-project/lotus/node/modules/helpers" diff --git a/node/modules/lp2p/host.go b/node/modules/lp2p/host.go index 982d9f4cd..6ba9cdb79 100644 --- a/node/modules/lp2p/host.go +++ b/node/modules/lp2p/host.go @@ -6,12 +6,12 @@ import ( nilrouting "github.com/ipfs/go-ipfs-routing/none" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" dht "github.com/libp2p/go-libp2p-kad-dht" "github.com/libp2p/go-libp2p-peerstore/pstoremem" record "github.com/libp2p/go-libp2p-record" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/peerstore" routedhost "github.com/libp2p/go-libp2p/p2p/host/routed" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" "go.uber.org/fx" diff --git a/node/modules/lp2p/libp2p.go b/node/modules/lp2p/libp2p.go index 87a5cdaf0..9d42b3996 100644 --- a/node/modules/lp2p/libp2p.go +++ b/node/modules/lp2p/libp2p.go @@ -6,9 +6,9 @@ import ( logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" + "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/peerstore" "github.com/libp2p/go-libp2p/p2p/net/connmgr" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/lp2p/nat.go b/node/modules/lp2p/nat.go index f5ff142b7..b0c40d254 100644 --- a/node/modules/lp2p/nat.go +++ b/node/modules/lp2p/nat.go @@ -7,7 +7,7 @@ import ( /*import ( "github.com/libp2p/go-libp2p" autonat "github.com/libp2p/go-libp2p-autonat-svc" - host "github.com/libp2p/go-libp2p-core/host" + host "github.com/libp2p/go-libp2p/core/host" libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic" "go.uber.org/fx" "github.com/ipfs/go-ipfs/repo" diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index 33f17a5c1..9f1b58c2b 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "github.com/minio/blake2b-simd" ma "github.com/multiformats/go-multiaddr" "go.opencensus.io/stats" diff --git a/node/modules/lp2p/rcmgr.go b/node/modules/lp2p/rcmgr.go index bd4ff75ab..01ecaae72 100644 --- a/node/modules/lp2p/rcmgr.go +++ b/node/modules/lp2p/rcmgr.go @@ -10,12 +10,12 @@ import ( logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" rcmgr "github.com/libp2p/go-libp2p-resource-manager" "github.com/libp2p/go-libp2p-resource-manager/obs" rcmgrObs "github.com/libp2p/go-libp2p-resource-manager/obs" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "go.opencensus.io/stats" "go.opencensus.io/stats/view" "go.opencensus.io/tag" diff --git a/node/modules/lp2p/relay.go b/node/modules/lp2p/relay.go index ec0e39ad2..87a4983f6 100644 --- a/node/modules/lp2p/relay.go +++ b/node/modules/lp2p/relay.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/libp2p/go-libp2p" - coredisc "github.com/libp2p/go-libp2p-core/discovery" - "github.com/libp2p/go-libp2p-core/routing" + coredisc "github.com/libp2p/go-libp2p/core/discovery" + "github.com/libp2p/go-libp2p/core/routing" routingdisc "github.com/libp2p/go-libp2p/p2p/discovery/routing" ) diff --git a/node/modules/lp2p/routing.go b/node/modules/lp2p/routing.go index 8cc06a6f6..816cbe2ea 100644 --- a/node/modules/lp2p/routing.go +++ b/node/modules/lp2p/routing.go @@ -4,10 +4,10 @@ import ( "context" "sort" - "github.com/libp2p/go-libp2p-core/routing" dht "github.com/libp2p/go-libp2p-kad-dht" record "github.com/libp2p/go-libp2p-record" routinghelpers "github.com/libp2p/go-libp2p-routing-helpers" + "github.com/libp2p/go-libp2p/core/routing" "go.uber.org/fx" ) diff --git a/node/modules/lp2p/transport.go b/node/modules/lp2p/transport.go index 302304632..536f612b1 100644 --- a/node/modules/lp2p/transport.go +++ b/node/modules/lp2p/transport.go @@ -2,7 +2,7 @@ package lp2p import ( "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/metrics" + "github.com/libp2p/go-libp2p/core/metrics" noise "github.com/libp2p/go-libp2p/p2p/security/noise" tls "github.com/libp2p/go-libp2p/p2p/security/tls" libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic" diff --git a/node/modules/services.go b/node/modules/services.go index 150154435..72bc88959 100644 --- a/node/modules/services.go +++ b/node/modules/services.go @@ -9,10 +9,10 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" "github.com/libp2p/go-eventbus" - "github.com/libp2p/go-libp2p-core/event" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/event" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index 4bb373e75..3fbe3d097 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -18,7 +18,7 @@ import ( graphsync "github.com/ipfs/go-graphsync/impl" gsnet "github.com/ipfs/go-graphsync/network" "github.com/ipfs/go-graphsync/storeutil" - "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p/core/host" "go.uber.org/fx" "go.uber.org/multierr" "golang.org/x/xerrors" diff --git a/node/modules/storageminer_dagstore.go b/node/modules/storageminer_dagstore.go index 987da5a7e..620e69090 100644 --- a/node/modules/storageminer_dagstore.go +++ b/node/modules/storageminer_dagstore.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/libp2p/go-libp2p-core/host" + "github.com/libp2p/go-libp2p/core/host" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/storageminer_idxprov.go b/node/modules/storageminer_idxprov.go index 0937786a1..5f6cf69f0 100644 --- a/node/modules/storageminer_idxprov.go +++ b/node/modules/storageminer_idxprov.go @@ -5,8 +5,8 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/namespace" - "github.com/libp2p/go-libp2p-core/host" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/host" "go.uber.org/fx" "golang.org/x/xerrors" diff --git a/node/modules/storageminer_idxprov_test.go b/node/modules/storageminer_idxprov_test.go index 6e66e3aa0..125d5b82c 100644 --- a/node/modules/storageminer_idxprov_test.go +++ b/node/modules/storageminer_idxprov_test.go @@ -8,8 +8,8 @@ import ( "github.com/ipfs/go-datastore" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/host" pubsub "github.com/libp2p/go-libp2p-pubsub" + "github.com/libp2p/go-libp2p/core/host" "github.com/stretchr/testify/require" "go.uber.org/fx" diff --git a/testplans/lotus-soup/deals_e2e.go b/testplans/lotus-soup/deals_e2e.go index c4c855cd2..d650bb444 100644 --- a/testplans/lotus-soup/deals_e2e.go +++ b/testplans/lotus-soup/deals_e2e.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/testground/sdk-go/sync" "github.com/filecoin-project/go-address" diff --git a/testplans/lotus-soup/testkit/lotus_opts.go b/testplans/lotus-soup/testkit/lotus_opts.go index a1b23f59e..768c6d0d3 100644 --- a/testplans/lotus-soup/testkit/lotus_opts.go +++ b/testplans/lotus-soup/testkit/lotus_opts.go @@ -3,7 +3,7 @@ package testkit import ( "fmt" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/lotus/node" diff --git a/testplans/lotus-soup/testkit/role_bootstrapper.go b/testplans/lotus-soup/testkit/role_bootstrapper.go index 2e2c7c82b..6c19f26f1 100644 --- a/testplans/lotus-soup/testkit/role_bootstrapper.go +++ b/testplans/lotus-soup/testkit/role_bootstrapper.go @@ -8,7 +8,7 @@ import ( "time" "github.com/google/uuid" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/filecoin-project/go-state-types/big" diff --git a/testplans/lotus-soup/testkit/role_drand.go b/testplans/lotus-soup/testkit/role_drand.go index 7e565aa8a..bae36bd61 100644 --- a/testplans/lotus-soup/testkit/role_drand.go +++ b/testplans/lotus-soup/testkit/role_drand.go @@ -21,7 +21,7 @@ import ( dnet "github.com/drand/drand/net" "github.com/drand/drand/protobuf/drand" dtest "github.com/drand/drand/test" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/testground/sdk-go/sync" diff --git a/testplans/lotus-soup/testkit/role_miner.go b/testplans/lotus-soup/testkit/role_miner.go index 59cb9dc71..a438bb6d8 100644 --- a/testplans/lotus-soup/testkit/role_miner.go +++ b/testplans/lotus-soup/testkit/role_miner.go @@ -15,8 +15,8 @@ import ( "github.com/gorilla/mux" "github.com/hashicorp/go-multierror" "github.com/ipfs/go-datastore" - libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" + libp2pcrypto "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/peer" "github.com/testground/sdk-go/sync" "github.com/filecoin-project/go-address" diff --git a/testplans/lotus-soup/testkit/role_pubsub_tracer.go b/testplans/lotus-soup/testkit/role_pubsub_tracer.go index e5da62f7e..8d89f23d7 100644 --- a/testplans/lotus-soup/testkit/role_pubsub_tracer.go +++ b/testplans/lotus-soup/testkit/role_pubsub_tracer.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-pubsub-tracer/traced" + "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/host" ma "github.com/multiformats/go-multiaddr" ) diff --git a/testplans/lotus-soup/testkit/sync.go b/testplans/lotus-soup/testkit/sync.go index 35b38170f..cab08594c 100644 --- a/testplans/lotus-soup/testkit/sync.go +++ b/testplans/lotus-soup/testkit/sync.go @@ -1,7 +1,7 @@ package testkit import ( - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" "github.com/testground/sdk-go/sync" "github.com/filecoin-project/go-address"