From 9e98ed6c38515eb075c9b2e220388527602b6b1e Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 24 Oct 2016 20:39:27 -0700 Subject: [PATCH] update to new cid and ipld node packages License: MIT Signed-off-by: Jeromy --- assets/assets.go | 2 +- blocks/blocks.go | 2 +- blocks/blocks_test.go | 2 +- blocks/blockstore/arc_cache.go | 2 +- blocks/blockstore/arc_cache_test.go | 2 +- blocks/blockstore/blockstore.go | 2 +- blocks/blockstore/blockstore_test.go | 2 +- blocks/blockstore/bloom_cache.go | 2 +- blocks/blockstore/util/remove.go | 2 +- blocks/set/set.go | 2 +- blocks/set/set_test.go | 2 +- blockservice/blockservice.go | 2 +- blockservice/test/blocks_test.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/dht.go | 8 ++++---- core/commands/files/files.go | 2 +- core/commands/ls.go | 2 +- core/commands/object/object.go | 4 ++-- core/commands/pin.go | 2 +- core/commands/pubsub.go | 2 +- core/commands/refs.go | 4 ++-- core/core.go | 6 +++--- core/corehttp/gateway_handler.go | 6 +++--- core/corerepo/gc.go | 2 +- core/corerepo/pinning.go | 4 ++-- core/corerouting/core.go | 2 +- core/coreunix/add.go | 4 ++-- core/coreunix/add_test.go | 3 +-- core/coreunix/metadata.go | 2 +- core/coreunix/metadata_test.go | 2 +- core/pathresolver.go | 6 +++--- exchange/bitswap/bitswap.go | 2 +- exchange/bitswap/bitswap_test.go | 2 +- exchange/bitswap/decision/bench_test.go | 2 +- exchange/bitswap/decision/ledger.go | 2 +- exchange/bitswap/decision/peer_request_queue.go | 2 +- .../bitswap/decision/peer_request_queue_test.go | 2 +- exchange/bitswap/message/message.go | 2 +- exchange/bitswap/message/message_test.go | 2 +- exchange/bitswap/network/interface.go | 2 +- exchange/bitswap/network/ipfs_impl.go | 4 ++-- exchange/bitswap/notifications/notifications.go | 2 +- .../bitswap/notifications/notifications_test.go | 2 +- exchange/bitswap/stat.go | 2 +- exchange/bitswap/testnet/virtual.go | 4 ++-- exchange/bitswap/wantlist/wantlist.go | 2 +- exchange/bitswap/wantmanager.go | 2 +- exchange/bitswap/workers.go | 2 +- exchange/interface.go | 2 +- exchange/offline/offline.go | 2 +- exchange/offline/offline_test.go | 2 +- exchange/reprovide/reprovide.go | 2 +- fuse/ipns/ipns_unix.go | 2 +- fuse/readonly/ipfs_test.go | 4 ++-- importer/balanced/builder.go | 2 +- importer/helpers/dagbuilder.go | 2 +- importer/helpers/helpers.go | 2 +- importer/importer.go | 2 +- importer/importer_test.go | 2 +- importer/trickle/trickledag.go | 2 +- merkledag/coding.go | 4 ++-- merkledag/merkledag.go | 4 ++-- merkledag/merkledag_test.go | 4 ++-- merkledag/node.go | 10 +++++++--- merkledag/node_test.go | 2 +- merkledag/raw.go | 10 +++++++--- merkledag/traverse/traverse.go | 2 +- merkledag/traverse/traverse_test.go | 2 +- merkledag/utils/diff.go | 2 +- merkledag/utils/utils.go | 2 +- merkledag/utils/utils_test.go | 2 +- mfs/dir.go | 2 +- mfs/file.go | 2 +- mfs/mfs_test.go | 4 ++-- mfs/ops.go | 2 +- mfs/repub_test.go | 2 +- mfs/system.go | 4 ++-- namesys/namesys.go | 2 +- namesys/publisher.go | 2 +- namesys/republisher/repub.go | 2 +- namesys/routing.go | 4 ++-- package.json | 17 +++++++++++------ path/path.go | 2 +- path/resolver.go | 6 +++--- path/resolver_test.go | 2 +- pin/gc/gc.go | 2 +- pin/pin.go | 4 ++-- pin/pin_test.go | 2 +- pin/set.go | 4 ++-- pin/set_test.go | 2 +- routing/mock/centralized_client.go | 4 ++-- routing/mock/centralized_server.go | 2 +- routing/mock/centralized_test.go | 2 +- routing/mock/dht.go | 2 +- routing/mock/interface.go | 4 ++-- routing/none/none_client.go | 4 ++-- routing/offline/offline.go | 4 ++-- routing/supernode/client.go | 6 +++--- routing/supernode/proxy/loopback.go | 2 +- routing/supernode/proxy/standard.go | 2 +- routing/supernode/server.go | 2 +- routing/supernode/server_test.go | 2 +- tar/format.go | 2 +- test/integration/bitswap_wo_routing_test.go | 2 +- thirdparty/ds-help/key.go | 2 +- thirdparty/posinfo/posinfo.go | 2 +- unixfs/io/dagreader.go | 2 +- unixfs/io/dirbuilder.go | 2 +- unixfs/mod/dagmodifier.go | 4 ++-- unixfs/test/utils.go | 2 +- 111 files changed, 166 insertions(+), 154 deletions(-) diff --git a/assets/assets.go b/assets/assets.go index cdfea5cf5149..0036a9df7a82 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/core/coreunix" uio "github.com/ipfs/go-ipfs/unixfs/io" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) // initDocPaths lists the paths for the docs we want to seed during --init diff --git a/blocks/blocks.go b/blocks/blocks.go index ff125367f1de..ecec2eaba2da 100644 --- a/blocks/blocks.go +++ b/blocks/blocks.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/blocks/blocks_test.go b/blocks/blocks_test.go index 031210b9a6c8..86a8fd92025e 100644 --- a/blocks/blocks_test.go +++ b/blocks/blocks_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/blocks/blockstore/arc_cache.go b/blocks/blockstore/arc_cache.go index 03fa3fe0c3f1..c92c05bb2b68 100644 --- a/blocks/blockstore/arc_cache.go +++ b/blocks/blockstore/arc_cache.go @@ -5,9 +5,9 @@ import ( "github.com/ipfs/go-ipfs/blocks" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface" lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" ) diff --git a/blocks/blockstore/arc_cache_test.go b/blocks/blockstore/arc_cache_test.go index 42d388a16a3c..a633f9d354bf 100644 --- a/blocks/blockstore/arc_cache_test.go +++ b/blocks/blockstore/arc_cache_test.go @@ -6,7 +6,7 @@ import ( "github.com/ipfs/go-ipfs/blocks" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" ) diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go index b607bfc098b7..88787e312186 100644 --- a/blocks/blockstore/blockstore.go +++ b/blocks/blockstore/blockstore.go @@ -11,8 +11,8 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dsns "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/namespace" dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query" diff --git a/blocks/blockstore/blockstore_test.go b/blocks/blockstore/blockstore_test.go index 4c1a4db88155..f2c830c3beff 100644 --- a/blocks/blockstore/blockstore_test.go +++ b/blocks/blockstore/blockstore_test.go @@ -9,7 +9,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query" diff --git a/blocks/blockstore/bloom_cache.go b/blocks/blockstore/bloom_cache.go index 7f6066ace5bf..37024e56822d 100644 --- a/blocks/blockstore/bloom_cache.go +++ b/blocks/blockstore/bloom_cache.go @@ -7,8 +7,8 @@ import ( "github.com/ipfs/go-ipfs/blocks" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" bloom "gx/ipfs/QmeiMCBkYHxkDkDfnDadzz4YxY5ruL5Pj499essE4vRsGM/bbloom" ) diff --git a/blocks/blockstore/util/remove.go b/blocks/blockstore/util/remove.go index b3fd7501ee33..f52b860465a0 100644 --- a/blocks/blockstore/util/remove.go +++ b/blocks/blockstore/util/remove.go @@ -6,7 +6,7 @@ import ( bs "github.com/ipfs/go-ipfs/blocks/blockstore" "github.com/ipfs/go-ipfs/pin" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" ) diff --git a/blocks/set/set.go b/blocks/set/set.go index 36eba94974cc..872d99fd605e 100644 --- a/blocks/set/set.go +++ b/blocks/set/set.go @@ -3,8 +3,8 @@ package set import ( "github.com/ipfs/go-ipfs/blocks/bloom" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ) var log = logging.Logger("blockset") diff --git a/blocks/set/set_test.go b/blocks/set/set_test.go index f0ff221892fc..43348382bab8 100644 --- a/blocks/set/set_test.go +++ b/blocks/set/set_test.go @@ -5,7 +5,7 @@ import ( bu "github.com/ipfs/go-ipfs/blocks/blocksutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) const ( diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go index 675bb9751575..c8825555d569 100644 --- a/blockservice/blockservice.go +++ b/blockservice/blockservice.go @@ -12,8 +12,8 @@ import ( "github.com/ipfs/go-ipfs/blocks/blockstore" exchange "github.com/ipfs/go-ipfs/exchange" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ) var log = logging.Logger("blockservice") diff --git a/blockservice/test/blocks_test.go b/blockservice/test/blocks_test.go index 956420da283d..b8518c4d8750 100644 --- a/blockservice/test/blocks_test.go +++ b/blockservice/test/blocks_test.go @@ -12,7 +12,7 @@ import ( . "github.com/ipfs/go-ipfs/blockservice" offline "github.com/ipfs/go-ipfs/exchange/offline" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index e57ecb21b8e9..194f8a91cb5c 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -9,8 +9,8 @@ import ( bitswap "github.com/ipfs/go-ipfs/exchange/bitswap" decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/core/commands/block.go b/core/commands/block.go index 7c93c9dd1a27..dcc25cce98bd 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-ipfs/blocks" util "github.com/ipfs/go-ipfs/blocks/blockstore/util" cmds "github.com/ipfs/go-ipfs/commands" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/core/commands/dht.go b/core/commands/dht.go index e90daaa0944b..2529a68c8137 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -12,13 +12,13 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" - notif "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing/notifications" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" + notif "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing/notifications" b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" - ipdht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" + ipdht "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/core/commands/files/files.go b/core/commands/files/files.go index 2445dfd388a4..b4b07f91d004 100644 --- a/core/commands/files/files.go +++ b/core/commands/files/files.go @@ -17,8 +17,8 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var log = logging.Logger("cmds/files") diff --git a/core/commands/ls.go b/core/commands/ls.go index e2546699fa71..ce87e6c04c7c 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -13,7 +13,7 @@ import ( unixfs "github.com/ipfs/go-ipfs/unixfs" unixfspb "github.com/ipfs/go-ipfs/unixfs/pb" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) type LsLink struct { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 6f2f2d291224..7cfaa97421d8 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -18,8 +18,8 @@ import ( path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) // ErrObjectTooLarge is returned when too much data was read from stdin. current limit 2m diff --git a/core/commands/pin.go b/core/commands/pin.go index ef10fbdb1f23..aadb6c66c773 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -13,7 +13,7 @@ import ( pin "github.com/ipfs/go-ipfs/pin" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 5385faf8ea65..8a1a294ff042 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -13,8 +13,8 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" floodsub "gx/ipfs/QmTgcWwxttM74AY7UYA6qMP9WpzfBEjbZntx7ZWLttRMJJ/floodsub" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/core/commands/refs.go b/core/commands/refs.go index 3cd23291596c..08a58a5e859b 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -12,8 +12,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/core/core.go b/core/core.go index 46e0d954bd17..3b3fff578a8d 100644 --- a/core/core.go +++ b/core/core.go @@ -19,6 +19,7 @@ import ( diag "github.com/ipfs/go-ipfs/diagnostics" context "context" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" @@ -27,7 +28,6 @@ import ( ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr" addrutil "gx/ipfs/QmVDnc2zvyQm8LhT72n22THcshvH7j3qPMnhvjerQER62T/go-addr-util" metrics "gx/ipfs/QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF/go-libp2p-metrics" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" discovery "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/discovery" @@ -41,8 +41,8 @@ import ( nilrouting "github.com/ipfs/go-ipfs/routing/none" offroute "github.com/ipfs/go-ipfs/routing/offline" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" - dht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" + dht "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht" bstore "github.com/ipfs/go-ipfs/blocks/blockstore" bserv "github.com/ipfs/go-ipfs/blockservice" diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go index 3e71129dcf64..11a035e23577 100644 --- a/core/corehttp/gateway_handler.go +++ b/core/corehttp/gateway_handler.go @@ -19,10 +19,10 @@ import ( path "github.com/ipfs/go-ipfs/path" uio "github.com/ipfs/go-ipfs/unixfs/io" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" ) const ( diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go index 98394299dfe5..2d914057c71c 100644 --- a/core/corerepo/gc.go +++ b/core/corerepo/gc.go @@ -10,9 +10,9 @@ import ( gc "github.com/ipfs/go-ipfs/pin/gc" repo "github.com/ipfs/go-ipfs/repo" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ) var log = logging.Logger("corerepo") diff --git a/core/corerepo/pinning.go b/core/corerepo/pinning.go index 41ade74e94ab..0cab9876a269 100644 --- a/core/corerepo/pinning.go +++ b/core/corerepo/pinning.go @@ -20,8 +20,8 @@ import ( "github.com/ipfs/go-ipfs/core" path "github.com/ipfs/go-ipfs/path" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]*cid.Cid, error) { diff --git a/core/corerouting/core.go b/core/corerouting/core.go index 2b9d2c979c38..d468ce0b8cc7 100644 --- a/core/corerouting/core.go +++ b/core/corerouting/core.go @@ -8,7 +8,7 @@ import ( repo "github.com/ipfs/go-ipfs/repo" supernode "github.com/ipfs/go-ipfs/routing/supernode" gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host" diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 275ab1c95b4c..2d76f54696cd 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -23,9 +23,9 @@ import ( "github.com/ipfs/go-ipfs/pin" unixfs "github.com/ipfs/go-ipfs/unixfs" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" ) diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index fbfab82ea772..86e5f0640ac0 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -22,7 +22,7 @@ import ( pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" "github.com/ipfs/go-ipfs/thirdparty/testutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func TestAddRecursive(t *testing.T) { @@ -227,7 +227,6 @@ func TestAddWPosInfoAndRawLeafs(t *testing.T) { testAddWPosInfo(t, true) } - type testBlockstore struct { blockstore.GCBlockstore expectedPath string diff --git a/core/coreunix/metadata.go b/core/coreunix/metadata.go index 19a1886bea0f..28688ff3e2d8 100644 --- a/core/coreunix/metadata.go +++ b/core/coreunix/metadata.go @@ -4,7 +4,7 @@ import ( core "github.com/ipfs/go-ipfs/core" dag "github.com/ipfs/go-ipfs/merkledag" ft "github.com/ipfs/go-ipfs/unixfs" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) { diff --git a/core/coreunix/metadata_test.go b/core/coreunix/metadata_test.go index c13a820758b5..471dd0735e3b 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -16,7 +16,7 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/core/pathresolver.go b/core/pathresolver.go index 8bcf011695fe..a45eca94d656 100644 --- a/core/pathresolver.go +++ b/core/pathresolver.go @@ -7,8 +7,8 @@ import ( path "github.com/ipfs/go-ipfs/path" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) // ErrNoNamesys is an explicit error for when an IPFS node doesn't @@ -82,7 +82,7 @@ func ResolveToCid(ctx context.Context, n *IpfsNode, p path.Path) (*cid.Cid, erro } // Extract and return the key of the link to the target dag node. - link, _, err := dagnode.Resolve([]string{tail}) + link, _, err := dagnode.ResolveLink([]string{tail}) if err != nil { return nil, err } diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index fd36f904ab13..4eceb8c035bf 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -19,11 +19,11 @@ import ( flags "github.com/ipfs/go-ipfs/flags" "github.com/ipfs/go-ipfs/thirdparty/delay" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go index ab46e3607f87..5179e6d7df11 100644 --- a/exchange/bitswap/bitswap_test.go +++ b/exchange/bitswap/bitswap_test.go @@ -16,7 +16,7 @@ import ( travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis" detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" p2ptestutil "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/test/util" ) diff --git a/exchange/bitswap/decision/bench_test.go b/exchange/bitswap/decision/bench_test.go index 91515875afd9..18c7df0d7927 100644 --- a/exchange/bitswap/decision/bench_test.go +++ b/exchange/bitswap/decision/bench_test.go @@ -7,7 +7,7 @@ import ( "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" "github.com/ipfs/go-ipfs/thirdparty/testutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/decision/ledger.go b/exchange/bitswap/decision/ledger.go index c6e66451e677..b92c3b0dacb0 100644 --- a/exchange/bitswap/decision/ledger.go +++ b/exchange/bitswap/decision/ledger.go @@ -6,7 +6,7 @@ import ( wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/decision/peer_request_queue.go b/exchange/bitswap/decision/peer_request_queue.go index 63f4426d495f..6d7c4bc5b19e 100644 --- a/exchange/bitswap/decision/peer_request_queue.go +++ b/exchange/bitswap/decision/peer_request_queue.go @@ -7,7 +7,7 @@ import ( wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" pq "github.com/ipfs/go-ipfs/thirdparty/pq" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/decision/peer_request_queue_test.go b/exchange/bitswap/decision/peer_request_queue_test.go index cf991395548f..68d01709efac 100644 --- a/exchange/bitswap/decision/peer_request_queue_test.go +++ b/exchange/bitswap/decision/peer_request_queue_test.go @@ -10,7 +10,7 @@ import ( "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" "github.com/ipfs/go-ipfs/thirdparty/testutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go index ed58541d326f..368f522d5d36 100644 --- a/exchange/bitswap/message/message.go +++ b/exchange/bitswap/message/message.go @@ -8,7 +8,7 @@ import ( pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb" wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net" diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go index 4cfbf8f271df..e02a0d7b7481 100644 --- a/exchange/bitswap/message/message_test.go +++ b/exchange/bitswap/message/message_test.go @@ -8,7 +8,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/exchange/bitswap/network/interface.go b/exchange/bitswap/network/interface.go index 3f61f43fa349..2bd30594c185 100644 --- a/exchange/bitswap/network/interface.go +++ b/exchange/bitswap/network/interface.go @@ -4,7 +4,7 @@ import ( "context" bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go index 2addd37d172f..4ae564751e1e 100644 --- a/exchange/bitswap/network/ipfs_impl.go +++ b/exchange/bitswap/network/ipfs_impl.go @@ -7,10 +7,10 @@ import ( bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host" diff --git a/exchange/bitswap/notifications/notifications.go b/exchange/bitswap/notifications/notifications.go index d56750ee2f25..923a871ffba4 100644 --- a/exchange/bitswap/notifications/notifications.go +++ b/exchange/bitswap/notifications/notifications.go @@ -6,7 +6,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) const bufferSize = 16 diff --git a/exchange/bitswap/notifications/notifications_test.go b/exchange/bitswap/notifications/notifications_test.go index f4fa9b766e26..51247b20e6a0 100644 --- a/exchange/bitswap/notifications/notifications_test.go +++ b/exchange/bitswap/notifications/notifications_test.go @@ -8,7 +8,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func TestDuplicates(t *testing.T) { diff --git a/exchange/bitswap/stat.go b/exchange/bitswap/stat.go index 692794869d53..45b93e566264 100644 --- a/exchange/bitswap/stat.go +++ b/exchange/bitswap/stat.go @@ -3,7 +3,7 @@ package bitswap import ( "sort" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) type Stat struct { diff --git a/exchange/bitswap/testnet/virtual.go b/exchange/bitswap/testnet/virtual.go index 7142aa61f118..9b945dd0f08b 100644 --- a/exchange/bitswap/testnet/virtual.go +++ b/exchange/bitswap/testnet/virtual.go @@ -9,8 +9,8 @@ import ( mockrouting "github.com/ipfs/go-ipfs/routing/mock" delay "github.com/ipfs/go-ipfs/thirdparty/delay" testutil "github.com/ipfs/go-ipfs/thirdparty/testutil" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/wantlist/wantlist.go b/exchange/bitswap/wantlist/wantlist.go index ee6c20f8effd..17b5ed56921d 100644 --- a/exchange/bitswap/wantlist/wantlist.go +++ b/exchange/bitswap/wantlist/wantlist.go @@ -6,7 +6,7 @@ import ( "sort" "sync" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) type ThreadSafe struct { diff --git a/exchange/bitswap/wantmanager.go b/exchange/bitswap/wantmanager.go index 82fab8b0857b..719df89b951c 100644 --- a/exchange/bitswap/wantmanager.go +++ b/exchange/bitswap/wantmanager.go @@ -9,7 +9,7 @@ import ( bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message" bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network" wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/bitswap/workers.go b/exchange/bitswap/workers.go index 3a5184e74741..1c2ffbd088b5 100644 --- a/exchange/bitswap/workers.go +++ b/exchange/bitswap/workers.go @@ -6,10 +6,10 @@ import ( "sync" "time" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/exchange/interface.go b/exchange/interface.go index 24ed382b3aac..b2ee40ff6f8c 100644 --- a/exchange/interface.go +++ b/exchange/interface.go @@ -7,7 +7,7 @@ import ( blocks "github.com/ipfs/go-ipfs/blocks" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) // Any type that implements exchange.Interface may be used as an IPFS block diff --git a/exchange/offline/offline.go b/exchange/offline/offline.go index ba3fa00175f7..8f74812bd25f 100644 --- a/exchange/offline/offline.go +++ b/exchange/offline/offline.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-ipfs/blocks/blockstore" exchange "github.com/ipfs/go-ipfs/exchange" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func Exchange(bs blockstore.Blockstore) exchange.Interface { diff --git a/exchange/offline/offline_test.go b/exchange/offline/offline_test.go index 4befe796d684..21d8b6bff09c 100644 --- a/exchange/offline/offline_test.go +++ b/exchange/offline/offline_test.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-ipfs/blocks/blockstore" "github.com/ipfs/go-ipfs/blocks/blocksutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/exchange/reprovide/reprovide.go b/exchange/reprovide/reprovide.go index 315946411cec..5c01183ab359 100644 --- a/exchange/reprovide/reprovide.go +++ b/exchange/reprovide/reprovide.go @@ -6,8 +6,8 @@ import ( "time" blocks "github.com/ipfs/go-ipfs/blocks/blockstore" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" backoff "gx/ipfs/QmPJUtEJsm5YLUWhF6imvyCH8KZXRJa9Wup7FDMwTy5Ufz/backoff" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ) diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index aea9d88eb54e..d5f44f7c2598 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -19,7 +19,7 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" path "github.com/ipfs/go-ipfs/path" ft "github.com/ipfs/go-ipfs/unixfs" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto" ) diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index 5088c44b1267..932cb86de2df 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -23,8 +23,8 @@ import ( uio "github.com/ipfs/go-ipfs/unixfs/io" fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/importer/balanced/builder.go b/importer/balanced/builder.go index 057126c1c3db..9559b00883f5 100644 --- a/importer/balanced/builder.go +++ b/importer/balanced/builder.go @@ -5,7 +5,7 @@ import ( h "github.com/ipfs/go-ipfs/importer/helpers" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) func BalancedLayout(db *h.DagBuilderHelper) (node.Node, error) { diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go index c2683bd9bf95..87708ae1235b 100644 --- a/importer/helpers/dagbuilder.go +++ b/importer/helpers/dagbuilder.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-ipfs/importer/chunk" dag "github.com/ipfs/go-ipfs/merkledag" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) // DagBuilderHelper wraps together a bunch of objects needed to diff --git a/importer/helpers/helpers.go b/importer/helpers/helpers.go index 1c3921b87b97..197727512067 100644 --- a/importer/helpers/helpers.go +++ b/importer/helpers/helpers.go @@ -10,7 +10,7 @@ import ( pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" ft "github.com/ipfs/go-ipfs/unixfs" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) // BlockSizeLimit specifies the maximum size an imported block can have. diff --git a/importer/importer.go b/importer/importer.go index 92d32cfc8cb5..f4510d2855e4 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -13,8 +13,8 @@ import ( trickle "github.com/ipfs/go-ipfs/importer/trickle" dag "github.com/ipfs/go-ipfs/merkledag" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var log = logging.Logger("importer") diff --git a/importer/importer_test.go b/importer/importer_test.go index cd04fb8dbf33..6dd074f1cfc9 100644 --- a/importer/importer_test.go +++ b/importer/importer_test.go @@ -12,7 +12,7 @@ import ( mdtest "github.com/ipfs/go-ipfs/merkledag/test" uio "github.com/ipfs/go-ipfs/unixfs/io" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/importer/trickle/trickledag.go b/importer/trickle/trickledag.go index 3c6816f6bf8f..65a33a521c8c 100644 --- a/importer/trickle/trickledag.go +++ b/importer/trickle/trickledag.go @@ -9,7 +9,7 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" ft "github.com/ipfs/go-ipfs/unixfs" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) // layerRepeat specifies how many times to append a child tree of a diff --git a/merkledag/coding.go b/merkledag/coding.go index c37a63db5306..585cf7c7590d 100644 --- a/merkledag/coding.go +++ b/merkledag/coding.go @@ -6,8 +6,8 @@ import ( pb "github.com/ipfs/go-ipfs/merkledag/pb" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go index b6a8d8558cde..7fab1c2402f1 100644 --- a/merkledag/merkledag.go +++ b/merkledag/merkledag.go @@ -11,9 +11,9 @@ import ( bserv "github.com/ipfs/go-ipfs/blockservice" offline "github.com/ipfs/go-ipfs/exchange/offline" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var log = logging.Logger("merkledag") diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go index a0e91e8a0b06..950db2df040e 100644 --- a/merkledag/merkledag_test.go +++ b/merkledag/merkledag_test.go @@ -21,9 +21,9 @@ import ( dstest "github.com/ipfs/go-ipfs/merkledag/test" uio "github.com/ipfs/go-ipfs/unixfs/io" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/merkledag/node.go b/merkledag/node.go index b0fca652b2c4..a4f71e8aa38f 100644 --- a/merkledag/node.go +++ b/merkledag/node.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var ErrNotProtobuf = fmt.Errorf("expected protobuf dag node") @@ -253,7 +253,11 @@ func (n *ProtoNode) SetLinks(links []*node.Link) { n.links = links } -func (n *ProtoNode) Resolve(path []string) (*node.Link, []string, error) { +func (n *ProtoNode) Resolve(path []string) (interface{}, []string, error) { + return n.ResolveLink(path) +} + +func (n *ProtoNode) ResolveLink(path []string) (*node.Link, []string, error) { if len(path) == 0 { return nil, nil, fmt.Errorf("end of path, no more links to resolve") } diff --git a/merkledag/node_test.go b/merkledag/node_test.go index 392a51ea2824..106fb79e8a36 100644 --- a/merkledag/node_test.go +++ b/merkledag/node_test.go @@ -7,7 +7,7 @@ import ( . "github.com/ipfs/go-ipfs/merkledag" mdtest "github.com/ipfs/go-ipfs/merkledag/test" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) func TestRemoveLink(t *testing.T) { diff --git a/merkledag/raw.go b/merkledag/raw.go index deb2e1a1fe7e..731a0df33b9f 100644 --- a/merkledag/raw.go +++ b/merkledag/raw.go @@ -3,8 +3,8 @@ package merkledag import ( "github.com/ipfs/go-ipfs/blocks" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) @@ -24,7 +24,11 @@ func (rn *RawNode) Links() []*node.Link { return nil } -func (rn *RawNode) Resolve(path []string) (*node.Link, []string, error) { +func (rn *RawNode) ResolveLink(path []string) (*node.Link, []string, error) { + return nil, nil, ErrLinkNotFound +} + +func (rn *RawNode) Resolve(path []string) (interface{}, []string, error) { return nil, nil, ErrLinkNotFound } diff --git a/merkledag/traverse/traverse.go b/merkledag/traverse/traverse.go index 17e1b666c839..2eab536ee7dd 100644 --- a/merkledag/traverse/traverse.go +++ b/merkledag/traverse/traverse.go @@ -5,7 +5,7 @@ import ( "context" "errors" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) // Order is an identifier for traversal algorithm orders diff --git a/merkledag/traverse/traverse_test.go b/merkledag/traverse/traverse_test.go index fc8d053fa1db..5ffd60a8764a 100644 --- a/merkledag/traverse/traverse_test.go +++ b/merkledag/traverse/traverse_test.go @@ -8,7 +8,7 @@ import ( mdag "github.com/ipfs/go-ipfs/merkledag" mdagtest "github.com/ipfs/go-ipfs/merkledag/test" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) func TestDFSPreNoSkip(t *testing.T) { diff --git a/merkledag/utils/diff.go b/merkledag/utils/diff.go index 2b5ddb72b2ed..5d8c1e281605 100644 --- a/merkledag/utils/diff.go +++ b/merkledag/utils/diff.go @@ -7,7 +7,7 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) const ( diff --git a/merkledag/utils/utils.go b/merkledag/utils/utils.go index 7ef67b93943a..6b262309926f 100644 --- a/merkledag/utils/utils.go +++ b/merkledag/utils/utils.go @@ -10,7 +10,7 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" ) diff --git a/merkledag/utils/utils_test.go b/merkledag/utils/utils_test.go index 4f822e5cd4a5..5992bda86e9e 100644 --- a/merkledag/utils/utils_test.go +++ b/merkledag/utils/utils_test.go @@ -8,7 +8,7 @@ import ( path "github.com/ipfs/go-ipfs/path" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func TestAddLink(t *testing.T) { diff --git a/mfs/dir.go b/mfs/dir.go index 38bee4cccdab..1755069fe084 100644 --- a/mfs/dir.go +++ b/mfs/dir.go @@ -14,7 +14,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" ufspb "github.com/ipfs/go-ipfs/unixfs/pb" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) var ErrNotYetImplemented = errors.New("not yet implemented") diff --git a/mfs/file.go b/mfs/file.go index 931827ebb623..8681d0b30fe2 100644 --- a/mfs/file.go +++ b/mfs/file.go @@ -10,7 +10,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" mod "github.com/ipfs/go-ipfs/unixfs/mod" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) type File struct { diff --git a/mfs/mfs_test.go b/mfs/mfs_test.go index b7e725fbc224..8c097a2b1443 100644 --- a/mfs/mfs_test.go +++ b/mfs/mfs_test.go @@ -24,8 +24,8 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/mfs/ops.go b/mfs/ops.go index 1c1fef82b77b..bfbb4e1ff14f 100644 --- a/mfs/ops.go +++ b/mfs/ops.go @@ -9,7 +9,7 @@ import ( path "github.com/ipfs/go-ipfs/path" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) // Mv moves the file or directory at 'src' to 'dst' diff --git a/mfs/repub_test.go b/mfs/repub_test.go index b88604bc0ba3..03d6760995dd 100644 --- a/mfs/repub_test.go +++ b/mfs/repub_test.go @@ -7,7 +7,7 @@ import ( ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci" "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func TestRepublisher(t *testing.T) { diff --git a/mfs/system.go b/mfs/system.go index 4912c0fd332b..8f8a2faf409d 100644 --- a/mfs/system.go +++ b/mfs/system.go @@ -18,9 +18,9 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" ft "github.com/ipfs/go-ipfs/unixfs" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var ErrNotExist = errors.New("no such rootfs") diff --git a/namesys/namesys.go b/namesys/namesys.go index 4d65feea0ea5..9cba2ecbdf32 100644 --- a/namesys/namesys.go +++ b/namesys/namesys.go @@ -6,7 +6,7 @@ import ( context "context" path "github.com/ipfs/go-ipfs/path" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto" ) diff --git a/namesys/publisher.go b/namesys/publisher.go index 8909f1676373..076139d6f162 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -14,7 +14,7 @@ import ( dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" ft "github.com/ipfs/go-ipfs/unixfs" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" diff --git a/namesys/republisher/repub.go b/namesys/republisher/repub.go index 94a9e1ce36e5..0d1f816e87d1 100644 --- a/namesys/republisher/repub.go +++ b/namesys/republisher/repub.go @@ -11,7 +11,7 @@ import ( path "github.com/ipfs/go-ipfs/path" dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" gpctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" diff --git a/namesys/routing.go b/namesys/routing.go index 2cf6e0d8ec1e..eac0257fc02c 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -12,11 +12,11 @@ import ( pb "github.com/ipfs/go-ipfs/namesys/pb" path "github.com/ipfs/go-ipfs/path" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto" ) diff --git a/package.json b/package.json index e411881fe34b..270235f8078f 100644 --- a/package.json +++ b/package.json @@ -207,9 +207,9 @@ }, { "author": "whyrusleeping", - "hash": "QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z", + "hash": "QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj", "name": "go-cid", - "version": "0.6.0" + "version": "0.7.2" }, { "author": "whyrusleeping", @@ -254,9 +254,9 @@ "version": "0.1.2" }, { - "hash": "QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn", + "hash": "QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt", "name": "go-libp2p-kad-dht", - "version": "2.2.0" + "version": "2.3.1" }, { "author": "whyrusleeping", @@ -272,9 +272,14 @@ }, { "author": "whyrusleeping", - "hash": "QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB", + "hash": "QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf", "name": "go-ipld-node", - "version": "0.1.0" + "version": "0.3.1" + }, + { + "hash": "QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd", + "name": "go-libp2p-routing", + "version": "2.2.1" } ], "gxVersion": "0.4.0", diff --git a/path/path.go b/path/path.go index 3713259c4bf9..e51771e952cf 100644 --- a/path/path.go +++ b/path/path.go @@ -5,7 +5,7 @@ import ( "path" "strings" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) // ErrBadPath is returned when a given path is incorrectly formatted diff --git a/path/resolver.go b/path/resolver.go index e4bfe8f796cd..2cabb0a1f8b1 100644 --- a/path/resolver.go +++ b/path/resolver.go @@ -9,9 +9,9 @@ import ( merkledag "github.com/ipfs/go-ipfs/merkledag" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var log = logging.Logger("path") @@ -112,7 +112,7 @@ func (s *Resolver) ResolveLinks(ctx context.Context, ndd node.Node, names []stri ctx, cancel = context.WithTimeout(ctx, time.Minute) defer cancel() - lnk, rest, err := nd.Resolve(names) + lnk, rest, err := nd.ResolveLink(names) if err == merkledag.ErrLinkNotFound { n := nd.Cid() return result, ErrNoLink{Name: names[0], Node: n} diff --git a/path/resolver_test.go b/path/resolver_test.go index 652f38796535..0960945e3d42 100644 --- a/path/resolver_test.go +++ b/path/resolver_test.go @@ -9,8 +9,8 @@ import ( dagmock "github.com/ipfs/go-ipfs/merkledag/test" path "github.com/ipfs/go-ipfs/path" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" util "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/pin/gc/gc.go b/pin/gc/gc.go index 5f62eb0b8d9f..44c6e6574e95 100644 --- a/pin/gc/gc.go +++ b/pin/gc/gc.go @@ -7,8 +7,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" pin "github.com/ipfs/go-ipfs/pin" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ) var log = logging.Logger("gc") diff --git a/pin/pin.go b/pin/pin.go index 10c60c256986..39ec6241ede2 100644 --- a/pin/pin.go +++ b/pin/pin.go @@ -11,9 +11,9 @@ import ( mdag "github.com/ipfs/go-ipfs/merkledag" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" ) diff --git a/pin/pin_test.go b/pin/pin_test.go index 787b8226a5a0..0cc4ccede18b 100644 --- a/pin/pin_test.go +++ b/pin/pin_test.go @@ -10,7 +10,7 @@ import ( mdag "github.com/ipfs/go-ipfs/merkledag" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/pin/set.go b/pin/set.go index eaaba7884c90..c1f961a635ae 100644 --- a/pin/set.go +++ b/pin/set.go @@ -13,10 +13,10 @@ import ( "github.com/ipfs/go-ipfs/merkledag" "github.com/ipfs/go-ipfs/pin/internal/pb" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) const ( diff --git a/pin/set_test.go b/pin/set_test.go index 335b59e99ae3..a1e8ac573491 100644 --- a/pin/set_test.go +++ b/pin/set_test.go @@ -9,7 +9,7 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" mdtest "github.com/ipfs/go-ipfs/merkledag/test" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) func ignoreCids(_ *cid.Cid) {} diff --git a/routing/mock/centralized_client.go b/routing/mock/centralized_client.go index 22b9386caaba..b5ced25b9321 100644 --- a/routing/mock/centralized_client.go +++ b/routing/mock/centralized_client.go @@ -8,10 +8,10 @@ import ( dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" "github.com/ipfs/go-ipfs/thirdparty/testutil" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" diff --git a/routing/mock/centralized_server.go b/routing/mock/centralized_server.go index 4dff16cfe9c0..d3eb516e8ee3 100644 --- a/routing/mock/centralized_server.go +++ b/routing/mock/centralized_server.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-ipfs/thirdparty/testutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" diff --git a/routing/mock/centralized_test.go b/routing/mock/centralized_test.go index ade8304a4e1a..dc0df9f37eb3 100644 --- a/routing/mock/centralized_test.go +++ b/routing/mock/centralized_test.go @@ -8,7 +8,7 @@ import ( delay "github.com/ipfs/go-ipfs/thirdparty/delay" "github.com/ipfs/go-ipfs/thirdparty/testutil" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" ) diff --git a/routing/mock/dht.go b/routing/mock/dht.go index e71635ab569a..1a6a705ade8d 100644 --- a/routing/mock/dht.go +++ b/routing/mock/dht.go @@ -3,9 +3,9 @@ package mockrouting import ( context "context" "github.com/ipfs/go-ipfs/thirdparty/testutil" - dht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync" + dht "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht" mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock" ) diff --git a/routing/mock/interface.go b/routing/mock/interface.go index 5296b529f725..8165a926163b 100644 --- a/routing/mock/interface.go +++ b/routing/mock/interface.go @@ -10,8 +10,8 @@ import ( delay "github.com/ipfs/go-ipfs/thirdparty/delay" "github.com/ipfs/go-ipfs/thirdparty/testutil" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" diff --git a/routing/none/none_client.go b/routing/none/none_client.go index 00a7cfaee829..e95c296a2f99 100644 --- a/routing/none/none_client.go +++ b/routing/none/none_client.go @@ -6,9 +6,9 @@ import ( repo "github.com/ipfs/go-ipfs/repo" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" p2phost "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" diff --git a/routing/offline/offline.go b/routing/offline/offline.go index 49ac6ec03c18..0c0909e2b736 100644 --- a/routing/offline/offline.go +++ b/routing/offline/offline.go @@ -7,9 +7,9 @@ import ( dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" diff --git a/routing/supernode/client.go b/routing/supernode/client.go index 3f724891951a..b4a6f5efbc50 100644 --- a/routing/supernode/client.go +++ b/routing/supernode/client.go @@ -8,13 +8,13 @@ import ( proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy" - routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" + routing "gx/ipfs/QmQbs7NUE1rsgbktEqesPSUdU3iRRrAgu21a6Vu36MqmAd/go-libp2p-routing" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables" - dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" + dhtpb "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht/pb" pb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb" "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" diff --git a/routing/supernode/proxy/loopback.go b/routing/supernode/proxy/loopback.go index ea9c0b1b03ef..ab60a42b57b8 100644 --- a/routing/supernode/proxy/loopback.go +++ b/routing/supernode/proxy/loopback.go @@ -2,8 +2,8 @@ package proxy import ( context "context" - dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb" ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" + dhtpb "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht/pb" inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) diff --git a/routing/supernode/proxy/standard.go b/routing/supernode/proxy/standard.go index 15f1a71a0e04..d31761d25ccb 100644 --- a/routing/supernode/proxy/standard.go +++ b/routing/supernode/proxy/standard.go @@ -7,9 +7,9 @@ import ( logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables" kbucket "gx/ipfs/QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm/go-libp2p-kbucket" - dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" + dhtpb "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht/pb" host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host" inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" diff --git a/routing/supernode/server.go b/routing/supernode/server.go index c6f6daf4ccf0..8223e11d3ec7 100644 --- a/routing/supernode/server.go +++ b/routing/supernode/server.go @@ -7,11 +7,11 @@ import ( proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy" context "context" - dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb" pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" + dhtpb "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht/pb" record "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record" pb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" diff --git a/routing/supernode/server_test.go b/routing/supernode/server_test.go index a7a315eae28b..4f6c52e2bd41 100644 --- a/routing/supernode/server_test.go +++ b/routing/supernode/server_test.go @@ -3,9 +3,9 @@ package supernode import ( "testing" - dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb" key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key" datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" + dhtpb "gx/ipfs/QmcDxLMu6Z5T7jTYtSWLtibrfrCQHmvsBbSMF1DnPCHcGt/go-libp2p-kad-dht/pb" ) func TestPutProviderDoesntResultInDuplicates(t *testing.T) { diff --git a/tar/format.go b/tar/format.go index 052ff22142f1..ada1f463371f 100644 --- a/tar/format.go +++ b/tar/format.go @@ -16,8 +16,8 @@ import ( path "github.com/ipfs/go-ipfs/path" uio "github.com/ipfs/go-ipfs/unixfs/io" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var log = logging.Logger("tarfmt") diff --git a/test/integration/bitswap_wo_routing_test.go b/test/integration/bitswap_wo_routing_test.go index 7e93a667d85e..5b4cd9248960 100644 --- a/test/integration/bitswap_wo_routing_test.go +++ b/test/integration/bitswap_wo_routing_test.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-ipfs/core/mock" context "context" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock" ) diff --git a/thirdparty/ds-help/key.go b/thirdparty/ds-help/key.go index 7db86aedb856..7253105a921c 100644 --- a/thirdparty/ds-help/key.go +++ b/thirdparty/ds-help/key.go @@ -1,9 +1,9 @@ package dshelp import ( + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32" ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" ) // TODO: put this code into the go-datastore itself diff --git a/thirdparty/posinfo/posinfo.go b/thirdparty/posinfo/posinfo.go index 4c8912e3c815..a59eb1e6e9f9 100644 --- a/thirdparty/posinfo/posinfo.go +++ b/thirdparty/posinfo/posinfo.go @@ -3,7 +3,7 @@ package posinfo import ( "os" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" ) type PosInfo struct { diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go index 44945dd31153..8f16b3ba70d1 100644 --- a/unixfs/io/dagreader.go +++ b/unixfs/io/dagreader.go @@ -12,8 +12,8 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" ftpb "github.com/ipfs/go-ipfs/unixfs/pb" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var ErrIsDir = errors.New("this dag node is a directory") diff --git a/unixfs/io/dirbuilder.go b/unixfs/io/dirbuilder.go index ac316f8a2756..3a5cd808ab68 100644 --- a/unixfs/io/dirbuilder.go +++ b/unixfs/io/dirbuilder.go @@ -5,7 +5,7 @@ import ( mdag "github.com/ipfs/go-ipfs/merkledag" format "github.com/ipfs/go-ipfs/unixfs" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" ) type directoryBuilder struct { diff --git a/unixfs/mod/dagmodifier.go b/unixfs/mod/dagmodifier.go index fe59436ee471..d83775752c41 100644 --- a/unixfs/mod/dagmodifier.go +++ b/unixfs/mod/dagmodifier.go @@ -14,10 +14,10 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" uio "github.com/ipfs/go-ipfs/unixfs/io" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" + cid "gx/ipfs/QmPBa9N9MuZ16fPuKMv9KCq1aAwhkTY4G6LXQYQmWJiCrj/go-cid" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" ) var ErrSeekFail = errors.New("failed to seek properly") diff --git a/unixfs/test/utils.go b/unixfs/test/utils.go index abe292300ff9..93cf82fd96ff 100644 --- a/unixfs/test/utils.go +++ b/unixfs/test/utils.go @@ -14,7 +14,7 @@ import ( mdagmock "github.com/ipfs/go-ipfs/merkledag/test" ft "github.com/ipfs/go-ipfs/unixfs" - node "gx/ipfs/QmZx42H5khbVQhV5odp66TApShV4XCujYazcvYduZ4TroB/go-ipld-node" + node "gx/ipfs/QmNs4rbc8bDGDXZwoQf4Rg6KCr7FhfKDG4eNra1tXELqNf/go-ipld-node" u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" )