From 417545dfd84cedaf1fe6f7faf1b018f0bb2733f0 Mon Sep 17 00:00:00 2001 From: Kevin Atkinson Date: Tue, 11 Sep 2018 22:19:44 -0400 Subject: [PATCH] gx update and fix code to use new Cid type License: MIT Signed-off-by: Kevin Atkinson --- assets/assets.go | 2 +- blocks/blockstoreutil/remove.go | 2 +- core/builder.go | 12 +++++----- core/commands/add.go | 14 +++++------ core/commands/bitswap.go | 4 ++-- core/commands/dag/dag.go | 2 +- core/commands/dht.go | 8 +++---- core/commands/files.go | 16 ++++++------- core/commands/get.go | 6 ++--- core/commands/ls.go | 16 ++++++------- core/commands/name/ipns.go | 4 ++-- core/commands/name/publish.go | 2 +- core/commands/object/object.go | 2 +- core/commands/pin.go | 12 +++++----- core/commands/refs.go | 2 +- core/commands/repo.go | 2 +- core/commands/resolve.go | 2 +- core/commands/tar.go | 4 ++-- core/commands/unixfs/ls.go | 12 +++++----- core/commands/urlstore.go | 6 ++--- core/core.go | 30 ++++++++++++------------ core/coreapi/dht.go | 18 +++++++------- core/coreapi/interface/path.go | 2 +- core/coreapi/key.go | 2 +- core/coreapi/name.go | 4 ++-- core/coreapi/name_test.go | 2 +- core/coreapi/object.go | 4 ++-- core/coreapi/path.go | 6 ++--- core/coreapi/pin.go | 6 ++--- core/coreapi/unixfs.go | 2 +- core/coreapi/unixfs_test.go | 4 ++-- core/coredag/dagpb.go | 2 +- core/coredag/raw.go | 2 +- core/corehttp/commands.go | 2 +- core/corehttp/gateway_handler.go | 14 +++++------ core/corehttp/gateway_test.go | 4 ++-- core/corerepo/gc.go | 2 +- core/corerepo/pinning.go | 6 ++--- core/coreunix/add.go | 14 +++++------ core/coreunix/add_test.go | 6 ++--- core/coreunix/cat.go | 6 ++--- core/coreunix/metadata.go | 4 ++-- core/coreunix/metadata_test.go | 14 +++++------ core/pathresolver.go | 4 ++-- core/pathresolver_test.go | 2 +- dagutils/diff.go | 2 +- dagutils/diffenum.go | 2 +- dagutils/diffenum_test.go | 4 ++-- dagutils/utils.go | 10 ++++---- dagutils/utils_test.go | 6 ++--- exchange/reprovide/providers.go | 4 ++-- exchange/reprovide/reprovide.go | 2 +- exchange/reprovide/reprovide_test.go | 4 ++-- filestore/filestore.go | 2 +- filestore/filestore_test.go | 4 ++-- filestore/fsrefstore.go | 4 ++-- filestore/util.go | 4 ++-- fuse/ipns/common.go | 4 ++-- fuse/ipns/ipns_test.go | 2 +- fuse/ipns/ipns_unix.go | 8 +++---- fuse/node/mount_test.go | 2 +- fuse/readonly/ipfs_test.go | 6 ++--- fuse/readonly/readonly_unix.go | 8 +++---- namesys/base.go | 2 +- namesys/cache.go | 2 +- namesys/dns.go | 2 +- namesys/interface.go | 2 +- namesys/ipns_resolver_validation_test.go | 10 ++++---- namesys/namesys.go | 4 ++-- namesys/namesys_test.go | 6 ++--- namesys/proquint.go | 2 +- namesys/publisher.go | 6 ++--- namesys/publisher_test.go | 4 ++-- namesys/republisher/repub.go | 2 +- namesys/republisher/repub_test.go | 2 +- namesys/resolve_test.go | 4 ++-- namesys/routing.go | 6 ++--- package.json | 28 +++++++++++----------- pin/gc/gc.go | 8 +++---- pin/pin.go | 2 +- pin/pin_test.go | 8 +++---- pin/set.go | 2 +- pin/set_test.go | 8 +++---- tar/format.go | 8 +++---- thirdparty/cidv0v1/blockstore.go | 2 +- thirdparty/verifbs/verifbs.go | 2 +- 86 files changed, 246 insertions(+), 246 deletions(-) diff --git a/assets/assets.go b/assets/assets.go index 4d6e35ec2774..e8d802f5c456 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -12,7 +12,7 @@ import ( "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/core/coreunix" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" // this import keeps gx from thinking the dep isn't used _ "gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html" diff --git a/blocks/blockstoreutil/remove.go b/blocks/blockstoreutil/remove.go index 073b2c7bb826..937cf616c483 100644 --- a/blocks/blockstoreutil/remove.go +++ b/blocks/blockstoreutil/remove.go @@ -9,7 +9,7 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" - bs "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + bs "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // RemovedBlock is used to respresent the result of removing a block. diff --git a/core/builder.go b/core/builder.go index f2c89d006a30..77bed2fdccd2 100644 --- a/core/builder.go +++ b/core/builder.go @@ -14,10 +14,10 @@ import ( repo "github.com/ipfs/go-ipfs/repo" cidv0v1 "github.com/ipfs/go-ipfs/thirdparty/cidv0v1" "github.com/ipfs/go-ipfs/thirdparty/verifbs" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" @@ -26,14 +26,14 @@ import ( retry "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/retrystore" dsync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" libp2p "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" cfg "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem" p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" metrics "gx/ipfs/QmekzFM3hPZjTjUFGTABdQkEnQ3PTiMstY198PwSFr5w1Q/go-metrics-interface" ) diff --git a/core/commands/add.go b/core/commands/add.go index 9d8a5bd94db6..123dd6083b39 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -11,20 +11,20 @@ import ( cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" "github.com/ipfs/go-ipfs/core/coreunix" filestore "github.com/ipfs/go-ipfs/filestore" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - dagtest "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag/test" - blockservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + dagtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test" + blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" pb "gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // ErrDepthLimitExceeded indicates that the max depth has been exceeded. diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 1c2efeac021c..16ea6ab78c64 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -9,8 +9,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" e "github.com/ipfs/go-ipfs/core/commands/e" - bitswap "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap" - decision "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap/decision" + bitswap "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap" + decision "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 0b490e265014..0dc702c8bd34 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -11,7 +11,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" coredag "github.com/ipfs/go-ipfs/core/coredag" pin "github.com/ipfs/go-ipfs/pin" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" diff --git a/core/commands/dht.go b/core/commands/dht.go index 5cfc0edb99c8..0269af543e5c 100644 --- a/core/commands/dht.go +++ b/core/commands/dht.go @@ -10,16 +10,16 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" e "github.com/ipfs/go-ipfs/core/commands/e" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" b58 "gx/ipfs/QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY/go-base58-fast/base58" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" - notif "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing/notifications" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" + notif "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing/notifications" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" ) diff --git a/core/commands/files.go b/core/commands/files.go index ce469087ce4d..9bd5a8989352 100644 --- a/core/commands/files.go +++ b/core/commands/files.go @@ -16,21 +16,21 @@ import ( core "github.com/ipfs/go-ipfs/core" cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" e "github.com/ipfs/go-ipfs/core/commands/e" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/core/commands/get.go b/core/commands/get.go index 2ec3d538d508..a9155387109b 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -14,12 +14,12 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" + uarchive "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/archive" "gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb" tar "gx/ipfs/QmQine7gvHncNevKtG9QXxf3nXcwSj6aDDmMm52mHofEEp/tar-utils" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - uarchive "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/archive" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ) var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9") diff --git a/core/commands/ls.go b/core/commands/ls.go index 2acf6a062fc8..fde6395a693d 100644 --- a/core/commands/ls.go +++ b/core/commands/ls.go @@ -9,17 +9,17 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" e "github.com/ipfs/go-ipfs/core/commands/e" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - unixfspb "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/pb" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - blockservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/core/commands/name/ipns.go b/core/commands/name/ipns.go index 3081ab7dea8c..0be2ec9a17cc 100644 --- a/core/commands/name/ipns.go +++ b/core/commands/name/ipns.go @@ -13,10 +13,10 @@ import ( nsopts "github.com/ipfs/go-ipfs/namesys/opts" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" - offline "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ) var log = logging.Logger("core/commands/ipns") diff --git a/core/commands/name/publish.go b/core/commands/name/publish.go index c0a15aff7068..4ebe6ee9cfb2 100644 --- a/core/commands/name/publish.go +++ b/core/commands/name/publish.go @@ -15,8 +15,8 @@ import ( "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" ) var PublishCmd = &cmds.Command{ diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 4fdc0213fd59..21f63876ad38 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -19,7 +19,7 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/core/commands/pin.go b/core/commands/pin.go index 55b383999745..4a975c91d15c 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -12,16 +12,16 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" corerepo "github.com/ipfs/go-ipfs/core/corerepo" pin "github.com/ipfs/go-ipfs/pin" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" ) var PinCmd = &cmds.Command{ diff --git a/core/commands/refs.go b/core/commands/refs.go index 87ae70132e52..10f05e7f0b74 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -12,8 +12,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/core/commands/repo.go b/core/commands/repo.go index fe7c9a37369e..566eb8584540 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -19,8 +19,8 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) type RepoVersion struct { diff --git a/core/commands/resolve.go b/core/commands/resolve.go index 5b14d25a3cf0..1ad4c53de332 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -12,7 +12,7 @@ import ( ncmd "github.com/ipfs/go-ipfs/core/commands/name" ns "github.com/ipfs/go-ipfs/namesys" nsopts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" ) diff --git a/core/commands/tar.go b/core/commands/tar.go index ac61751448df..c35f433811c3 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -9,8 +9,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" "github.com/ipfs/go-ipfs/core/coreunix" tar "github.com/ipfs/go-ipfs/tar" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" ) diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go index 19e1cdb62540..92e3e301a5d4 100644 --- a/core/commands/unixfs/ls.go +++ b/core/commands/unixfs/ls.go @@ -12,12 +12,12 @@ import ( cmds "github.com/ipfs/go-ipfs/commands" core "github.com/ipfs/go-ipfs/core" e "github.com/ipfs/go-ipfs/core/commands/e" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - unixfspb "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/pb" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ) type LsLink struct { diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go index 62775e9d5c90..773456f59307 100644 --- a/core/commands/urlstore.go +++ b/core/commands/urlstore.go @@ -10,11 +10,11 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" + balanced "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/balanced" + ihelper "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/helpers" + trickle "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/trickle" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit" - balanced "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/balanced" - ihelper "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/helpers" - trickle "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/trickle" chunk "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker" ) diff --git a/core/core.go b/core/core.go index eac4c7643a46..47cc74e44cd9 100644 --- a/core/core.go +++ b/core/core.go @@ -31,20 +31,22 @@ import ( repo "github.com/ipfs/go-ipfs/repo" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - psrouter "gx/ipfs/QmPVoodkirYLLWek3hvtchrB2o5cyb6VGhKfGnWciQ6ZHa/go-libp2p-pubsub-router" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" - rhelpers "gx/ipfs/QmQq7kiho4kbv6T8w1x8LppZp7BtAFmUU2MEuue3zRJNh7/go-libp2p-routing-helpers" + bitswap "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap" + bsnet "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap/network" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" exchange "gx/ipfs/QmR1nncPsZR14A4hWr39mq8Lm7BGgS68bHVT9nop8NpWEM/go-ipfs-exchange-interface" - nilrouting "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/none" - offroute "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" + "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" quic "gx/ipfs/QmRgFWjY1idcimoGvSAzNenfptnciZnPHuW3P2yq9VgaqA/go-libp2p-quic-transport" goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" + rhelpers "gx/ipfs/QmSFHnkFwayfnRKK1Z8jBUauMYMkHrZpQyvbxkFoPYb1VQ/go-libp2p-routing-helpers" mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" mafilter "gx/ipfs/QmSW4uNHbvQia8iZDXzbwjiyHQtnyo9aFqfQAMasj3TJ6Y/go-maddr-filter" + nilrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/none" + offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" libp2p "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p" discovery "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/discovery" @@ -52,31 +54,29 @@ import ( rhost "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/host/routed" identify "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/identify" ping "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/ping" - dht "gx/ipfs/QmUQm3siMUyxXuTM4kQxtKQC1YKbMi1ccKUoHqwt8ktwFf/go-libp2p-kad-dht" - dhtopts "gx/ipfs/QmUQm3siMUyxXuTM4kQxtKQC1YKbMi1ccKUoHqwt8ktwFf/go-libp2p-kad-dht/opts" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" connmgr "gx/ipfs/QmW9pfNup4hcWxyMxDGSe25tG9xepvLqqmQUoTDaawzTZe/go-libp2p-connmgr" ifconnmgr "gx/ipfs/QmWGGN1nysi1qgqto31bENwESkmZBY4YGK4sZC3qhnqhSv/go-libp2p-interface-connmgr" circuit "gx/ipfs/QmWX6RySJ3yAYmfjLSw1LtRZnDh5oVeA9kM3scNQJkysqa/go-libp2p-circuit" floodsub "gx/ipfs/QmY1L5krVk8dv8d74uESmJTXGpoigVYqBVxXXz1aS8aFSb/go-libp2p-floodsub" smux "gx/ipfs/QmY9JXR3FupnYAYJWK9aMr9bCpqWKcToQ1tz8DVGTrHpHw/go-stream-muxer" - "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" + psrouter "gx/ipfs/QmYNHDSyFKfvySMY4AHuouMyz5rL1NoFJdjG7kfWA9tNwU/go-libp2p-pubsub-router" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" pnet "gx/ipfs/QmZaQ3K9PRd5sYYoG1xbTGPtd3N7TYiKBRmcBUTsx8HVET/go-libp2p-pnet" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + dht "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht" + dhtopts "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht/opts" yamux "gx/ipfs/QmcsgrV3nCAKjiHKZhKVXWc4oY3WBECJCqahXEMpHeMrev/go-smux-yamux" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" metrics "gx/ipfs/QmdhwKw53CTV8EJSAsR1bpmMT5kXiWBgeAyv1EXeeDiXqR/go-libp2p-metrics" mplex "gx/ipfs/QmdiBZzwGtN2yHJrWD9ojQ7ASS48nv7BcojWLkYd1ZtrV2/go-smux-multiplex" - bitswap "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap" - bsnet "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap/network" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) const IpnsValidatorTag = "ipns" diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go index 39c6dbd0f851..0d1cd9ec2e61 100644 --- a/core/coreapi/dht.go +++ b/core/coreapi/dht.go @@ -10,13 +10,13 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" - blockservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) type DhtAPI CoreAPI @@ -77,9 +77,9 @@ func (api *DhtAPI) Provide(ctx context.Context, path coreiface.Path, opts ...cao } if settings.Recursive { - err = provideKeysRec(ctx, api.node.Routing, api.node.Blockstore, []*cid.Cid{c}) + err = provideKeysRec(ctx, api.node.Routing, api.node.Blockstore, []cid.Cid{c}) } else { - err = provideKeys(ctx, api.node.Routing, []*cid.Cid{c}) + err = provideKeys(ctx, api.node.Routing, []cid.Cid{c}) } if err != nil { return err @@ -88,7 +88,7 @@ func (api *DhtAPI) Provide(ctx context.Context, path coreiface.Path, opts ...cao return nil } -func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) error { +func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []cid.Cid) error { for _, c := range cids { err := r.Provide(ctx, c, true) if err != nil { @@ -98,7 +98,7 @@ func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) er return nil } -func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Blockstore, cids []*cid.Cid) error { +func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Blockstore, cids []cid.Cid) error { provided := cidutil.NewStreamingSet() errCh := make(chan error) diff --git a/core/coreapi/interface/path.go b/core/coreapi/interface/path.go index 08dcb01fd39d..e11e20cf0a6e 100644 --- a/core/coreapi/interface/path.go +++ b/core/coreapi/interface/path.go @@ -1,7 +1,7 @@ package iface import ( - ipfspath "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ) diff --git a/core/coreapi/key.go b/core/coreapi/key.go index b792bb868aa2..8377468c6168 100644 --- a/core/coreapi/key.go +++ b/core/coreapi/key.go @@ -8,7 +8,7 @@ import ( coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options" - ipfspath "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" diff --git a/core/coreapi/name.go b/core/coreapi/name.go index 8f12d3246883..f43fa1eb75a7 100644 --- a/core/coreapi/name.go +++ b/core/coreapi/name.go @@ -13,11 +13,11 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" namesys "github.com/ipfs/go-ipfs/namesys" nsopts "github.com/ipfs/go-ipfs/namesys/opts" - ipath "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + ipath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - offline "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" + offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ) type NameAPI CoreAPI diff --git a/core/coreapi/name_test.go b/core/coreapi/name_test.go index b144d940c6a3..dd9f76eec462 100644 --- a/core/coreapi/name_test.go +++ b/core/coreapi/name_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - ipath "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + ipath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options" diff --git a/core/coreapi/object.go b/core/coreapi/object.go index 2d2b1c8bf6cd..37c3e288fd39 100644 --- a/core/coreapi/object.go +++ b/core/coreapi/object.go @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-ipfs/pin" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/core/coreapi/path.go b/core/coreapi/path.go index e1f48b801391..2247927f5cac 100644 --- a/core/coreapi/path.go +++ b/core/coreapi/path.go @@ -8,9 +8,9 @@ import ( core "github.com/ipfs/go-ipfs/core" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" namesys "github.com/ipfs/go-ipfs/namesys" - ipfspath "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go index ea09d838f8ab..6991d42be8d0 100644 --- a/core/coreapi/pin.go +++ b/core/coreapi/pin.go @@ -7,11 +7,11 @@ import ( coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options" corerepo "github.com/ipfs/go-ipfs/core/corerepo" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ) type PinAPI CoreAPI diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go index 9147b50b0116..5aa364bf9e76 100644 --- a/core/coreapi/unixfs.go +++ b/core/coreapi/unixfs.go @@ -6,7 +6,7 @@ import ( coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/core/coreapi/unixfs_test.go b/core/coreapi/unixfs_test.go index 64afc95433e0..45d517a7084e 100644 --- a/core/coreapi/unixfs_test.go +++ b/core/coreapi/unixfs_test.go @@ -19,15 +19,15 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" repo "github.com/ipfs/go-ipfs/repo" + unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" cbor "gx/ipfs/QmPrv66vmh2P7vLJMpYx6DWLTNKvVB4Jdkyxs6V3QvWKvf/go-ipld-cbor" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" mocknet "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/net/mock" + mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" - unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - mdag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" ) diff --git a/core/coredag/dagpb.go b/core/coredag/dagpb.go index e4e6bfcfc39c..513329db0e1b 100644 --- a/core/coredag/dagpb.go +++ b/core/coredag/dagpb.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "math" - "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" diff --git a/core/coredag/raw.go b/core/coredag/raw.go index 501f794062bc..b3b2024fc2ae 100644 --- a/core/coredag/raw.go +++ b/core/coredag/raw.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "math" - "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 87710dc19e18..f6318bfef689 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -16,7 +16,7 @@ import ( cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds" cmdsHttp "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds/http" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" ) diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go index 16922937e98e..1a7e2942531a 100644 --- a/core/corehttp/gateway_handler.go +++ b/core/corehttp/gateway_handler.go @@ -16,17 +16,17 @@ import ( core "github.com/ipfs/go-ipfs/core" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" "github.com/ipfs/go-ipfs/dagutils" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker" multibase "gx/ipfs/QmekxXDhCxCJRNuzmHreuaT3BsuJcsjcXWNrtV9C8DRHtd/go-multibase" ) diff --git a/core/corehttp/gateway_test.go b/core/corehttp/gateway_test.go index 02ca24ea5524..f474fb7b35c4 100644 --- a/core/corehttp/gateway_test.go +++ b/core/corehttp/gateway_test.go @@ -19,12 +19,12 @@ import ( repo "github.com/ipfs/go-ipfs/repo" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" id "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/identify" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" ) // `ipfs object new unixfs-dir` diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go index 69461fc6f52d..617b469c6b00 100644 --- a/core/corerepo/gc.go +++ b/core/corerepo/gc.go @@ -12,8 +12,8 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" ) var log = logging.Logger("corerepo") diff --git a/core/corerepo/pinning.go b/core/corerepo/pinning.go index 836c9305df34..e2ad8213f0cb 100644 --- a/core/corerepo/pinning.go +++ b/core/corerepo/pinning.go @@ -18,9 +18,9 @@ import ( "fmt" "github.com/ipfs/go-ipfs/core" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ) diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 8e7324114019..5ebb0066b64a 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -12,20 +12,20 @@ import ( core "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/pin" - unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - balanced "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/balanced" - ihelper "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/helpers" - trickle "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/trickle" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + balanced "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/balanced" + ihelper "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/helpers" + trickle "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/trickle" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) var log = logging.Logger("coreunix") diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 819d7ed4a5a9..6fb6dae644ff 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -20,10 +20,10 @@ import ( files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files" datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe" diff --git a/core/coreunix/cat.go b/core/coreunix/cat.go index 2eb455e64e6e..323aac31acc7 100644 --- a/core/coreunix/cat.go +++ b/core/coreunix/cat.go @@ -4,9 +4,9 @@ import ( "context" core "github.com/ipfs/go-ipfs/core" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" ) func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (uio.DagReader, error) { diff --git a/core/coreunix/metadata.go b/core/coreunix/metadata.go index ae1c01238d3d..d78449c38e4a 100644 --- a/core/coreunix/metadata.go +++ b/core/coreunix/metadata.go @@ -3,8 +3,8 @@ package coreunix import ( core "github.com/ipfs/go-ipfs/core" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ) 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 a14584d30ecf..052a3a2707c6 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -7,20 +7,20 @@ import ( "testing" core "github.com/ipfs/go-ipfs/core" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - importer "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) func getDagserv(t *testing.T) ipld.DAGService { diff --git a/core/pathresolver.go b/core/pathresolver.go index da0e5e6fc8a2..28653c1cb360 100644 --- a/core/pathresolver.go +++ b/core/pathresolver.go @@ -6,8 +6,8 @@ import ( "strings" namesys "github.com/ipfs/go-ipfs/namesys" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" diff --git a/core/pathresolver_test.go b/core/pathresolver_test.go index ae2ea694ebf1..6b7b127be0a0 100644 --- a/core/pathresolver_test.go +++ b/core/pathresolver_test.go @@ -5,7 +5,7 @@ import ( core "github.com/ipfs/go-ipfs/core" coremock "github.com/ipfs/go-ipfs/core/mock" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ) func TestResolveNoComponents(t *testing.T) { diff --git a/dagutils/diff.go b/dagutils/diff.go index 04007b1dee0e..f8c00b299a07 100644 --- a/dagutils/diff.go +++ b/dagutils/diff.go @@ -8,7 +8,7 @@ import ( coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" ) diff --git a/dagutils/diffenum.go b/dagutils/diffenum.go index c1aa78060adc..141d4d62fa6a 100644 --- a/dagutils/diffenum.go +++ b/dagutils/diffenum.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - mdag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/dagutils/diffenum_test.go b/dagutils/diffenum_test.go index 7f5a5f158e5c..e2f3dcfbb3e9 100644 --- a/dagutils/diffenum_test.go +++ b/dagutils/diffenum_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - mdtest "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag/test" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + mdtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/dagutils/utils.go b/dagutils/utils.go index c4f01a256b73..0e6ffbeb706b 100644 --- a/dagutils/utils.go +++ b/dagutils/utils.go @@ -4,15 +4,15 @@ import ( "context" "errors" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // Editor represents a ProtoNode tree editor and provides methods to diff --git a/dagutils/utils_test.go b/dagutils/utils_test.go index 1f90d5e57ad9..0cd1e294d7ad 100644 --- a/dagutils/utils_test.go +++ b/dagutils/utils_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - mdtest "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag/test" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + mdtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/exchange/reprovide/providers.go b/exchange/reprovide/providers.go index d4580bc9cd20..20056f470db8 100644 --- a/exchange/reprovide/providers.go +++ b/exchange/reprovide/providers.go @@ -6,10 +6,10 @@ import ( pin "github.com/ipfs/go-ipfs/pin" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" - blocks "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil" - merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" + blocks "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // NewBlockstoreProvider returns key provider using bstore.AllKeysChan diff --git a/exchange/reprovide/reprovide.go b/exchange/reprovide/reprovide.go index a403d48a81f3..0038faf50217 100644 --- a/exchange/reprovide/reprovide.go +++ b/exchange/reprovide/reprovide.go @@ -9,7 +9,7 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" ) var log = logging.Logger("reprovider") diff --git a/exchange/reprovide/reprovide_test.go b/exchange/reprovide/reprovide_test.go index 8d749e7b2726..58bc307f4c61 100644 --- a/exchange/reprovide/reprovide_test.go +++ b/exchange/reprovide/reprovide_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - mock "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/mock" testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil" blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" + mock "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" . "github.com/ipfs/go-ipfs/exchange/reprovide" ) diff --git a/filestore/filestore.go b/filestore/filestore.go index 6335617c5473..345aaa2bc3ac 100644 --- a/filestore/filestore.go +++ b/filestore/filestore.go @@ -16,7 +16,7 @@ import ( logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) var log = logging.Logger("filestore") diff --git a/filestore/filestore_test.go b/filestore/filestore_test.go index 94780feb9f8c..4c1e3f5c127d 100644 --- a/filestore/filestore_test.go +++ b/filestore/filestore_test.go @@ -7,12 +7,12 @@ import ( "math/rand" "testing" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) func newTestFilestore(t *testing.T) (string, *Filestore) { diff --git a/filestore/fsrefstore.go b/filestore/fsrefstore.go index 3dd8113ff846..9608e3af0286 100644 --- a/filestore/fsrefstore.go +++ b/filestore/fsrefstore.go @@ -10,15 +10,15 @@ import ( pb "github.com/ipfs/go-ipfs/filestore/pb" - dshelp "gx/ipfs/QmNvDiCTyxmM5RfhtexSeNs6cXCkSiE3pgkVXC9kWwTcu3/go-ipfs-ds-help" posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dsns "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/namespace" dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help" proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // FilestorePrefix identifies the key prefix for FileManager blocks. diff --git a/filestore/util.go b/filestore/util.go index 6d9eb8233d59..8defb2c04e91 100644 --- a/filestore/util.go +++ b/filestore/util.go @@ -6,11 +6,11 @@ import ( pb "github.com/ipfs/go-ipfs/filestore/pb" - dshelp "gx/ipfs/QmNvDiCTyxmM5RfhtexSeNs6cXCkSiE3pgkVXC9kWwTcu3/go-ipfs-ds-help" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) // Status is used to identify the state of the block data referenced diff --git a/fuse/ipns/common.go b/fuse/ipns/common.go index 686d36cb3ea9..1bd00fafdf7b 100644 --- a/fuse/ipns/common.go +++ b/fuse/ipns/common.go @@ -5,9 +5,9 @@ import ( "github.com/ipfs/go-ipfs/core" nsys "github.com/ipfs/go-ipfs/namesys" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ) // InitializeKeyspace sets the ipns record for the given key to diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index 7ee3baf80410..b11ef4c947b3 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -16,9 +16,9 @@ import ( namesys "github.com/ipfs/go-ipfs/namesys" u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" - offroute "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci" fstest "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs/fstestutil" + offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" racedet "gx/ipfs/Qmf7HqcW7LtCi1W8y2bdx2eJpze74jkbKqpByxgXikdbLF/go-detect-race" ) diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index 291e43cf615a..7ce77739ec1e 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -13,17 +13,17 @@ import ( core "github.com/ipfs/go-ipfs/core" namesys "github.com/ipfs/go-ipfs/namesys" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" - mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse" fs "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs" + mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs" ) func init() { diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index 25d6a55dd45c..9c12c4df3045 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -16,8 +16,8 @@ import ( mount "github.com/ipfs/go-ipfs/fuse/mount" namesys "github.com/ipfs/go-ipfs/namesys" - offroute "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci" + offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ) func maybeSkipFuseTests(t *testing.T) { diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index e5afbd2388b2..83c5da93bb85 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -16,9 +16,9 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" coremock "github.com/ipfs/go-ipfs/core/mock" - importer "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci" diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index 206bb6677322..d163c7bf9e92 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -11,10 +11,10 @@ import ( "syscall" core "github.com/ipfs/go-ipfs/core" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - ftpb "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/pb" - mdag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + ftpb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse" diff --git a/namesys/base.go b/namesys/base.go index d6bffd39f0ad..fe044ffb4dc7 100644 --- a/namesys/base.go +++ b/namesys/base.go @@ -7,7 +7,7 @@ import ( context "context" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ) type resolver interface { diff --git a/namesys/cache.go b/namesys/cache.go index 0355181643eb..9151ed64a8bb 100644 --- a/namesys/cache.go +++ b/namesys/cache.go @@ -3,7 +3,7 @@ package namesys import ( "time" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ) func (ns *mpns) cacheGet(name string) (path.Path, bool) { diff --git a/namesys/dns.go b/namesys/dns.go index 077a5e2b5fa2..e5e2ea1599fc 100644 --- a/namesys/dns.go +++ b/namesys/dns.go @@ -8,7 +8,7 @@ import ( "time" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" isd "gx/ipfs/QmZmmuAXgX73UQmX1jRKjTGmjzq24Jinqkq8vzkBtno4uX/go-is-domain" ) diff --git a/namesys/interface.go b/namesys/interface.go index 6778a464cfd1..221500e1cfc4 100644 --- a/namesys/interface.go +++ b/namesys/interface.go @@ -36,7 +36,7 @@ import ( context "context" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" ) diff --git a/namesys/ipns_resolver_validation_test.go b/namesys/ipns_resolver_validation_test.go index 6ba9b54aae28..7da72593c327 100644 --- a/namesys/ipns_resolver_validation_test.go +++ b/namesys/ipns_resolver_validation_test.go @@ -6,20 +6,20 @@ import ( "time" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - mockrouting "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/mock" - offline "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil" + mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock" + offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" - ropts "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing/options" record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" + ropts "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing/options" pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore" pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem" ) diff --git a/namesys/namesys.go b/namesys/namesys.go index c7cb94450f52..410c7e65c8dc 100644 --- a/namesys/namesys.go +++ b/namesys/namesys.go @@ -6,7 +6,7 @@ import ( "time" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" @@ -14,7 +14,7 @@ import ( peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" isd "gx/ipfs/QmZmmuAXgX73UQmX1jRKjTGmjzq24Jinqkq8vzkBtno4uX/go-is-domain" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" ) // mpns (a multi-protocol NameSystem) implements generic IPFS naming. diff --git a/namesys/namesys_test.go b/namesys/namesys_test.go index 8513139faaeb..ac4887e366e4 100644 --- a/namesys/namesys_test.go +++ b/namesys/namesys_test.go @@ -7,12 +7,12 @@ import ( "time" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" + "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - offroute "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline" + offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" diff --git a/namesys/proquint.go b/namesys/proquint.go index 001ff3bd1307..dc2f8c2871e0 100644 --- a/namesys/proquint.go +++ b/namesys/proquint.go @@ -7,7 +7,7 @@ import ( context "context" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" proquint "gx/ipfs/QmYnf27kzqR2cxt6LFZdrAFJuQd6785fTkBvMuEj9EeRxM/proquint" ) diff --git a/namesys/publisher.go b/namesys/publisher.go index d07f688761dd..850f0bc94ca7 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -7,8 +7,8 @@ import ( "time" pin "github.com/ipfs/go-ipfs/pin" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs" + ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" @@ -16,7 +16,7 @@ import ( dsquery "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" pb "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns/pb" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto" base32 "gx/ipfs/QmfVj3x4D6Jkq9SEoi5n2NmoUomLwoeiwnYz2KQa15wRw6/base32" ) diff --git a/namesys/publisher_test.go b/namesys/publisher_test.go index b354c5602909..268a22893042 100644 --- a/namesys/publisher_test.go +++ b/namesys/publisher_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - dshelp "gx/ipfs/QmNvDiCTyxmM5RfhtexSeNs6cXCkSiE3pgkVXC9kWwTcu3/go-ipfs-ds-help" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - mockrouting "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/mock" testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil" + mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" + dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" ) diff --git a/namesys/republisher/repub.go b/namesys/republisher/repub.go index c35dcc74c8b5..17f5c5d30b19 100644 --- a/namesys/republisher/repub.go +++ b/namesys/republisher/repub.go @@ -7,7 +7,7 @@ import ( keystore "github.com/ipfs/go-ipfs/keystore" namesys "github.com/ipfs/go-ipfs/namesys" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" diff --git a/namesys/republisher/repub_test.go b/namesys/republisher/repub_test.go index 7a1664e8fa78..83e294d8974b 100644 --- a/namesys/republisher/repub_test.go +++ b/namesys/republisher/repub_test.go @@ -10,7 +10,7 @@ import ( mock "github.com/ipfs/go-ipfs/core/mock" namesys "github.com/ipfs/go-ipfs/namesys" . "github.com/ipfs/go-ipfs/namesys/republisher" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" mocknet "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/net/mock" diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go index cf30c623b3f4..41821a2bff3f 100644 --- a/namesys/resolve_test.go +++ b/namesys/resolve_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" - mockrouting "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/mock" testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil" + mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" diff --git a/namesys/routing.go b/namesys/routing.go index 0f006d14d88c..b02ffc155a11 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -6,16 +6,16 @@ import ( "time" opts "github.com/ipfs/go-ipfs/namesys/opts" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" - dht "gx/ipfs/QmUQm3siMUyxXuTM4kQxtKQC1YKbMi1ccKUoHqwt8ktwFf/go-libp2p-kad-dht" + dht "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht" ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns" pb "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns/pb" - routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing" + routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing" proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto" ) diff --git a/package.json b/package.json index cc3dd6e55cbc..b8c7204ae0eb 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "version": "0.2.0" }, { - "hash": "QmUQm3siMUyxXuTM4kQxtKQC1YKbMi1ccKUoHqwt8ktwFf", + "hash": "QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp", "name": "go-libp2p-kad-dht", "version": "4.4.0" }, @@ -333,7 +333,7 @@ "version": "0.2.0" }, { - "hash": "QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw", + "hash": "QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch", "name": "go-libp2p-routing", "version": "2.5.0" }, @@ -416,19 +416,19 @@ }, { "author": "hsanjuan", - "hash": "QmNvDiCTyxmM5RfhtexSeNs6cXCkSiE3pgkVXC9kWwTcu3", + "hash": "QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b", "name": "go-ipfs-ds-help", "version": "0.1.0" }, { "author": "hsanjuan", - "hash": "QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y", + "hash": "QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6", "name": "go-ipfs-routing", "version": "0.1.0" }, { "author": "hsanjuan", - "hash": "QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw", + "hash": "QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS", "name": "go-ipfs-blockstore", "version": "0.1.0" }, @@ -458,19 +458,19 @@ }, { "author": "hsanjuan", - "hash": "QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se", + "hash": "QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT", "name": "go-ipfs-exchange-offline", "version": "0.1.0" }, { "author": "stebalien", - "hash": "QmPVoodkirYLLWek3hvtchrB2o5cyb6VGhKfGnWciQ6ZHa", + "hash": "QmYNHDSyFKfvySMY4AHuouMyz5rL1NoFJdjG7kfWA9tNwU", "name": "go-libp2p-pubsub-router", "version": "0.4.0" }, { "author": "Stebalien", - "hash": "QmQq7kiho4kbv6T8w1x8LppZp7BtAFmUU2MEuue3zRJNh7", + "hash": "QmSFHnkFwayfnRKK1Z8jBUauMYMkHrZpQyvbxkFoPYb1VQ", "name": "go-libp2p-routing-helpers", "version": "0.3.0" }, @@ -488,31 +488,31 @@ }, { "author": "why", - "hash": "QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH", + "hash": "QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u", "name": "go-bitswap", "version": "1.1.0" }, { "author": "why", - "hash": "QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo", + "hash": "QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m", "name": "go-blockservice", "version": "1.1.0" }, { "author": "why", - "hash": "Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3", + "hash": "QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC", "name": "go-merkledag", "version": "1.1.0" }, { "author": "why", - "hash": "QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk", + "hash": "QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3", "name": "go-path", "version": "1.1.0" }, { "author": "why", - "hash": "QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo", + "hash": "QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA", "name": "go-unixfs", "version": "1.1.0" }, @@ -530,7 +530,7 @@ }, { "author": "hsanjuan", - "hash": "QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF", + "hash": "QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno", "name": "go-mfs", "version": "0.1.0" }, diff --git a/pin/gc/gc.go b/pin/gc/gc.go index ba854be1ebe2..abb05f93c6ce 100644 --- a/pin/gc/gc.go +++ b/pin/gc/gc.go @@ -8,16 +8,16 @@ import ( "strings" pin "github.com/ipfs/go-ipfs/pin" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" dstore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) var log = logging.Logger("gc") diff --git a/pin/pin.go b/pin/pin.go index 0d7f71d289e2..f4281667e6f4 100644 --- a/pin/pin.go +++ b/pin/pin.go @@ -10,7 +10,7 @@ import ( "time" "github.com/ipfs/go-ipfs/dagutils" - mdag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" diff --git a/pin/pin_test.go b/pin/pin_test.go index 1a9e1d7be212..70bcd722b4e8 100644 --- a/pin/pin_test.go +++ b/pin/pin_test.go @@ -5,15 +5,15 @@ import ( "testing" "time" - mdag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bs "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bs "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" util "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) var rand = util.NewTimeSeededRand() diff --git a/pin/set.go b/pin/set.go index 3588769e98bc..53d51d156c40 100644 --- a/pin/set.go +++ b/pin/set.go @@ -10,7 +10,7 @@ import ( "sort" "github.com/ipfs/go-ipfs/pin/internal/pb" - "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/pin/set_test.go b/pin/set_test.go index 9a07bb00b056..4a9f66d9cd8c 100644 --- a/pin/set_test.go +++ b/pin/set_test.go @@ -5,14 +5,14 @@ import ( "encoding/binary" "testing" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" - bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" + bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice" cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" - blockstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" - offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline" + offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline" + blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) func ignoreCids(_ cid.Cid) {} diff --git a/tar/format.go b/tar/format.go index 31140704ed2e..d4ffd3acd84a 100644 --- a/tar/format.go +++ b/tar/format.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/ipfs/go-ipfs/dagutils" - path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path" - importer "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer" - uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io" - dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag" + importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer" + uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io" + path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path" + dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format" diff --git a/thirdparty/cidv0v1/blockstore.go b/thirdparty/cidv0v1/blockstore.go index c81be9c524c1..039903136f94 100644 --- a/thirdparty/cidv0v1/blockstore.go +++ b/thirdparty/cidv0v1/blockstore.go @@ -4,7 +4,7 @@ import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" - bs "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" + bs "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) type blockstore struct { diff --git a/thirdparty/verifbs/verifbs.go b/thirdparty/verifbs/verifbs.go index 72dbcdad41dd..b84ea0073b44 100644 --- a/thirdparty/verifbs/verifbs.go +++ b/thirdparty/verifbs/verifbs.go @@ -3,8 +3,8 @@ package verifbs import ( cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid" blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format" - bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore" "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid" + bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore" ) type VerifBSGC struct {