From 406d2b53f8ade09c3af57e70956296611679a767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 3 Dec 2018 16:57:59 +0100 Subject: [PATCH] files2.0: Close subfiles in adder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera --- adder/adder.go | 12 +++++----- adder/adder_test.go | 6 ++--- adder/adderutils/adderutils.go | 6 ++--- adder/ipfsadd/add.go | 25 +++++++++++---------- adder/local/dag_service.go | 10 ++++----- adder/local/dag_service_test.go | 2 +- adder/sharding/dag.go | 16 ++++++------- adder/sharding/dag_service.go | 12 +++++----- adder/sharding/dag_service_test.go | 6 ++--- adder/sharding/shard.go | 8 +++---- adder/sharding/verify.go | 2 +- adder/util.go | 8 +++---- allocate.go | 4 ++-- allocator/ascendalloc/ascendalloc.go | 8 +++---- allocator/ascendalloc/ascendalloc_test.go | 4 ++-- allocator/descendalloc/descendalloc.go | 8 +++---- allocator/descendalloc/descendalloc_test.go | 4 ++-- allocator/util/metricsorter.go | 2 +- api/rest/client/client.go | 18 +++++++-------- api/rest/client/client_test.go | 8 +++---- api/rest/client/methods.go | 6 ++--- api/rest/client/methods_test.go | 8 +++---- api/rest/client/transports.go | 12 +++++----- api/rest/config.go | 8 +++---- api/rest/config_test.go | 6 ++--- api/rest/restapi.go | 22 +++++++++--------- api/rest/restapi_test.go | 12 +++++----- api/types.go | 14 ++++++------ api/types_test.go | 6 ++--- api/util.go | 4 ++-- cluster.go | 14 ++++++------ cluster_config.go | 10 ++++----- cluster_test.go | 6 ++--- clusterhost.go | 10 ++++----- cmd/ipfs-cluster-ctl/formatters.go | 2 +- cmd/ipfs-cluster-ctl/graph.go | 4 ++-- cmd/ipfs-cluster-ctl/main.go | 12 +++++----- cmd/ipfs-cluster-service/daemon.go | 6 ++--- cmd/ipfs-cluster-service/lock.go | 2 +- cmd/ipfs-cluster-service/main.go | 6 ++--- config/config.go | 2 +- connect_graph.go | 2 +- consensus/raft/config.go | 4 ++-- consensus/raft/config_test.go | 2 +- consensus/raft/consensus.go | 14 ++++++------ consensus/raft/consensus_test.go | 8 +++---- consensus/raft/log_op.go | 2 +- consensus/raft/log_op_test.go | 2 +- consensus/raft/logging.go | 2 +- consensus/raft/raft.go | 10 ++++----- informer/disk/disk.go | 4 ++-- informer/disk/disk_test.go | 2 +- informer/numpin/numpin.go | 2 +- informer/numpin/numpin_test.go | 2 +- ipfscluster.go | 6 ++--- ipfscluster_test.go | 12 +++++----- ipfsconn/ipfshttp/config.go | 2 +- ipfsconn/ipfshttp/ipfshttp.go | 16 ++++++------- ipfsconn/ipfshttp/ipfshttp_test.go | 6 ++--- logging.go | 2 +- monitor/basic/peer_monitor.go | 6 ++--- monitor/basic/peer_monitor_test.go | 6 ++--- monitor/metrics/checker.go | 2 +- monitor/metrics/checker_test.go | 2 +- monitor/metrics/store.go | 2 +- monitor/metrics/util.go | 2 +- monitor/pubsubmon/pubsubmon.go | 12 +++++----- monitor/pubsubmon/pubsubmon_test.go | 8 +++---- peer_manager_test.go | 8 +++---- pintracker/maptracker/maptracker.go | 8 +++---- pintracker/maptracker/maptracker_test.go | 6 ++--- pintracker/optracker/operation.go | 2 +- pintracker/optracker/operationtracker.go | 6 ++--- pintracker/pintracker_test.go | 6 ++--- pintracker/stateless/stateless.go | 8 +++---- pintracker/stateless/stateless_test.go | 4 ++-- pintracker/util/pin.go | 2 +- pstoremgr/pstoremgr.go | 12 +++++----- pstoremgr/pstoremgr_test.go | 4 ++-- rpc_api.go | 2 +- rpcutil/rpcutil.go | 2 +- state/interface.go | 2 +- state/mapstate/map_state.go | 6 ++--- state/mapstate/map_state_test.go | 6 ++--- state/mapstate/migrate.go | 2 +- test/cids.go | 4 ++-- test/ipfs_mock.go | 4 ++-- test/rpc_api_mock.go | 8 +++---- test/sharding.go | 4 +++- util.go | 8 +++---- version.go | 4 ++-- 91 files changed, 301 insertions(+), 298 deletions(-) diff --git a/adder/adder.go b/adder/adder.go index 46d71e05..54db178c 100644 --- a/adder/adder.go +++ b/adder/adder.go @@ -11,12 +11,12 @@ import ( "github.com/ipfs/ipfs-cluster/adder/ipfsadd" "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - files "github.com/ipfs/go-ipfs-files" - ipld "github.com/ipfs/go-ipld-format" - logging "github.com/ipfs/go-log" - merkledag "github.com/ipfs/go-merkledag" - multihash "github.com/multiformats/go-multihash" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + multihash "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + merkledag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("adder") diff --git a/adder/adder_test.go b/adder/adder_test.go index 014f04da..5a2600ba 100644 --- a/adder/adder_test.go +++ b/adder/adder_test.go @@ -10,9 +10,9 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - files "github.com/ipfs/go-ipfs-files" - ipld "github.com/ipfs/go-ipld-format" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" ) type mockCDAGServ struct { diff --git a/adder/adderutils/adderutils.go b/adder/adderutils/adderutils.go index 189fe245..ff382439 100644 --- a/adder/adderutils/adderutils.go +++ b/adder/adderutils/adderutils.go @@ -13,9 +13,9 @@ import ( "github.com/ipfs/ipfs-cluster/adder/sharding" "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("adder") diff --git a/adder/ipfsadd/add.go b/adder/ipfsadd/add.go index 2c953efd..ab223cc5 100644 --- a/adder/ipfsadd/add.go +++ b/adder/ipfsadd/add.go @@ -10,18 +10,18 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - chunker "github.com/ipfs/go-ipfs-chunker" - files "github.com/ipfs/go-ipfs-files" - posinfo "github.com/ipfs/go-ipfs-posinfo" - ipld "github.com/ipfs/go-ipld-format" - logging "github.com/ipfs/go-log" - dag "github.com/ipfs/go-merkledag" - mfs "github.com/ipfs/go-mfs" - unixfs "github.com/ipfs/go-unixfs" - balanced "github.com/ipfs/go-unixfs/importer/balanced" - ihelper "github.com/ipfs/go-unixfs/importer/helpers" - trickle "github.com/ipfs/go-unixfs/importer/trickle" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + posinfo "gx/ipfs/QmQyUyYcpKG1u53V7N25qRTGw5XwaAxTMKXbduqHotQztg/go-ipfs-posinfo" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag" + mfs "gx/ipfs/QmTFCS9QwPQEihtjqi6zTX5n21J5y1yQwc3hnk7t3hZDLN/go-mfs" + chunker "gx/ipfs/QmTUTG9Jg9ZRA1EzTPGTDvnwfcfKhDMnqANnP9fe4rSjMR/go-ipfs-chunker" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + unixfs "gx/ipfs/QmfB3oNXGGq9S4B2a9YeCajoATms3Zw2VvDm8fK7VeLSV8/go-unixfs" + balanced "gx/ipfs/QmfB3oNXGGq9S4B2a9YeCajoATms3Zw2VvDm8fK7VeLSV8/go-unixfs/importer/balanced" + ihelper "gx/ipfs/QmfB3oNXGGq9S4B2a9YeCajoATms3Zw2VvDm8fK7VeLSV8/go-unixfs/importer/helpers" + trickle "gx/ipfs/QmfB3oNXGGq9S4B2a9YeCajoATms3Zw2VvDm8fK7VeLSV8/go-unixfs/importer/trickle" ) var log = logging.Logger("coreunix") @@ -284,6 +284,7 @@ func (adder *Adder) AddFile(path string, file files.Node) error { } func (adder *Adder) addFile(path string, nd files.Node) error { + defer nd.Close() if adder.liveNodes >= liveCacheSize { // TODO: A smarter cache that uses some sort of lru cache with an eviction handler mr, err := adder.mfsRoot() diff --git a/adder/local/dag_service.go b/adder/local/dag_service.go index 0a0c9827..3f40f644 100644 --- a/adder/local/dag_service.go +++ b/adder/local/dag_service.go @@ -9,11 +9,11 @@ import ( adder "github.com/ipfs/ipfs-cluster/adder" "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - ipld "github.com/ipfs/go-ipld-format" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var errNotFound = errors.New("dagservice: block not found") diff --git a/adder/local/dag_service_test.go b/adder/local/dag_service_test.go index be1420b6..188df730 100644 --- a/adder/local/dag_service_test.go +++ b/adder/local/dag_service_test.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" - rpc "github.com/libp2p/go-libp2p-gorpc" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" ) type testRPC struct { diff --git a/adder/sharding/dag.go b/adder/sharding/dag.go index 9c628fa5..478c03f6 100644 --- a/adder/sharding/dag.go +++ b/adder/sharding/dag.go @@ -23,14 +23,14 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/rpcutil" - blocks "github.com/ipfs/go-block-format" - cid "github.com/ipfs/go-cid" - cbor "github.com/ipfs/go-ipld-cbor" - ipld "github.com/ipfs/go-ipld-format" - dag "github.com/ipfs/go-merkledag" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" - mh "github.com/multiformats/go-multihash" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" + cbor "gx/ipfs/QmSbrWdBtHgfYjeRcLotTrPXFkxY4GHMJZVxS6MQvzsYmf/go-ipld-cbor" + dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) func init() { diff --git a/adder/sharding/dag_service.go b/adder/sharding/dag_service.go index d2c3d5ea..d2474b29 100644 --- a/adder/sharding/dag_service.go +++ b/adder/sharding/dag_service.go @@ -13,12 +13,12 @@ import ( "github.com/ipfs/ipfs-cluster/adder" "github.com/ipfs/ipfs-cluster/api" - humanize "github.com/dustin/go-humanize" - cid "github.com/ipfs/go-cid" - ipld "github.com/ipfs/go-ipld-format" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var errNotFound = errors.New("dagservice: block not found") diff --git a/adder/sharding/dag_service_test.go b/adder/sharding/dag_service_test.go index c6ad83bc..fbb5fe07 100644 --- a/adder/sharding/dag_service_test.go +++ b/adder/sharding/dag_service_test.go @@ -11,9 +11,9 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) func init() { diff --git a/adder/sharding/shard.go b/adder/sharding/shard.go index 84cc6058..bd180046 100644 --- a/adder/sharding/shard.go +++ b/adder/sharding/shard.go @@ -7,10 +7,10 @@ import ( "github.com/ipfs/ipfs-cluster/adder" "github.com/ipfs/ipfs-cluster/api" - humanize "github.com/dustin/go-humanize" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // a shard represents a set of blocks (or bucket) which have been assigned diff --git a/adder/sharding/verify.go b/adder/sharding/verify.go index dc731775..c3f3000a 100644 --- a/adder/sharding/verify.go +++ b/adder/sharding/verify.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ) // MockPinStore is used in VerifyShards diff --git a/adder/util.go b/adder/util.go index 8863a54e..4d284491 100644 --- a/adder/util.go +++ b/adder/util.go @@ -8,10 +8,10 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/rpcutil" - cid "github.com/ipfs/go-cid" - ipld "github.com/ipfs/go-ipld-format" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // PutBlock sends a NodeWithMeta to the given destinations. diff --git a/allocate.go b/allocate.go index ba4b7f33..a334b2ec 100644 --- a/allocate.go +++ b/allocate.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/allocator/ascendalloc/ascendalloc.go b/allocator/ascendalloc/ascendalloc.go index 3b4be58a..6f792e25 100644 --- a/allocator/ascendalloc/ascendalloc.go +++ b/allocator/ascendalloc/ascendalloc.go @@ -8,10 +8,10 @@ import ( "github.com/ipfs/ipfs-cluster/allocator/util" "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("ascendalloc") diff --git a/allocator/ascendalloc/ascendalloc_test.go b/allocator/ascendalloc/ascendalloc_test.go index 5d0fd646..03c5d1f1 100644 --- a/allocator/ascendalloc/ascendalloc_test.go +++ b/allocator/ascendalloc/ascendalloc_test.go @@ -6,8 +6,8 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) type testcase struct { diff --git a/allocator/descendalloc/descendalloc.go b/allocator/descendalloc/descendalloc.go index f4264b85..5fc01af4 100644 --- a/allocator/descendalloc/descendalloc.go +++ b/allocator/descendalloc/descendalloc.go @@ -8,10 +8,10 @@ import ( "github.com/ipfs/ipfs-cluster/allocator/util" "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("descendalloc") diff --git a/allocator/descendalloc/descendalloc_test.go b/allocator/descendalloc/descendalloc_test.go index 2552d1f6..d8975098 100644 --- a/allocator/descendalloc/descendalloc_test.go +++ b/allocator/descendalloc/descendalloc_test.go @@ -6,8 +6,8 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) type testcase struct { diff --git a/allocator/util/metricsorter.go b/allocator/util/metricsorter.go index 7d403054..ca8e68c0 100644 --- a/allocator/util/metricsorter.go +++ b/allocator/util/metricsorter.go @@ -10,7 +10,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // SortNumeric returns a list of peers sorted by their metric values. If reverse diff --git a/api/rest/client/client.go b/api/rest/client/client.go index e93feb27..9324b104 100644 --- a/api/rest/client/client.go +++ b/api/rest/client/client.go @@ -11,15 +11,15 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - shell "github.com/ipfs/go-ipfs-api" - files "github.com/ipfs/go-ipfs-files" - logging "github.com/ipfs/go-log" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" - madns "github.com/multiformats/go-multiaddr-dns" - manet "github.com/multiformats/go-multiaddr-net" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + shell "gx/ipfs/QmQcy2Frmpvm5D5oiWoKXfs71eh3MXTv7LN12J39hJioBi/go-ipfs-api" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + manet "gx/ipfs/Qmaabb1tJZ2CX5cp6MuuiGgns71NYoxdgQP6Xdid1dVceC/go-multiaddr-net" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" + madns "gx/ipfs/QmeHJXPqCNzSFbVkYM1uQLuM2L5FyJB9zukQ7EeqRP8ZC9/go-multiaddr-dns" ) // Configuration defaults diff --git a/api/rest/client/client_test.go b/api/rest/client/client_test.go index 8daac083..53661303 100644 --- a/api/rest/client/client_test.go +++ b/api/rest/client/client_test.go @@ -9,10 +9,10 @@ import ( "github.com/ipfs/ipfs-cluster/api/rest" "github.com/ipfs/ipfs-cluster/test" - libp2p "github.com/libp2p/go-libp2p" - peer "github.com/libp2p/go-libp2p-peer" - pnet "github.com/libp2p/go-libp2p-pnet" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + pnet "gx/ipfs/QmY4Q5JC4vxLEi8EpVxJM4rcRryEVtH1zRKVTAm6BKV1pg/go-libp2p-pnet" ) func testAPI(t *testing.T) *rest.API { diff --git a/api/rest/client/methods.go b/api/rest/client/methods.go index 32494156..af0c7814 100644 --- a/api/rest/client/methods.go +++ b/api/rest/client/methods.go @@ -15,9 +15,9 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - files "github.com/ipfs/go-ipfs-files" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // ID returns information about the cluster Peer. diff --git a/api/rest/client/methods_test.go b/api/rest/client/methods_test.go index 0cc14e3c..ee248de5 100644 --- a/api/rest/client/methods_test.go +++ b/api/rest/client/methods_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" types "github.com/ipfs/ipfs-cluster/api" diff --git a/api/rest/client/transports.go b/api/rest/client/transports.go index ea38a8d7..5bfd718c 100644 --- a/api/rest/client/transports.go +++ b/api/rest/client/transports.go @@ -10,12 +10,12 @@ import ( "github.com/ipfs/ipfs-cluster/api" - p2phttp "github.com/hsanjuan/go-libp2p-http" - libp2p "github.com/libp2p/go-libp2p" - ipnet "github.com/libp2p/go-libp2p-interface-pnet" - peerstore "github.com/libp2p/go-libp2p-peerstore" - pnet "github.com/libp2p/go-libp2p-pnet" - madns "github.com/multiformats/go-multiaddr-dns" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + ipnet "gx/ipfs/QmW7Ump7YyBMr712Ta3iEVh3ZYcfVvJaPryfbCnyE826b4/go-libp2p-interface-pnet" + pnet "gx/ipfs/QmY4Q5JC4vxLEi8EpVxJM4rcRryEVtH1zRKVTAm6BKV1pg/go-libp2p-pnet" + p2phttp "gx/ipfs/QmbuqT17YGSLRGiDRSJqVoXzTXrj4R5y6u4px2q42iyf23/go-libp2p-http" + madns "gx/ipfs/QmeHJXPqCNzSFbVkYM1uQLuM2L5FyJB9zukQ7EeqRP8ZC9/go-multiaddr-dns" ) // This is essentially a http.DefaultTransport. We should not mess diff --git a/api/rest/config.go b/api/rest/config.go index b93c21e3..32db6b24 100644 --- a/api/rest/config.go +++ b/api/rest/config.go @@ -11,11 +11,11 @@ import ( "github.com/ipfs/ipfs-cluster/config" - "github.com/kelseyhightower/envconfig" + "gx/ipfs/QmYgGtLm9WJRgh6iuaZap8qVC1gqixFbZCNfhjLNBhWMCm/envconfig" - crypto "github.com/libp2p/go-libp2p-crypto" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) const configKey = "restapi" diff --git a/api/rest/config_test.go b/api/rest/config_test.go index f8ba4801..d45e9e0f 100644 --- a/api/rest/config_test.go +++ b/api/rest/config_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - crypto "github.com/libp2p/go-libp2p-crypto" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) var cfgJSON = []byte(` diff --git a/api/rest/restapi.go b/api/rest/restapi.go index 12ddeec6..2358bd56 100644 --- a/api/rest/restapi.go +++ b/api/rest/restapi.go @@ -24,17 +24,17 @@ import ( "github.com/ipfs/ipfs-cluster/adder/adderutils" types "github.com/ipfs/ipfs-cluster/api" - mux "github.com/gorilla/mux" - gostream "github.com/hsanjuan/go-libp2p-gostream" - p2phttp "github.com/hsanjuan/go-libp2p-http" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - libp2p "github.com/libp2p/go-libp2p" - rpc "github.com/libp2p/go-libp2p-gorpc" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr-net" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + gostream "gx/ipfs/QmS3MUqUDdk7ENbbnC3DNTzQrKfcihYEnAAuo2n6LWViYa/go-libp2p-gostream" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + mux "gx/ipfs/QmVrBjGjskzhW7HRfC56f4mT3nmNBHj2WWnEXr39G7Y6w8/mux" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + manet "gx/ipfs/Qmaabb1tJZ2CX5cp6MuuiGgns71NYoxdgQP6Xdid1dVceC/go-multiaddr-net" + p2phttp "gx/ipfs/QmbuqT17YGSLRGiDRSJqVoXzTXrj4R5y6u4px2q42iyf23/go-libp2p-http" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) func init() { diff --git a/api/rest/restapi_test.go b/api/rest/restapi_test.go index 7f0141ee..fbd9f773 100644 --- a/api/rest/restapi_test.go +++ b/api/rest/restapi_test.go @@ -16,12 +16,12 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" - p2phttp "github.com/hsanjuan/go-libp2p-http" - libp2p "github.com/libp2p/go-libp2p" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - peerstore "github.com/libp2p/go-libp2p-peerstore" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + p2phttp "gx/ipfs/QmbuqT17YGSLRGiDRSJqVoXzTXrj4R5y6u4px2q42iyf23/go-libp2p-http" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) const ( diff --git a/api/types.go b/api/types.go index 23ce1593..e8051e73 100644 --- a/api/types.go +++ b/api/types.go @@ -17,16 +17,16 @@ import ( "strings" "time" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - peer "github.com/libp2p/go-libp2p-peer" - protocol "github.com/libp2p/go-libp2p-protocol" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" // needed to parse /ws multiaddresses - _ "github.com/libp2p/go-ws-transport" + _ "gx/ipfs/QmY957dCFYVPKpj21xRs6KA3XAGA9tBt73UE5kfUGdNgD9/go-ws-transport" // needed to parse /dns* multiaddresses - _ "github.com/multiformats/go-multiaddr-dns" + _ "gx/ipfs/QmeHJXPqCNzSFbVkYM1uQLuM2L5FyJB9zukQ7EeqRP8ZC9/go-multiaddr-dns" ) var logger = logging.Logger("apitypes") diff --git a/api/types_test.go b/api/types_test.go index dc56d091..1ae73bee 100644 --- a/api/types_test.go +++ b/api/types_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) var testTime = time.Date(2017, 12, 31, 15, 45, 50, 0, time.UTC) diff --git a/api/util.go b/api/util.go index 3ed3f6e0..5dce3ca7 100644 --- a/api/util.go +++ b/api/util.go @@ -3,8 +3,8 @@ package api import ( "fmt" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // PeersToStrings IDB58Encodes a list of peers. diff --git a/cluster.go b/cluster.go index e3c85870..d5ee07b8 100644 --- a/cluster.go +++ b/cluster.go @@ -16,13 +16,13 @@ import ( "github.com/ipfs/ipfs-cluster/rpcutil" "github.com/ipfs/ipfs-cluster/state" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - host "github.com/libp2p/go-libp2p-host" - dht "github.com/libp2p/go-libp2p-kad-dht" - peer "github.com/libp2p/go-libp2p-peer" - routedhost "github.com/libp2p/go-libp2p/p2p/host/routed" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + dht "gx/ipfs/QmQHnqaNULV8WeUGgh97o9K3KAW6kWQmDyNf9UuikgnPTe/go-libp2p-kad-dht" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + routedhost "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p/p2p/host/routed" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) // ReadyTimeout specifies the time before giving up diff --git a/cluster_config.go b/cluster_config.go index 6d81c6aa..93c005d4 100644 --- a/cluster_config.go +++ b/cluster_config.go @@ -11,14 +11,14 @@ import ( "sync" "time" - "github.com/kelseyhightower/envconfig" + "gx/ipfs/QmYgGtLm9WJRgh6iuaZap8qVC1gqixFbZCNfhjLNBhWMCm/envconfig" "github.com/ipfs/ipfs-cluster/config" - crypto "github.com/libp2p/go-libp2p-crypto" - peer "github.com/libp2p/go-libp2p-peer" - pnet "github.com/libp2p/go-libp2p-pnet" - ma "github.com/multiformats/go-multiaddr" + crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + pnet "gx/ipfs/QmY4Q5JC4vxLEi8EpVxJM4rcRryEVtH1zRKVTAm6BKV1pg/go-libp2p-pnet" ) const configKey = "cluster" diff --git a/cluster_test.go b/cluster_test.go index 109420f7..c0810c84 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -19,9 +19,9 @@ import ( "github.com/ipfs/ipfs-cluster/state/mapstate" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) type mockComponent struct { diff --git a/clusterhost.go b/clusterhost.go index 0ab080f3..3714dfa1 100644 --- a/clusterhost.go +++ b/clusterhost.go @@ -4,11 +4,11 @@ import ( "context" "encoding/hex" - libp2p "github.com/libp2p/go-libp2p" - host "github.com/libp2p/go-libp2p-host" - ipnet "github.com/libp2p/go-libp2p-interface-pnet" - pnet "github.com/libp2p/go-libp2p-pnet" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + ipnet "gx/ipfs/QmW7Ump7YyBMr712Ta3iEVh3ZYcfVvJaPryfbCnyE826b4/go-libp2p-interface-pnet" + pnet "gx/ipfs/QmY4Q5JC4vxLEi8EpVxJM4rcRryEVtH1zRKVTAm6BKV1pg/go-libp2p-pnet" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) // NewClusterHost creates a libp2p Host with the options from the diff --git a/cmd/ipfs-cluster-ctl/formatters.go b/cmd/ipfs-cluster-ctl/formatters.go index 3cd08168..c629a4db 100644 --- a/cmd/ipfs-cluster-ctl/formatters.go +++ b/cmd/ipfs-cluster-ctl/formatters.go @@ -9,7 +9,7 @@ import ( "time" "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) func jsonFormatObject(resp interface{}) { diff --git a/cmd/ipfs-cluster-ctl/graph.go b/cmd/ipfs-cluster-ctl/graph.go index 484c1fdc..3c881d10 100644 --- a/cmd/ipfs-cluster-ctl/graph.go +++ b/cmd/ipfs-cluster-ctl/graph.go @@ -6,8 +6,8 @@ import ( "io" "sort" - peer "github.com/libp2p/go-libp2p-peer" - dot "github.com/zenground0/go-dot" + dot "gx/ipfs/QmPuuqyMyoadGDkefg7L11kAwmvQykrHiRkuLjQRpa1bqF/go-dot" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/cmd/ipfs-cluster-ctl/main.go b/cmd/ipfs-cluster-ctl/main.go index 56a5bec7..05d8e997 100644 --- a/cmd/ipfs-cluster-ctl/main.go +++ b/cmd/ipfs-cluster-ctl/main.go @@ -14,13 +14,13 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/api/rest/client" - uuid "github.com/satori/go.uuid" + uuid "gx/ipfs/QmcBWojPoNh4qm7zvv4qiepvCnnc7ALS9qcp7TNwwxT1gT/go.uuid" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" - cli "github.com/urfave/cli" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + cli "gx/ipfs/Qmc1AtgBdoUHP8oYSqU81NRYdzohmF45t5XNwVMvhCxsBA/cli" ) const programName = `ipfs-cluster-ctl` diff --git a/cmd/ipfs-cluster-service/daemon.go b/cmd/ipfs-cluster-service/daemon.go index 2b191bd2..b8a8d717 100644 --- a/cmd/ipfs-cluster-service/daemon.go +++ b/cmd/ipfs-cluster-service/daemon.go @@ -8,8 +8,8 @@ import ( "syscall" "time" - host "github.com/libp2p/go-libp2p-host" - "github.com/urfave/cli" + "gx/ipfs/Qmc1AtgBdoUHP8oYSqU81NRYdzohmF45t5XNwVMvhCxsBA/cli" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ipfscluster "github.com/ipfs/ipfs-cluster" "github.com/ipfs/ipfs-cluster/allocator/ascendalloc" @@ -27,7 +27,7 @@ import ( "github.com/ipfs/ipfs-cluster/pstoremgr" "github.com/ipfs/ipfs-cluster/state/mapstate" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" ) func parseBootstraps(flagVal []string) (bootstraps []ma.Multiaddr) { diff --git a/cmd/ipfs-cluster-service/lock.go b/cmd/ipfs-cluster-service/lock.go index fa9ca5fb..30ac578e 100644 --- a/cmd/ipfs-cluster-service/lock.go +++ b/cmd/ipfs-cluster-service/lock.go @@ -6,7 +6,7 @@ import ( "os" "path" - fslock "github.com/ipfs/go-fs-lock" + fslock "gx/ipfs/Qmc4w3gm2TqoEbTYjpPs5FXP8DEB6cuvZWPy6bUTKiht7a/go-fs-lock" ) // lock logic heavily inspired by go-ipfs/repo/fsrepo/lock/lock.go diff --git a/cmd/ipfs-cluster-service/main.go b/cmd/ipfs-cluster-service/main.go index f5728c30..8b312018 100644 --- a/cmd/ipfs-cluster-service/main.go +++ b/cmd/ipfs-cluster-service/main.go @@ -14,9 +14,9 @@ import ( ipfscluster "github.com/ipfs/ipfs-cluster" "github.com/ipfs/ipfs-cluster/state/mapstate" - semver "github.com/blang/semver" - logging "github.com/ipfs/go-log" - cli "github.com/urfave/cli" + semver "gx/ipfs/QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG/semver" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + cli "gx/ipfs/Qmc1AtgBdoUHP8oYSqU81NRYdzohmF45t5XNwVMvhCxsBA/cli" ) // ProgramName of this application diff --git a/config/config.go b/config/config.go index cc79aa83..d489e5ce 100644 --- a/config/config.go +++ b/config/config.go @@ -13,7 +13,7 @@ import ( "sync" "time" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("config") diff --git a/connect_graph.go b/connect_graph.go index 3a7877dc..e18550c8 100644 --- a/connect_graph.go +++ b/connect_graph.go @@ -1,7 +1,7 @@ package ipfscluster import ( - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/rpcutil" diff --git a/consensus/raft/config.go b/consensus/raft/config.go index 32d99dce..d96dd623 100644 --- a/consensus/raft/config.go +++ b/consensus/raft/config.go @@ -10,8 +10,8 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/config" - hraft "github.com/hashicorp/raft" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + hraft "gx/ipfs/QmWh13Q23jcK2okVexqB49r8DsAKsC3etMgkp8b5ABj9wR/raft" ) // ConfigKey is the default configuration key for holding this component's diff --git a/consensus/raft/config_test.go b/consensus/raft/config_test.go index b826a2e2..08c2ed73 100644 --- a/consensus/raft/config_test.go +++ b/consensus/raft/config_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - hraft "github.com/hashicorp/raft" + hraft "gx/ipfs/QmWh13Q23jcK2okVexqB49r8DsAKsC3etMgkp8b5ABj9wR/raft" ) var cfgJSON = []byte(` diff --git a/consensus/raft/consensus.go b/consensus/raft/consensus.go index 2968099b..d861d232 100644 --- a/consensus/raft/consensus.go +++ b/consensus/raft/consensus.go @@ -13,13 +13,13 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/state" - logging "github.com/ipfs/go-log" - consensus "github.com/libp2p/go-libp2p-consensus" - rpc "github.com/libp2p/go-libp2p-gorpc" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - libp2praft "github.com/libp2p/go-libp2p-raft" - ma "github.com/multiformats/go-multiaddr" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + consensus "gx/ipfs/QmZ88KbrvZMJpXaNwAGffswcYKz8EbeafzAFGMCA6MEZKt/go-libp2p-consensus" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + libp2praft "gx/ipfs/Qmc2WbBR7qA8tYfXwEQKgiHWNn3tZS3e2BhaqqsPoghzYP/go-libp2p-raft" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) var logger = logging.Logger("consensus") diff --git a/consensus/raft/consensus_test.go b/consensus/raft/consensus_test.go index b5b85f11..7fc85941 100644 --- a/consensus/raft/consensus_test.go +++ b/consensus/raft/consensus_test.go @@ -11,10 +11,10 @@ import ( "github.com/ipfs/ipfs-cluster/state/mapstate" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - libp2p "github.com/libp2p/go-libp2p" - host "github.com/libp2p/go-libp2p-host" - peerstore "github.com/libp2p/go-libp2p-peerstore" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) func cleanRaft(idn int) { diff --git a/consensus/raft/log_op.go b/consensus/raft/log_op.go index f9a10e51..e9dbc145 100644 --- a/consensus/raft/log_op.go +++ b/consensus/raft/log_op.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/state" - consensus "github.com/libp2p/go-libp2p-consensus" + consensus "gx/ipfs/QmZ88KbrvZMJpXaNwAGffswcYKz8EbeafzAFGMCA6MEZKt/go-libp2p-consensus" ) // Type of consensus operation diff --git a/consensus/raft/log_op_test.go b/consensus/raft/log_op_test.go index 2ba875e0..39f05641 100644 --- a/consensus/raft/log_op_test.go +++ b/consensus/raft/log_op_test.go @@ -3,7 +3,7 @@ package raft import ( "testing" - cid "github.com/ipfs/go-cid" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/state/mapstate" diff --git a/consensus/raft/logging.go b/consensus/raft/logging.go index 33440b62..152b8429 100644 --- a/consensus/raft/logging.go +++ b/consensus/raft/logging.go @@ -5,7 +5,7 @@ import ( "strings" "time" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) const ( diff --git a/consensus/raft/raft.go b/consensus/raft/raft.go index 1ad4f7e3..2a7b079c 100644 --- a/consensus/raft/raft.go +++ b/consensus/raft/raft.go @@ -9,11 +9,11 @@ import ( "path/filepath" "time" - hraft "github.com/hashicorp/raft" - raftboltdb "github.com/hashicorp/raft-boltdb" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - p2praft "github.com/libp2p/go-libp2p-raft" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + hraft "gx/ipfs/QmWh13Q23jcK2okVexqB49r8DsAKsC3etMgkp8b5ABj9wR/raft" + raftboltdb "gx/ipfs/QmZa48BnsaEMVNf1hT2HYP2ak97fqyTnadXu6xSu2Y8xui/raft-boltdb" + p2praft "gx/ipfs/Qmc2WbBR7qA8tYfXwEQKgiHWNn3tZS3e2BhaqqsPoghzYP/go-libp2p-raft" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" "github.com/ipfs/ipfs-cluster/state" ) diff --git a/informer/disk/disk.go b/informer/disk/disk.go index 67c951ee..b11e6a1f 100644 --- a/informer/disk/disk.go +++ b/informer/disk/disk.go @@ -5,8 +5,8 @@ package disk import ( "fmt" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/informer/disk/disk_test.go b/informer/disk/disk_test.go index e8a24346..dd4f3206 100644 --- a/informer/disk/disk_test.go +++ b/informer/disk/disk_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - rpc "github.com/libp2p/go-libp2p-gorpc" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/informer/numpin/numpin.go b/informer/numpin/numpin.go index 0e026b3e..5a7d857b 100644 --- a/informer/numpin/numpin.go +++ b/informer/numpin/numpin.go @@ -5,7 +5,7 @@ package numpin import ( "fmt" - rpc "github.com/libp2p/go-libp2p-gorpc" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/informer/numpin/numpin_test.go b/informer/numpin/numpin_test.go index 406a656c..0db0103f 100644 --- a/informer/numpin/numpin_test.go +++ b/informer/numpin/numpin_test.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - rpc "github.com/libp2p/go-libp2p-gorpc" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" ) type mockService struct{} diff --git a/ipfscluster.go b/ipfscluster.go index b73a9e49..1dbc46ae 100644 --- a/ipfscluster.go +++ b/ipfscluster.go @@ -14,9 +14,9 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/state" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // Component represents a piece of ipfscluster. Cluster components diff --git a/ipfscluster_test.go b/ipfscluster_test.go index d251324f..6b243ab9 100644 --- a/ipfscluster_test.go +++ b/ipfscluster_test.go @@ -27,12 +27,12 @@ import ( "github.com/ipfs/ipfs-cluster/state/mapstate" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - crypto "github.com/libp2p/go-libp2p-crypto" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - peerstore "github.com/libp2p/go-libp2p-peerstore" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) var ( diff --git a/ipfsconn/ipfshttp/config.go b/ipfsconn/ipfshttp/config.go index 1edd398f..e1a192bd 100644 --- a/ipfsconn/ipfshttp/config.go +++ b/ipfsconn/ipfshttp/config.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/ipfs-cluster/config" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" ) const configKey = "ipfshttp" diff --git a/ipfsconn/ipfshttp/ipfshttp.go b/ipfsconn/ipfshttp/ipfshttp.go index 33b45b2c..ac57b4ea 100644 --- a/ipfsconn/ipfshttp/ipfshttp.go +++ b/ipfsconn/ipfshttp/ipfshttp.go @@ -16,14 +16,14 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - files "github.com/ipfs/go-ipfs-files" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" - madns "github.com/multiformats/go-multiaddr-dns" - manet "github.com/multiformats/go-multiaddr-net" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + manet "gx/ipfs/Qmaabb1tJZ2CX5cp6MuuiGgns71NYoxdgQP6Xdid1dVceC/go-multiaddr-net" + madns "gx/ipfs/QmeHJXPqCNzSFbVkYM1uQLuM2L5FyJB9zukQ7EeqRP8ZC9/go-multiaddr-dns" ) // DNSTimeout is used when resolving DNS multiaddresses in this module diff --git a/ipfsconn/ipfshttp/ipfshttp_test.go b/ipfsconn/ipfshttp/ipfshttp_test.go index d74a2dc5..7f5f5a42 100644 --- a/ipfsconn/ipfshttp/ipfshttp_test.go +++ b/ipfsconn/ipfshttp/ipfshttp_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/logging.go b/logging.go index bb0e05a1..21a45847 100644 --- a/logging.go +++ b/logging.go @@ -1,6 +1,6 @@ package ipfscluster -import logging "github.com/ipfs/go-log" +import logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" var logger = logging.Logger("cluster") diff --git a/monitor/basic/peer_monitor.go b/monitor/basic/peer_monitor.go index 988038a1..0998dac0 100644 --- a/monitor/basic/peer_monitor.go +++ b/monitor/basic/peer_monitor.go @@ -14,9 +14,9 @@ import ( "github.com/ipfs/ipfs-cluster/monitor/metrics" "github.com/ipfs/ipfs-cluster/rpcutil" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("monitor") diff --git a/monitor/basic/peer_monitor_test.go b/monitor/basic/peer_monitor_test.go index e1dff84c..74af6edc 100644 --- a/monitor/basic/peer_monitor_test.go +++ b/monitor/basic/peer_monitor_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - libp2p "github.com/libp2p/go-libp2p" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" - host "github.com/libp2p/go-libp2p-host" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/monitor/metrics/checker.go b/monitor/metrics/checker.go index a6e24ecf..fee3db15 100644 --- a/monitor/metrics/checker.go +++ b/monitor/metrics/checker.go @@ -7,7 +7,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // AlertChannelCap specifies how much buffer the alerts channel has. diff --git a/monitor/metrics/checker_test.go b/monitor/metrics/checker_test.go index 45e41841..720c17b9 100644 --- a/monitor/metrics/checker_test.go +++ b/monitor/metrics/checker_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/monitor/metrics/store.go b/monitor/metrics/store.go index 1bc1683c..ab6961d3 100644 --- a/monitor/metrics/store.go +++ b/monitor/metrics/store.go @@ -5,7 +5,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // PeerMetrics maps a peer IDs to a metrics window. diff --git a/monitor/metrics/util.go b/monitor/metrics/util.go index 79c77931..dacd098a 100644 --- a/monitor/metrics/util.go +++ b/monitor/metrics/util.go @@ -3,7 +3,7 @@ package metrics import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // PeersetFilter removes all metrics not belonging to the given diff --git a/monitor/pubsubmon/pubsubmon.go b/monitor/pubsubmon/pubsubmon.go index 617d948b..ad9656ee 100644 --- a/monitor/pubsubmon/pubsubmon.go +++ b/monitor/pubsubmon/pubsubmon.go @@ -11,12 +11,12 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/monitor/metrics" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - pubsub "github.com/libp2p/go-libp2p-pubsub" - msgpack "github.com/multiformats/go-multicodec/msgpack" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + msgpack "gx/ipfs/QmYMiyZRYDmhMr2phMc4FGrYbsyzvR751BgeobnWroiq2z/go-multicodec/msgpack" + pubsub "gx/ipfs/QmYmrxfax5xGfLF6SL2Bq7SDEzFZFyNcLvGi8ExdC5iiko/go-libp2p-pubsub" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) var logger = logging.Logger("monitor") diff --git a/monitor/pubsubmon/pubsubmon_test.go b/monitor/pubsubmon/pubsubmon_test.go index eb12b290..778a0e0e 100644 --- a/monitor/pubsubmon/pubsubmon_test.go +++ b/monitor/pubsubmon/pubsubmon_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - libp2p "github.com/libp2p/go-libp2p" - peer "github.com/libp2p/go-libp2p-peer" - peerstore "github.com/libp2p/go-libp2p-peerstore" - pubsub "github.com/libp2p/go-libp2p-pubsub" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" + pubsub "gx/ipfs/QmYmrxfax5xGfLF6SL2Bq7SDEzFZFyNcLvGi8ExdC5iiko/go-libp2p-pubsub" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/peer_manager_test.go b/peer_manager_test.go index 9b6859ca..58c2a385 100644 --- a/peer_manager_test.go +++ b/peer_manager_test.go @@ -10,10 +10,10 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" - peerstore "github.com/libp2p/go-libp2p-peerstore" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" ) func peerManagerClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) { diff --git a/pintracker/maptracker/maptracker.go b/pintracker/maptracker/maptracker.go index 875b8ca4..9354965c 100644 --- a/pintracker/maptracker/maptracker.go +++ b/pintracker/maptracker/maptracker.go @@ -11,10 +11,10 @@ import ( "github.com/ipfs/ipfs-cluster/pintracker/optracker" "github.com/ipfs/ipfs-cluster/pintracker/util" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("pintracker") diff --git a/pintracker/maptracker/maptracker_test.go b/pintracker/maptracker/maptracker_test.go index 2b2c5c77..560c4c6b 100644 --- a/pintracker/maptracker/maptracker_test.go +++ b/pintracker/maptracker/maptracker_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/pintracker/optracker/operation.go b/pintracker/optracker/operation.go index 321cd1f8..a9ff1202 100644 --- a/pintracker/optracker/operation.go +++ b/pintracker/optracker/operation.go @@ -5,7 +5,7 @@ import ( "sync" "time" - cid "github.com/ipfs/go-cid" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/pintracker/optracker/operationtracker.go b/pintracker/optracker/operationtracker.go index 43902264..e18775a1 100644 --- a/pintracker/optracker/operationtracker.go +++ b/pintracker/optracker/operationtracker.go @@ -12,9 +12,9 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("optracker") diff --git a/pintracker/pintracker_test.go b/pintracker/pintracker_test.go index 11ffa997..4aa50b32 100644 --- a/pintracker/pintracker_test.go +++ b/pintracker/pintracker_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ipfscluster "github.com/ipfs/ipfs-cluster" "github.com/ipfs/ipfs-cluster/api" @@ -17,8 +17,8 @@ import ( "github.com/ipfs/ipfs-cluster/pintracker/stateless" "github.com/ipfs/ipfs-cluster/test" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" ) var ( diff --git a/pintracker/stateless/stateless.go b/pintracker/stateless/stateless.go index 6fe05258..d1a1cdf5 100644 --- a/pintracker/stateless/stateless.go +++ b/pintracker/stateless/stateless.go @@ -12,10 +12,10 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/pintracker/optracker" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" - rpc "github.com/libp2p/go-libp2p-gorpc" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" ) var logger = logging.Logger("pintracker") diff --git a/pintracker/stateless/stateless_test.go b/pintracker/stateless/stateless_test.go index 8f94fb61..96845a21 100644 --- a/pintracker/stateless/stateless_test.go +++ b/pintracker/stateless/stateless_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/test" diff --git a/pintracker/util/pin.go b/pintracker/util/pin.go index 62f8f4ce..e6b6d183 100644 --- a/pintracker/util/pin.go +++ b/pintracker/util/pin.go @@ -3,7 +3,7 @@ package util import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // IsRemotePin determines whether a Pin's ReplicationFactor has diff --git a/pstoremgr/pstoremgr.go b/pstoremgr/pstoremgr.go index abc8e5eb..2560f4ed 100644 --- a/pstoremgr/pstoremgr.go +++ b/pstoremgr/pstoremgr.go @@ -15,12 +15,12 @@ import ( "github.com/ipfs/ipfs-cluster/api" - logging "github.com/ipfs/go-log" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - peerstore "github.com/libp2p/go-libp2p-peerstore" - ma "github.com/multiformats/go-multiaddr" - madns "github.com/multiformats/go-multiaddr-dns" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + peerstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" + madns "gx/ipfs/QmeHJXPqCNzSFbVkYM1uQLuM2L5FyJB9zukQ7EeqRP8ZC9/go-multiaddr-dns" ) var logger = logging.Logger("pstoremgr") diff --git a/pstoremgr/pstoremgr_test.go b/pstoremgr/pstoremgr_test.go index 40bd764b..530eb3bb 100644 --- a/pstoremgr/pstoremgr_test.go +++ b/pstoremgr/pstoremgr_test.go @@ -7,8 +7,8 @@ import ( "github.com/ipfs/ipfs-cluster/api" - libp2p "github.com/libp2p/go-libp2p" - ma "github.com/multiformats/go-multiaddr" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + libp2p "gx/ipfs/QmUDTcnDp2WssbmiDLC6aYurUeyt7QeRakHUQMxA2mZ5iB/go-libp2p" ) var pid = "QmXZrtE5jQwXNqCJMfHUTQkvhQ4ZAnqMnmzFMJfLewuabc" diff --git a/rpc_api.go b/rpc_api.go index c5a2c703..5db9a322 100644 --- a/rpc_api.go +++ b/rpc_api.go @@ -3,7 +3,7 @@ package ipfscluster import ( "context" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/rpcutil/rpcutil.go b/rpcutil/rpcutil.go index c4a6f78b..02d8a7a7 100644 --- a/rpcutil/rpcutil.go +++ b/rpcutil/rpcutil.go @@ -10,7 +10,7 @@ import ( "github.com/ipfs/ipfs-cluster/api" - peer "github.com/libp2p/go-libp2p-peer" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // CtxsWithTimeout returns n contexts, derived from the given parent diff --git a/state/interface.go b/state/interface.go index 834d56e6..3180a403 100644 --- a/state/interface.go +++ b/state/interface.go @@ -6,7 +6,7 @@ package state import ( "io" - cid "github.com/ipfs/go-cid" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/state/mapstate/map_state.go b/state/mapstate/map_state.go index aea983cc..6dabda75 100644 --- a/state/mapstate/map_state.go +++ b/state/mapstate/map_state.go @@ -9,10 +9,10 @@ import ( "io/ioutil" "sync" - msgpack "github.com/multiformats/go-multicodec/msgpack" + msgpack "gx/ipfs/QmYMiyZRYDmhMr2phMc4FGrYbsyzvR751BgeobnWroiq2z/go-multicodec/msgpack" - cid "github.com/ipfs/go-cid" - logging "github.com/ipfs/go-log" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + logging "gx/ipfs/QmZChCsSt8DctjceaL56Eibc29CVQq4dGKRXC5JRZ6Ppae/go-log" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/state/mapstate/map_state_test.go b/state/mapstate/map_state_test.go index fd06983b..6e459e65 100644 --- a/state/mapstate/map_state_test.go +++ b/state/mapstate/map_state_test.go @@ -4,10 +4,10 @@ import ( "bytes" "testing" - msgpack "github.com/multiformats/go-multicodec/msgpack" + msgpack "gx/ipfs/QmYMiyZRYDmhMr2phMc4FGrYbsyzvR751BgeobnWroiq2z/go-multicodec/msgpack" - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/state/mapstate/migrate.go b/state/mapstate/migrate.go index 7970e981..ac2faf4b 100644 --- a/state/mapstate/migrate.go +++ b/state/mapstate/migrate.go @@ -9,7 +9,7 @@ import ( "bytes" "errors" - msgpack "github.com/multiformats/go-multicodec/msgpack" + msgpack "gx/ipfs/QmYMiyZRYDmhMr2phMc4FGrYbsyzvR751BgeobnWroiq2z/go-multicodec/msgpack" "github.com/ipfs/ipfs-cluster/api" ) diff --git a/test/cids.go b/test/cids.go index 55e43285..2d98962a 100644 --- a/test/cids.go +++ b/test/cids.go @@ -1,8 +1,8 @@ package test import ( - cid "github.com/ipfs/go-cid" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" ) // Common variables used all around tests. diff --git a/test/ipfs_mock.go b/test/ipfs_mock.go index 573aa723..6d0e57a6 100644 --- a/test/ipfs_mock.go +++ b/test/ipfs_mock.go @@ -13,8 +13,8 @@ import ( "github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/state/mapstate" - cid "github.com/ipfs/go-cid" - u "github.com/ipfs/go-ipfs-util" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ) // IpfsMock is an ipfs daemon mock which should sustain the functionality used by ipfscluster. diff --git a/test/rpc_api_mock.go b/test/rpc_api_mock.go index 0a3e120c..42ddf1be 100644 --- a/test/rpc_api_mock.go +++ b/test/rpc_api_mock.go @@ -8,10 +8,10 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - rpc "github.com/libp2p/go-libp2p-gorpc" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + rpc "gx/ipfs/QmPYiV9nwnXPxdn9zDgY4d9yaHwTS414sUb1K6nvQVHqqo/go-libp2p-gorpc" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) // ErrBadCid is returned when using ErrorCid. Operations with that CID always diff --git a/test/sharding.go b/test/sharding.go index 078624a4..c76262d1 100644 --- a/test/sharding.go +++ b/test/sharding.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - files "github.com/ipfs/go-ipfs-files" + files "gx/ipfs/QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6/go-ipfs-files" ) const shardingTestDir = "shardTesting" @@ -123,6 +123,8 @@ func (sth *ShardingTestHelper) GetRandFileMultiReader(t *testing.T, kbs int) (*f return files.NewMultiFileReader(slf, true), sf } +// GetRandFileReader creates and returns a directory containing a testing +// random file of the given size (in kbs) func (sth *ShardingTestHelper) GetRandFileReader(t *testing.T, kbs int) (files.Directory, io.Closer) { st := sth.makeRandFile(t, kbs) sf, err := files.NewSerialFile(sth.path(shardingTestFile), false, st) diff --git a/util.go b/util.go index ad5ff099..c747c797 100644 --- a/util.go +++ b/util.go @@ -6,10 +6,10 @@ import ( "github.com/ipfs/ipfs-cluster/api" - cid "github.com/ipfs/go-cid" - host "github.com/libp2p/go-libp2p-host" - peer "github.com/libp2p/go-libp2p-peer" - ma "github.com/multiformats/go-multiaddr" + cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr" + peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer" + host "gx/ipfs/QmdJfsSbKSZnMkfZ1kpopiyB9i3Hd6cp8VKWZmtWPa7Moc/go-libp2p-host" ) // PeersFromMultiaddrs returns all the different peers in the given addresses. diff --git a/version.go b/version.go index 5f05f0fc..2b7967f3 100644 --- a/version.go +++ b/version.go @@ -3,8 +3,8 @@ package ipfscluster import ( "fmt" - semver "github.com/blang/semver" - protocol "github.com/libp2p/go-libp2p-protocol" + semver "gx/ipfs/QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG/semver" + protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" ) // Version is the current cluster version. Version alignment between