gx update and fix code to use new Cid type
License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
Kevin Atkinson committed
Sep 11, 2018 at 22:19 UTC
d3174f4bd96941381d4ada02d1a7a105db3f0151
104 files changed
+595
-595
assets/assets.go
+13
-13
@@ -11,8 +11,8 @@ import (
11
12
"github.com/ipfs/go-ipfs/core"
13
"github.com/ipfs/go-ipfs/core/coreunix"
14
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
15
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
16
17
// this import keeps gx from thinking the dep isn't used
18
_ "gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html"
@@ -30,7 +30,7 @@ var initDocPaths = []string{
30
}
31
32
// SeedInitDocs adds the list of embedded init documentation to the passed node, pins it and returns the root key
33
-func SeedInitDocs(nd *core.IpfsNode) (*cid.Cid, error) {
33
+func SeedInitDocs(nd *core.IpfsNode) (cid.Cid, error) {
34
return addAssetList(nd, initDocPaths)
35
}
36
@@ -40,52 +40,52 @@ var initDirIndex = []string{
40
filepath.Join(initDirPath, "dir-index.html"),
41
}
42
43
-func SeedInitDirIndex(nd *core.IpfsNode) (*cid.Cid, error) {
43
+func SeedInitDirIndex(nd *core.IpfsNode) (cid.Cid, error) {
44
return addAssetList(nd, initDirIndex)
45
}
46
47
-func addAssetList(nd *core.IpfsNode, l []string) (*cid.Cid, error) {
47
+func addAssetList(nd *core.IpfsNode, l []string) (cid.Cid, error) {
48
dirb := uio.NewDirectory(nd.DAG)
49
50
for _, p := range l {
51
d, err := Asset(p)
52
if err != nil {
53
- return nil, fmt.Errorf("assets: could load Asset '%s': %s", p, err)
53
+ return cid.Cid{}, fmt.Errorf("assets: could load Asset '%s': %s", p, err)
54
}
55
56
s, err := coreunix.Add(nd, bytes.NewBuffer(d))
57
if err != nil {
58
- return nil, fmt.Errorf("assets: could not Add '%s': %s", p, err)
58
+ return cid.Cid{}, fmt.Errorf("assets: could not Add '%s': %s", p, err)
59
}
60
61
fname := filepath.Base(p)
62
63
c, err := cid.Decode(s)
64
if err != nil {
65
- return nil, err
65
+ return cid.Cid{}, err
66
}
67
68
node, err := nd.DAG.Get(nd.Context(), c)
69
if err != nil {
70
- return nil, err
70
+ return cid.Cid{}, err
71
}
72
73
if err := dirb.AddChild(nd.Context(), fname, node); err != nil {
74
- return nil, fmt.Errorf("assets: could not add '%s' as a child: %s", fname, err)
74
+ return cid.Cid{}, fmt.Errorf("assets: could not add '%s' as a child: %s", fname, err)
75
}
76
}
77
78
dir, err := dirb.GetNode()
79
if err != nil {
80
- return nil, err
80
+ return cid.Cid{}, err
81
}
82
83
if err := nd.Pinning.Pin(nd.Context(), dir, true); err != nil {
84
- return nil, fmt.Errorf("assets: Pinning on init-docu failed: %s", err)
84
+ return cid.Cid{}, fmt.Errorf("assets: Pinning on init-docu failed: %s", err)
85
}
86
87
if err := nd.Pinning.Flush(); err != nil {
88
- return nil, fmt.Errorf("assets: Pinning flush failed: %s", err)
88
+ return cid.Cid{}, fmt.Errorf("assets: Pinning flush failed: %s", err)
89
}
90
91
return dir.Cid(), nil
blocks/blockstoreutil/remove.go
+5
-5
@@ -7,9 +7,9 @@ import (
7
8
"github.com/ipfs/go-ipfs/pin"
9
10
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
11
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
11
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
12
- bs "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
12
+ bs "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
13
)
14
15
// RemovedBlock is used to respresent the result of removing a block.
@@ -34,7 +34,7 @@ type RmBlocksOpts struct {
34
// It returns a channel where objects of type RemovedBlock are placed, when
35
// not using the Quiet option. Block removal is asynchronous and will
36
// skip any pinned blocks.
37
-func RmBlocks(blocks bs.GCBlockstore, pins pin.Pinner, cids []*cid.Cid, opts RmBlocksOpts) (<-chan interface{}, error) {
37
+func RmBlocks(blocks bs.GCBlockstore, pins pin.Pinner, cids []cid.Cid, opts RmBlocksOpts) (<-chan interface{}, error) {
38
// make the channel large enough to hold any result to avoid
39
// blocking while holding the GCLock
40
out := make(chan interface{}, len(cids))
@@ -65,8 +65,8 @@ func RmBlocks(blocks bs.GCBlockstore, pins pin.Pinner, cids []*cid.Cid, opts RmB
65
// out channel, with an error which indicates that the Cid is pinned.
66
// This function is used in RmBlocks to filter out any blocks which are not
67
// to be removed (because they are pinned).
68
-func FilterPinned(pins pin.Pinner, out chan<- interface{}, cids []*cid.Cid) []*cid.Cid {
69
- stillOkay := make([]*cid.Cid, 0, len(cids))
68
+func FilterPinned(pins pin.Pinner, out chan<- interface{}, cids []cid.Cid) []cid.Cid {
69
+ stillOkay := make([]cid.Cid, 0, len(cids))
70
res, err := pins.CheckIfPinned(cids...)
71
if err != nil {
72
out <- &RemovedBlock{Error: fmt.Sprintf("pin check failed: %s", err)}
core/builder.go
+6
-6
@@ -14,12 +14,11 @@ import (
14
repo "github.com/ipfs/go-ipfs/repo"
15
cidv0v1 "github.com/ipfs/go-ipfs/thirdparty/cidv0v1"
16
"github.com/ipfs/go-ipfs/thirdparty/verifbs"
17
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
18
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
19
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
20
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
17
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
18
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
19
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
20
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
21
22
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
22
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
23
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
24
goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
@@ -27,13 +26,14 @@ import (
26
retry "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/retrystore"
27
dsync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
28
libp2p "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p"
29
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
30
cfg "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
31
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
32
record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
33
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
34
pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
35
p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host"
36
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
36
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
37
metrics "gx/ipfs/QmekzFM3hPZjTjUFGTABdQkEnQ3PTiMstY198PwSFr5w1Q/go-metrics-interface"
38
)
39
core/commands/add.go
+8
-8
@@ -11,20 +11,20 @@ import (
11
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12
"github.com/ipfs/go-ipfs/core/coreunix"
13
filestore "github.com/ipfs/go-ipfs/filestore"
14
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
15
- dagtest "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag/test"
16
- blockservice "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
17
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
14
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
15
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
16
+ dagtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test"
17
+ blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
18
19
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
20
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
20
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
21
pb "gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"
23
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
24
- cidutil "gx/ipfs/QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5/go-cidutil"
22
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
23
files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
27
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
24
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
25
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
26
+ cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil"
27
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
28
)
29
30
// ErrDepthLimitExceeded indicates that the max depth has been exceeded.
core/commands/bitswap.go
+2
-2
@@ -9,8 +9,8 @@ import (
9
lgc "github.com/ipfs/go-ipfs/commands/legacy"
10
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
11
e "github.com/ipfs/go-ipfs/core/commands/e"
12
- bitswap "gx/ipfs/QmVDDgboX5nPUE4pBcK2xC1b9XbStA4t2KrUWBRMr9AiFd/go-bitswap"
13
- decision "gx/ipfs/QmVDDgboX5nPUE4pBcK2xC1b9XbStA4t2KrUWBRMr9AiFd/go-bitswap/decision"
12
+ bitswap "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap"
13
+ decision "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap/decision"
14
15
"gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
16
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
core/commands/dag/dag.go
+6
-6
@@ -11,13 +11,13 @@ import (
11
e "github.com/ipfs/go-ipfs/core/commands/e"
12
coredag "github.com/ipfs/go-ipfs/core/coredag"
13
pin "github.com/ipfs/go-ipfs/pin"
14
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
14
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
15
16
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
17
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
18
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
19
files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
19
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
20
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
20
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
21
)
22
23
var DagCmd = &cmds.Command{
@@ -39,12 +39,12 @@ to deprecate and replace the existing 'ipfs object' command moving forward.
39
40
// OutputObject is the output type of 'dag put' command
41
type OutputObject struct {
42
- Cid *cid.Cid
42
+ Cid cid.Cid
43
}
44
45
// ResolveOutput is the output type of 'dag resolve' command
46
type ResolveOutput struct {
47
- Cid *cid.Cid
47
+ Cid cid.Cid
48
RemPath string
49
}
50
@@ -143,7 +143,7 @@ into an object of the specified format.
143
if dopin {
144
defer n.Blockstore.PinLock().Unlock()
145
146
- cids.ForEach(func(c *cid.Cid) error {
146
+ cids.ForEach(func(c cid.Cid) error {
147
n.Pinning.PinWithMode(c, pin.Recursive)
148
return nil
149
})
core/commands/dht.go
+9
-9
@@ -10,16 +10,16 @@ import (
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
e "github.com/ipfs/go-ipfs/core/commands/e"
13
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
14
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
13
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
14
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
15
16
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
17
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
18
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
19
b58 "gx/ipfs/QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY/go-base58-fast/base58"
19
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
20
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
21
- notif "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing/notifications"
22
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
20
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
21
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
22
+ notif "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing/notifications"
23
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
24
)
25
@@ -283,7 +283,7 @@ var provideRefDhtCmd = &cmds.Command{
283
284
rec, _, _ := req.Option("recursive").Bool()
285
286
- var cids []*cid.Cid
286
+ var cids []cid.Cid
287
for _, arg := range req.Arguments() {
288
c, err := cid.Decode(arg)
289
if err != nil {
@@ -368,7 +368,7 @@ var provideRefDhtCmd = &cmds.Command{
368
Type: notif.QueryEvent{},
369
}
370
371
-func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) error {
371
+func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []cid.Cid) error {
372
for _, c := range cids {
373
err := r.Provide(ctx, c, true)
374
if err != nil {
@@ -378,7 +378,7 @@ func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) er
378
return nil
379
}
380
381
-func provideKeysRec(ctx context.Context, r routing.IpfsRouting, dserv ipld.DAGService, cids []*cid.Cid) error {
381
+func provideKeysRec(ctx context.Context, r routing.IpfsRouting, dserv ipld.DAGService, cids []cid.Cid) error {
382
provided := cid.NewSet()
383
for _, c := range cids {
384
kset := cid.NewSet()
core/commands/files.go
+10
-10
@@ -16,22 +16,22 @@ import (
16
core "github.com/ipfs/go-ipfs/core"
17
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
18
e "github.com/ipfs/go-ipfs/core/commands/e"
19
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
20
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
21
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
22
- bservice "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
23
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
24
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
19
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
20
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
21
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
22
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
23
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
24
+ bservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
25
26
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
27
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
28
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
28
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
29
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
30
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
30
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
31
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
33
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
34
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
32
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
33
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
34
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
35
)
36
37
var flog = logging.Logger("cmds/files")
core/commands/filestore.go
+4
-4
@@ -13,9 +13,9 @@ import (
13
e "github.com/ipfs/go-ipfs/core/commands/e"
14
"github.com/ipfs/go-ipfs/filestore"
15
16
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
17
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
18
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
18
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
19
)
20
21
var FileStoreCmd = &cmds.Command{
@@ -57,7 +57,7 @@ The output is:
57
}
58
args := req.Arguments
59
if len(args) > 0 {
60
- out := perKeyActionToChan(req.Context, args, func(c *cid.Cid) *filestore.ListRes {
60
+ out := perKeyActionToChan(req.Context, args, func(c cid.Cid) *filestore.ListRes {
61
return filestore.List(fs, c)
62
})
63
@@ -157,7 +157,7 @@ For ERROR entries the error will also be printed to stderr.
157
}
158
args := req.Arguments()
159
if len(args) > 0 {
160
- out := perKeyActionToChan(req.Context(), args, func(c *cid.Cid) *filestore.ListRes {
160
+ out := perKeyActionToChan(req.Context(), args, func(c cid.Cid) *filestore.ListRes {
161
return filestore.Verify(fs, c)
162
})
163
res.SetOutput(out)
@@ -269,7 +269,7 @@ func listResToChan(ctx context.Context, next func() *filestore.ListRes) <-chan i
269
return out
270
}
271
272
-func perKeyActionToChan(ctx context.Context, args []string, action func(*cid.Cid) *filestore.ListRes) <-chan interface{} {
272
+func perKeyActionToChan(ctx context.Context, args []string, action func(cid.Cid) *filestore.ListRes) <-chan interface{} {
273
out := make(chan interface{}, 128)
274
go func() {
275
defer close(out)
core/commands/get.go
+3
-3
@@ -13,13 +13,13 @@ import (
13
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
14
e "github.com/ipfs/go-ipfs/core/commands/e"
15
16
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
17
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
16
"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
17
+ uarchive "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/archive"
18
"gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"
19
tar "gx/ipfs/QmQine7gvHncNevKtG9QXxf3nXcwSj6aDDmMm52mHofEEp/tar-utils"
20
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
21
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
22
- uarchive "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/archive"
22
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
23
)
24
25
var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9")
core/commands/ls.go
+11
-11
@@ -9,18 +9,18 @@ import (
9
cmds "github.com/ipfs/go-ipfs/commands"
10
core "github.com/ipfs/go-ipfs/core"
11
e "github.com/ipfs/go-ipfs/core/commands/e"
12
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
13
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
14
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
15
- blockservice "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
16
- unixfs "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
17
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
18
- unixfspb "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/pb"
19
-
20
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
12
+ unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
13
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
14
+ unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb"
15
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
16
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
17
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
18
+ blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
19
+
20
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
21
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
22
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
23
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
22
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
23
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
24
)
25
26
type LsLink struct {
core/commands/name/ipns.go
+2
-2
@@ -12,11 +12,11 @@ import (
12
namesys "github.com/ipfs/go-ipfs/namesys"
13
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
14
15
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
15
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
16
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
18
- offline "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
17
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
18
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
19
+ offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
20
)
21
22
var log = logging.Logger("core/commands/ipns")
core/commands/name/publish.go
+1
-1
@@ -12,10 +12,10 @@ import (
12
e "github.com/ipfs/go-ipfs/core/commands/e"
13
keystore "github.com/ipfs/go-ipfs/keystore"
14
15
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
15
"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
16
crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
17
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
18
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
19
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
20
)
21
core/commands/object/object.go
+3
-3
@@ -16,11 +16,11 @@ import (
16
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
17
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
18
19
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
19
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
20
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
21
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
22
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
23
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
22
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
23
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
24
)
25
26
const inputLimit = 2 << 20
core/commands/pin.go
+13
-13
@@ -12,16 +12,16 @@ import (
12
e "github.com/ipfs/go-ipfs/core/commands/e"
13
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
14
pin "github.com/ipfs/go-ipfs/pin"
15
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
15
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
16
17
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
18
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
19
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
20
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
21
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
17
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
18
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
19
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
20
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
23
- "gx/ipfs/QmVUhfewLZpSaAiBYCpw2krYMaiVmFuhr2iurQLuRoU6sD/go-verifcid"
24
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
21
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
22
+ "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid"
23
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
24
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
25
)
26
27
var PinCmd = &cmds.Command{
@@ -94,7 +94,7 @@ var addPinCmd = &cmds.Command{
94
ctx := v.DeriveContext(req.Context())
95
96
type pinResult struct {
97
- pins []*cid.Cid
97
+ pins []cid.Cid
98
err error
99
}
100
ch := make(chan pinResult, 1)
@@ -552,7 +552,7 @@ func pinLsAll(ctx context.Context, typeStr string, n *core.IpfsNode) (map[string
552
553
keys := make(map[string]RefKeyObject)
554
555
- AddToResultKeys := func(keyList []*cid.Cid, typeStr string) {
555
+ AddToResultKeys := func(keyList []cid.Cid, typeStr string) {
556
for _, c := range keyList {
557
keys[c.String()] = RefKeyObject{
558
Type: typeStr,
@@ -611,8 +611,8 @@ func pinVerify(ctx context.Context, n *core.IpfsNode, opts pinVerifyOpts) <-chan
611
getLinks := dag.GetLinksWithDAG(DAG)
612
recPins := n.Pinning.RecursiveKeys()
613
614
- var checkPin func(root *cid.Cid) PinStatus
615
- checkPin = func(root *cid.Cid) PinStatus {
614
+ var checkPin func(root cid.Cid) PinStatus
615
+ checkPin = func(root cid.Cid) PinStatus {
616
key := root.String()
617
if status, ok := visited[key]; ok {
618
return status
@@ -680,7 +680,7 @@ func (r PinVerifyRes) Format(out io.Writer) {
680
}
681
}
682
683
-func cidsToStrings(cs []*cid.Cid) []string {
683
+func cidsToStrings(cs []cid.Cid) []string {
684
out := make([]string, 0, len(cs))
685
for _, c := range cs {
686
out = append(out, c.String())
core/commands/pubsub.go
+3
-3
@@ -14,11 +14,11 @@ import (
14
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
15
e "github.com/ipfs/go-ipfs/core/commands/e"
16
17
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
18
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
19
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
20
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
19
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
21
floodsub "gx/ipfs/QmY1L5krVk8dv8d74uESmJTXGpoigVYqBVxXXz1aS8aFSb/go-libp2p-floodsub"
21
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
22
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
23
)
24
@@ -166,7 +166,7 @@ This command outputs data in the following encodings:
166
Type: floodsub.Message{},
167
}
168
169
-func connectToPubSubPeers(ctx context.Context, n *core.IpfsNode, cid *cid.Cid) {
169
+func connectToPubSubPeers(ctx context.Context, n *core.IpfsNode, cid cid.Cid) {
170
ctx, cancel := context.WithCancel(ctx)
171
defer cancel()
172
core/commands/refs.go
+6
-6
@@ -11,15 +11,15 @@ import (
11
"github.com/ipfs/go-ipfs/core"
12
e "github.com/ipfs/go-ipfs/core/commands/e"
13
14
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
16
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
16
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
17
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
17
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
18
)
19
20
// KeyList is a general type for outputting lists of keys
21
type KeyList struct {
22
- Keys []*cid.Cid
22
+ Keys []cid.Cid
23
}
24
25
// KeyListTextMarshaler outputs a KeyList as plaintext, one key per line
@@ -317,7 +317,7 @@ func (rw *RefWriter) writeRefsRecursive(n ipld.Node, depth int) (int, error) {
317
// rw.MaxDepth = -1 disables any pruning. But setting rw.Unique to true will
318
// prune already visited branches at the cost of keeping as set of visited
319
// CIDs in memory.
320
-func (rw *RefWriter) visit(c *cid.Cid, depth int) (bool, bool) {
320
+func (rw *RefWriter) visit(c cid.Cid, depth int) (bool, bool) {
321
atMaxDepth := rw.MaxDepth >= 0 && depth == rw.MaxDepth
322
overMaxDepth := rw.MaxDepth >= 0 && depth > rw.MaxDepth
323
@@ -366,7 +366,7 @@ func (rw *RefWriter) visit(c *cid.Cid, depth int) (bool, bool) {
366
}
367
368
// Write one edge
369
-func (rw *RefWriter) WriteEdge(from, to *cid.Cid, linkname string) error {
369
+func (rw *RefWriter) WriteEdge(from, to cid.Cid, linkname string) error {
370
if rw.Ctx != nil {
371
select {
372
case <-rw.Ctx.Done(): // just in case.
core/commands/repo.go
+4
-4
@@ -16,11 +16,11 @@ import (
16
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
17
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
20
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
21
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
22
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
22
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
23
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
23
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
24
)
25
26
type RepoVersion struct {
@@ -46,7 +46,7 @@ var RepoCmd = &cmds.Command{
46
47
// GcResult is the result returned by "repo gc" command.
48
type GcResult struct {
49
- Key *cid.Cid
49
+ Key cid.Cid
50
Error string `json:",omitempty"`
51
}
52
@@ -102,7 +102,7 @@ order to reclaim hard disk space.
102
res.SetError(fmt.Errorf("encountered errors during gc run"), cmdkit.ErrNormal)
103
}
104
} else {
105
- err := corerepo.CollectResult(req.Context(), gcOutChan, func(k *cid.Cid) {
105
+ err := corerepo.CollectResult(req.Context(), gcOutChan, func(k cid.Cid) {
106
select {
107
case outChan <- &GcResult{Key: k}:
108
case <-req.Context().Done():
core/commands/resolve.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
ncmd "github.com/ipfs/go-ipfs/core/commands/name"
13
ns "github.com/ipfs/go-ipfs/namesys"
14
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
15
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
15
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
16
17
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
18
)
core/commands/tar.go
+2
-2
@@ -9,8 +9,8 @@ import (
9
e "github.com/ipfs/go-ipfs/core/commands/e"
10
"github.com/ipfs/go-ipfs/core/coreunix"
11
tar "github.com/ipfs/go-ipfs/tar"
12
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
13
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
12
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
13
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
14
15
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
16
)
core/commands/unixfs/ls.go
+6
-6
@@ -12,12 +12,12 @@ import (
12
cmds "github.com/ipfs/go-ipfs/commands"
13
core "github.com/ipfs/go-ipfs/core"
14
e "github.com/ipfs/go-ipfs/core/commands/e"
15
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
16
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
17
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
18
- unixfs "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
19
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
20
- unixfspb "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/pb"
15
+ unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
16
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
17
+ unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb"
18
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
19
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
20
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
21
)
22
23
type LsLink struct {
core/commands/urlstore.go
+5
-5
@@ -8,14 +8,14 @@ import (
8
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
9
filestore "github.com/ipfs/go-ipfs/filestore"
10
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
13
+ balanced "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/balanced"
14
+ ihelper "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/helpers"
15
+ trickle "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/trickle"
16
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
17
cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
14
- balanced "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/balanced"
15
- ihelper "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/helpers"
16
- trickle "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/trickle"
17
- chunk "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
18
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
18
+ chunk "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
19
)
20
21
var urlStoreCmd = &cmds.Command{
core/core.go
+19
-19
@@ -30,22 +30,23 @@ import (
30
pin "github.com/ipfs/go-ipfs/pin"
31
repo "github.com/ipfs/go-ipfs/repo"
32
33
- "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
34
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
35
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
33
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
34
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
35
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
36
ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
38
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
37
+ bitswap "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap"
38
+ bsnet "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap/network"
39
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
40
- dht "gx/ipfs/QmRNxiPpZf3skMAtmDJpgHuW9uj1ukqV1zjANj9d6bmHfE/go-libp2p-kad-dht"
41
- dhtopts "gx/ipfs/QmRNxiPpZf3skMAtmDJpgHuW9uj1ukqV1zjANj9d6bmHfE/go-libp2p-kad-dht/opts"
40
+ exchange "gx/ipfs/QmR1nncPsZR14A4hWr39mq8Lm7BGgS68bHVT9nop8NpWEM/go-ipfs-exchange-interface"
41
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
42
+ "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
43
quic "gx/ipfs/QmRgFWjY1idcimoGvSAzNenfptnciZnPHuW3P2yq9VgaqA/go-libp2p-quic-transport"
44
- nilrouting "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/none"
45
- offroute "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
44
goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
45
+ rhelpers "gx/ipfs/QmSFHnkFwayfnRKK1Z8jBUauMYMkHrZpQyvbxkFoPYb1VQ/go-libp2p-routing-helpers"
46
mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
47
mafilter "gx/ipfs/QmSW4uNHbvQia8iZDXzbwjiyHQtnyo9aFqfQAMasj3TJ6Y/go-maddr-filter"
48
+ nilrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/none"
49
+ offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
50
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
51
libp2p "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p"
52
discovery "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/discovery"
@@ -53,30 +54,29 @@ import (
54
rhost "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/host/routed"
55
identify "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/identify"
56
ping "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/ping"
56
- rhelpers "gx/ipfs/QmUy9RAnhX9LBEUbhg8mvrouMRsoF27ycvT2iZsSG8V7Sv/go-libp2p-routing-helpers"
57
- bitswap "gx/ipfs/QmVDDgboX5nPUE4pBcK2xC1b9XbStA4t2KrUWBRMr9AiFd/go-bitswap"
58
- bsnet "gx/ipfs/QmVDDgboX5nPUE4pBcK2xC1b9XbStA4t2KrUWBRMr9AiFd/go-bitswap/network"
57
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
58
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
59
connmgr "gx/ipfs/QmW9pfNup4hcWxyMxDGSe25tG9xepvLqqmQUoTDaawzTZe/go-libp2p-connmgr"
60
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
60
ifconnmgr "gx/ipfs/QmWGGN1nysi1qgqto31bENwESkmZBY4YGK4sZC3qhnqhSv/go-libp2p-interface-connmgr"
61
circuit "gx/ipfs/QmWX6RySJ3yAYmfjLSw1LtRZnDh5oVeA9kM3scNQJkysqa/go-libp2p-circuit"
63
- exchange "gx/ipfs/QmWw71Mz9PXKgYG8ZfTYN7Ax2Zm48Eurbne3wC2y7CKmLz/go-ipfs-exchange-interface"
64
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
62
floodsub "gx/ipfs/QmY1L5krVk8dv8d74uESmJTXGpoigVYqBVxXXz1aS8aFSb/go-libp2p-floodsub"
66
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
63
smux "gx/ipfs/QmY9JXR3FupnYAYJWK9aMr9bCpqWKcToQ1tz8DVGTrHpHw/go-stream-muxer"
64
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
65
+ psrouter "gx/ipfs/QmYNHDSyFKfvySMY4AHuouMyz5rL1NoFJdjG7kfWA9tNwU/go-libp2p-pubsub-router"
66
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
67
ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
70
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
68
pnet "gx/ipfs/QmZaQ3K9PRd5sYYoG1xbTGPtd3N7TYiKBRmcBUTsx8HVET/go-libp2p-pnet"
72
- psrouter "gx/ipfs/QmbcvfZBCN6FmPsL8wJmJxefmMNtk55h3uB5YJgVeqjfpK/go-libp2p-pubsub-router"
69
+ dht "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht"
70
+ dhtopts "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht/opts"
71
yamux "gx/ipfs/QmcsgrV3nCAKjiHKZhKVXWc4oY3WBECJCqahXEMpHeMrev/go-smux-yamux"
72
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
73
record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
74
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
75
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
76
metrics "gx/ipfs/QmdhwKw53CTV8EJSAsR1bpmMT5kXiWBgeAyv1EXeeDiXqR/go-libp2p-metrics"
77
mplex "gx/ipfs/QmdiBZzwGtN2yHJrWD9ojQ7ASS48nv7BcojWLkYd1ZtrV2/go-smux-multiplex"
78
p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host"
79
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
79
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
80
)
81
82
const IpnsValidatorTag = "ipns"
@@ -808,7 +808,7 @@ func (n *IpfsNode) loadBootstrapPeers() ([]pstore.PeerInfo, error) {
808
809
func (n *IpfsNode) loadFilesRoot() error {
810
dsk := ds.NewKey("/local/filesroot")
811
- pf := func(ctx context.Context, c *cid.Cid) error {
811
+ pf := func(ctx context.Context, c cid.Cid) error {
812
return n.Repo.Datastore().Put(dsk, c.Bytes())
813
}
814
core/coreapi/block.go
+3
-3
@@ -11,8 +11,8 @@ import (
11
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
12
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
13
14
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
15
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
16
)
17
18
type BlockAPI CoreAPI
@@ -75,7 +75,7 @@ func (api *BlockAPI) Rm(ctx context.Context, p coreiface.Path, opts ...caopts.Bl
75
if err != nil {
76
return err
77
}
78
- cids := []*cid.Cid{rp.Cid()}
78
+ cids := []cid.Cid{rp.Cid()}
79
o := util.RmBlocksOpts{Force: settings.Force}
80
81
out, err := util.RmBlocks(api.node.Blockstore, api.node.Pinning, cids, o)
core/coreapi/dag.go
+2
-2
@@ -12,8 +12,8 @@ import (
12
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
13
coredag "github.com/ipfs/go-ipfs/core/coredag"
14
15
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
16
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
16
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
17
)
18
19
type DagAPI CoreAPI
core/coreapi/dht.go
+11
-11
@@ -8,15 +8,15 @@ import (
8
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
10
11
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
12
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
13
- cidutil "gx/ipfs/QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5/go-cidutil"
14
- blockservice "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
16
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
17
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
13
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
14
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
15
+ cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil"
16
+ blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
17
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
18
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
19
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
19
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
20
)
21
22
type DhtAPI CoreAPI
@@ -77,9 +77,9 @@ func (api *DhtAPI) Provide(ctx context.Context, path coreiface.Path, opts ...cao
77
}
78
79
if settings.Recursive {
80
- err = provideKeysRec(ctx, api.node.Routing, api.node.Blockstore, []*cid.Cid{c})
80
+ err = provideKeysRec(ctx, api.node.Routing, api.node.Blockstore, []cid.Cid{c})
81
} else {
82
- err = provideKeys(ctx, api.node.Routing, []*cid.Cid{c})
82
+ err = provideKeys(ctx, api.node.Routing, []cid.Cid{c})
83
}
84
if err != nil {
85
return err
@@ -88,7 +88,7 @@ func (api *DhtAPI) Provide(ctx context.Context, path coreiface.Path, opts ...cao
88
return nil
89
}
90
91
-func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) error {
91
+func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []cid.Cid) error {
92
for _, c := range cids {
93
err := r.Provide(ctx, c, true)
94
if err != nil {
@@ -98,7 +98,7 @@ func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) er
98
return nil
99
}
100
101
-func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Blockstore, cids []*cid.Cid) error {
101
+func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Blockstore, cids []cid.Cid) error {
102
provided := cidutil.NewStreamingSet()
103
104
errCh := make(chan error)
core/coreapi/dht_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
12
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
13
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
13
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
14
)
15
16
func TestDhtFindPeer(t *testing.T) {
core/coreapi/interface/coreapi.go
+1
-1
@@ -5,7 +5,7 @@ package iface
5
import (
6
"context"
7
8
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
8
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
9
)
10
11
// CoreAPI defines an unified interface to IPFS for Go programs
core/coreapi/interface/dag.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
8
9
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
9
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
10
)
11
12
// DagOps groups operations that can be batched together
core/coreapi/interface/object.go
+3
-3
@@ -6,14 +6,14 @@ import (
6
7
options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
8
9
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
10
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
9
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
10
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
11
)
12
13
// ObjectStat provides information about dag nodes
14
type ObjectStat struct {
15
// Cid is the CID of the node
16
- Cid *cid.Cid
16
+ Cid cid.Cid
17
18
// NumLinks is number of links the node contains
19
NumLinks int
core/coreapi/interface/options/block.go
+1
-1
@@ -2,8 +2,8 @@ package options
2
3
import (
4
"fmt"
5
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
6
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
6
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
7
)
8
9
type BlockPutSettings struct {
core/coreapi/interface/options/dag.go
+1
-1
@@ -3,7 +3,7 @@ package options
3
import (
4
"math"
5
6
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
6
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
7
)
8
9
type DagPutSettings struct {
core/coreapi/interface/path.go
+11
-11
@@ -1,9 +1,9 @@
1
package iface
2
3
import (
4
- ipfspath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
4
+ ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
5
6
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
6
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
7
)
8
9
//TODO: merge with ipfspath so we don't depend on it
@@ -65,7 +65,7 @@ type ResolvedPath interface {
65
// * Calling Cid() will return `cidB`
66
// * Calling Root() will return `cidRoot`
67
// * Calling Remainder() will return `foo/bar`
68
- Cid() *cid.Cid
68
+ Cid() cid.Cid
69
70
// Root returns the CID of the root object of the path
71
//
@@ -74,7 +74,7 @@ type ResolvedPath interface {
74
// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
75
//
76
// For more examples see the documentation of Cid() method
77
- Root() *cid.Cid
77
+ Root() cid.Cid
78
79
// Remainder returns unresolved part of the path
80
//
@@ -100,13 +100,13 @@ type path struct {
100
// resolvedPath implements coreiface.resolvedPath
101
type resolvedPath struct {
102
path
103
- cid *cid.Cid
104
- root *cid.Cid
103
+ cid cid.Cid
104
+ root cid.Cid
105
remainder string
106
}
107
108
// IpfsPath creates new /ipfs path from the provided CID
109
-func IpfsPath(c *cid.Cid) ResolvedPath {
109
+func IpfsPath(c cid.Cid) ResolvedPath {
110
return &resolvedPath{
111
path: path{ipfspath.Path("/ipfs/" + c.String())},
112
cid: c,
@@ -116,7 +116,7 @@ func IpfsPath(c *cid.Cid) ResolvedPath {
116
}
117
118
// IpldPath creates new /ipld path from the provided CID
119
-func IpldPath(c *cid.Cid) ResolvedPath {
119
+func IpldPath(c cid.Cid) ResolvedPath {
120
return &resolvedPath{
121
path: path{ipfspath.Path("/ipld/" + c.String())},
122
cid: c,
@@ -138,7 +138,7 @@ func ParsePath(p string) (Path, error) {
138
// NewResolvedPath creates new ResolvedPath. This function performs no checks
139
// and is intended to be used by resolver implementations. Incorrect inputs may
140
// cause panics. Handle with care.
141
-func NewResolvedPath(ipath ipfspath.Path, c *cid.Cid, root *cid.Cid, remainder string) ResolvedPath {
141
+func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
142
return &resolvedPath{
143
path: path{ipath},
144
cid: c,
@@ -163,11 +163,11 @@ func (p *path) Mutable() bool {
163
return p.Namespace() == "ipns"
164
}
165
166
-func (p *resolvedPath) Cid() *cid.Cid {
166
+func (p *resolvedPath) Cid() cid.Cid {
167
return p.cid
168
}
169
170
-func (p *resolvedPath) Root() *cid.Cid {
170
+func (p *resolvedPath) Root() cid.Cid {
171
return p.root
172
}
173
core/coreapi/interface/unixfs.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"context"
5
"io"
6
7
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
7
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
8
)
9
10
// UnixfsAPI is the basic interface to immutable files in IPFS
core/coreapi/key.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
9
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
- ipfspath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
11
+ ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
12
13
crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
14
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
core/coreapi/name.go
+2
-2
@@ -13,11 +13,11 @@ import (
13
keystore "github.com/ipfs/go-ipfs/keystore"
14
namesys "github.com/ipfs/go-ipfs/namesys"
15
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
16
- ipath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
16
+ ipath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
17
18
crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
19
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
20
- offline "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
20
+ offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
21
)
22
23
type NameAPI CoreAPI
core/coreapi/name_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"testing"
8
"time"
9
10
- ipath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
10
+ ipath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
11
12
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
13
opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
core/coreapi/object.go
+6
-6
@@ -16,10 +16,10 @@ import (
16
"github.com/ipfs/go-ipfs/dagutils"
17
"github.com/ipfs/go-ipfs/pin"
18
19
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
20
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
21
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
22
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
19
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
20
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
21
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
22
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
23
)
24
25
const inputLimit = 2 << 20
@@ -320,11 +320,11 @@ func (api *ObjectAPI) Diff(ctx context.Context, before coreiface.Path, after cor
320
Path: change.Path,
321
}
322
323
- if change.Before != nil {
323
+ if change.Before.Defined() {
324
out[i].Before = coreiface.IpfsPath(change.Before)
325
}
326
327
- if change.After != nil {
327
+ if change.After.Defined() {
328
out[i].After = coreiface.IpfsPath(change.After)
329
}
330
}
core/coreapi/path.go
+5
-5
@@ -8,12 +8,12 @@ import (
8
core "github.com/ipfs/go-ipfs/core"
9
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
namesys "github.com/ipfs/go-ipfs/namesys"
11
- ipfspath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
12
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
13
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
11
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
12
+ ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
13
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
14
15
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
16
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
16
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
17
)
18
19
// ResolveNode resolves the path `p` using Unixfs resolver, gets and returns the
core/coreapi/pin.go
+8
-8
@@ -7,11 +7,11 @@ import (
7
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
8
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
9
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
10
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
11
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
10
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
11
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
12
13
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
14
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
13
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
14
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
15
)
16
17
type PinAPI CoreAPI
@@ -81,7 +81,7 @@ func (api *PinAPI) Update(ctx context.Context, from coreiface.Path, to coreiface
81
}
82
83
type pinStatus struct {
84
- cid *cid.Cid
84
+ cid cid.Cid
85
ok bool
86
badNodes []coreiface.BadPinNode
87
}
@@ -115,8 +115,8 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro
115
getLinks := merkledag.GetLinksWithDAG(DAG)
116
recPins := api.node.Pinning.RecursiveKeys()
117
118
- var checkPin func(root *cid.Cid) *pinStatus
119
- checkPin = func(root *cid.Cid) *pinStatus {
118
+ var checkPin func(root cid.Cid) *pinStatus
119
+ checkPin = func(root cid.Cid) *pinStatus {
120
key := root.String()
121
if status, ok := visited[key]; ok {
122
return status
@@ -171,7 +171,7 @@ func (api *PinAPI) pinLsAll(typeStr string, ctx context.Context) ([]coreiface.Pi
171
172
keys := make(map[string]*pinInfo)
173
174
- AddToResultKeys := func(keyList []*cid.Cid, typeStr string) {
174
+ AddToResultKeys := func(keyList []cid.Cid, typeStr string) {
175
for _, c := range keyList {
176
keys[c.String()] = &pinInfo{
177
pinType: typeStr,
core/coreapi/unixfs.go
+3
-3
@@ -6,10 +6,10 @@ import (
6
7
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
8
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
9
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
9
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
10
11
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
12
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
13
)
14
15
type UnixfsAPI CoreAPI
core/coreapi/unixfs_test.go
+3
-3
@@ -19,16 +19,16 @@ import (
19
keystore "github.com/ipfs/go-ipfs/keystore"
20
repo "github.com/ipfs/go-ipfs/repo"
21
22
- mdag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
22
+ unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
23
+ cbor "gx/ipfs/QmPrv66vmh2P7vLJMpYx6DWLTNKvVB4Jdkyxs6V3QvWKvf/go-ipld-cbor"
24
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
25
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
26
datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
27
syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
28
mocknet "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/net/mock"
28
- unixfs "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
29
+ mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
30
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
31
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
31
- cbor "gx/ipfs/QmepvyyduWnXHm1G7ybmGbJfQQHTAo36DjP2nvF7H7ZXjE/go-ipld-cbor"
32
)
33
34
const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
core/coredag/cbor.go
+2
-2
@@ -4,8 +4,8 @@ import (
4
"io"
5
"io/ioutil"
6
7
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
8
- ipldcbor "gx/ipfs/QmepvyyduWnXHm1G7ybmGbJfQQHTAo36DjP2nvF7H7ZXjE/go-ipld-cbor"
7
+ ipldcbor "gx/ipfs/QmPrv66vmh2P7vLJMpYx6DWLTNKvVB4Jdkyxs6V3QvWKvf/go-ipld-cbor"
8
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
9
)
10
11
func cborJSONParser(r io.Reader, mhType uint64, mhLen int) ([]ipld.Node, error) {
core/coredag/dagpb.go
+3
-3
@@ -5,11 +5,11 @@ import (
5
"io/ioutil"
6
"math"
7
8
- "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
8
+ "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
10
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
11
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
11
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
12
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
12
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
13
)
14
15
func dagpbJSONParser(r io.Reader, mhType uint64, mhLen int) ([]ipld.Node, error) {
core/coredag/dagtransl.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"fmt"
5
"io"
6
7
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
7
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
8
)
9
10
// DagParser is function used for parsing stream into Node
core/coredag/raw.go
+4
-4
@@ -5,12 +5,12 @@ import (
5
"io/ioutil"
6
"math"
7
8
- "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
8
+ "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
10
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
11
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
11
- block "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
12
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
13
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
12
+ block "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
13
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
14
)
15
16
func rawRawParser(r io.Reader, mhType uint64, mhLen int) ([]ipld.Node, error) {
core/corehttp/commands.go
+1
-1
@@ -14,9 +14,9 @@ import (
14
"github.com/ipfs/go-ipfs/core"
15
corecommands "github.com/ipfs/go-ipfs/core/commands"
16
17
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
17
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
18
cmdsHttp "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds/http"
19
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
20
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
21
)
22
core/corehttp/gateway_handler.go
+12
-12
@@ -16,19 +16,19 @@ import (
16
core "github.com/ipfs/go-ipfs/core"
17
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
18
"github.com/ipfs/go-ipfs/dagutils"
19
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
20
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
21
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
22
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
23
- "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer"
24
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
19
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
20
+ "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer"
21
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
22
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
23
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
24
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
25
26
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
27
- multibase "gx/ipfs/QmSbvata2WqNkqGtZNg8MR3SKwnB8iQ7vTPJgWqB8bC5kR/go-multibase"
28
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
29
- chunker "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
30
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
31
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
27
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
28
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
29
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
30
+ chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
31
+ multibase "gx/ipfs/QmekxXDhCxCJRNuzmHreuaT3BsuJcsjcXWNrtV9C8DRHtd/go-multibase"
32
)
33
34
const (
@@ -443,7 +443,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
443
newPath = path.Join(rsegs[2:])
444
}
445
446
- var newcid *cid.Cid
446
+ var newcid cid.Cid
447
rnode, err := core.Resolve(ctx, i.node.Namesys, i.node.Resolver, rootPath)
448
switch ev := err.(type) {
449
case resolver.ErrNoLink:
core/corehttp/gateway_test.go
+2
-2
@@ -18,12 +18,12 @@ import (
18
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
19
repo "github.com/ipfs/go-ipfs/repo"
20
21
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
22
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
21
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
22
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
23
datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
24
syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
25
id "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/protocol/identify"
26
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
27
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
28
)
29
core/corerepo/gc.go
+6
-6
@@ -11,9 +11,9 @@ import (
11
repo "github.com/ipfs/go-ipfs/repo"
12
13
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
14
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
16
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
16
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
17
)
18
19
var log = logging.Logger("corerepo")
@@ -70,13 +70,13 @@ func NewGC(n *core.IpfsNode) (*GC, error) {
70
}, nil
71
}
72
73
-func BestEffortRoots(filesRoot *mfs.Root) ([]*cid.Cid, error) {
73
+func BestEffortRoots(filesRoot *mfs.Root) ([]cid.Cid, error) {
74
rootDag, err := filesRoot.GetDirectory().GetNode()
75
if err != nil {
76
return nil, err
77
}
78
79
- return []*cid.Cid{rootDag.Cid()}, nil
79
+ return []cid.Cid{rootDag.Cid()}, nil
80
}
81
82
func GarbageCollect(n *core.IpfsNode, ctx context.Context) error {
@@ -94,7 +94,7 @@ func GarbageCollect(n *core.IpfsNode, ctx context.Context) error {
94
// CollectResult collects the output of a garbage collection run and calls the
95
// given callback for each object removed. It also collects all errors into a
96
// MultiError which is returned after the gc is completed.
97
-func CollectResult(ctx context.Context, gcOut <-chan gc.Result, cb func(*cid.Cid)) error {
97
+func CollectResult(ctx context.Context, gcOut <-chan gc.Result, cb func(cid.Cid)) error {
98
var errors []error
99
loop:
100
for {
@@ -105,7 +105,7 @@ loop:
105
}
106
if res.Error != nil {
107
errors = append(errors, res.Error)
108
- } else if res.KeyRemoved != nil && cb != nil {
108
+ } else if res.KeyRemoved.Defined() && cb != nil {
109
cb(res.KeyRemoved)
110
}
111
case <-ctx.Done():
core/corerepo/pinning.go
+8
-8
@@ -18,15 +18,15 @@ import (
18
"fmt"
19
20
"github.com/ipfs/go-ipfs/core"
21
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
22
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
23
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
21
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
22
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
23
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
24
25
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
25
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
26
)
27
28
-func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]*cid.Cid, error) {
29
- out := make([]*cid.Cid, len(paths))
28
+func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]cid.Cid, error) {
29
+ out := make([]cid.Cid, len(paths))
30
31
r := &resolver.Resolver{
32
DAG: n.DAG,
@@ -58,8 +58,8 @@ func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool)
58
return out, nil
59
}
60
61
-func Unpin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]*cid.Cid, error) {
62
- unpinned := make([]*cid.Cid, len(paths))
61
+func Unpin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]cid.Cid, error) {
62
+ unpinned := make([]cid.Cid, len(paths))
63
64
r := &resolver.Resolver{
65
DAG: n.DAG,
core/coreunix/add.go
+14
-14
@@ -12,20 +12,20 @@ import (
12
13
core "github.com/ipfs/go-ipfs/core"
14
"github.com/ipfs/go-ipfs/pin"
15
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
16
- unixfs "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
17
- balanced "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/balanced"
18
- ihelper "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/helpers"
19
- trickle "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer/trickle"
20
-
21
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
15
+ unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
16
+ balanced "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/balanced"
17
+ ihelper "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/helpers"
18
+ trickle "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/trickle"
19
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
20
+
21
+ posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo"
22
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
23
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
24
files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
24
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
25
- posinfo "gx/ipfs/QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU/go-ipfs-posinfo"
26
- chunker "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
27
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
28
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
25
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
26
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
27
+ chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
28
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
29
)
30
31
var log = logging.Logger("coreunix")
@@ -88,7 +88,7 @@ type Adder struct {
88
root ipld.Node
89
mroot *mfs.Root
90
unlocker bstore.Unlocker
91
- tempRoot *cid.Cid
91
+ tempRoot cid.Cid
92
CidBuilder cid.Builder
93
liveNodes uint64
94
}
@@ -182,7 +182,7 @@ func (adder *Adder) PinRoot() error {
182
return err
183
}
184
185
- if adder.tempRoot != nil {
185
+ if adder.tempRoot.Defined() {
186
err := adder.pinning.Unpin(adder.ctx, adder.tempRoot, true)
187
if err != nil {
188
return err
core/coreunix/add_test.go
+7
-7
@@ -14,16 +14,16 @@ import (
14
"github.com/ipfs/go-ipfs/pin/gc"
15
"github.com/ipfs/go-ipfs/repo"
16
17
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
18
- "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
17
+ pi "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo"
18
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
19
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
20
files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
21
datastore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
22
syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
22
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
23
- pi "gx/ipfs/QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU/go-ipfs-posinfo"
23
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
24
+ "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
25
config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
25
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
26
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
26
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
27
)
28
29
const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
@@ -137,7 +137,7 @@ func TestAddGCLive(t *testing.T) {
137
}
138
}
139
140
- var last *cid.Cid
140
+ var last cid.Cid
141
for a := range out {
142
// wait for it to finish
143
c, err := cid.Decode(a.(*AddedObject).Hash)
core/coreunix/cat.go
+3
-3
@@ -4,9 +4,9 @@ import (
4
"context"
5
6
core "github.com/ipfs/go-ipfs/core"
7
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
8
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
9
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
7
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
8
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
9
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
10
)
11
12
func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (uio.DagReader, error) {
core/coreunix/metadata.go
+3
-3
@@ -2,9 +2,9 @@ package coreunix
2
3
import (
4
core "github.com/ipfs/go-ipfs/core"
5
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
6
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
7
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
5
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
6
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
7
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
8
)
9
10
func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) {
core/coreunix/metadata_test.go
+10
-10
@@ -7,20 +7,20 @@ import (
7
"testing"
8
9
core "github.com/ipfs/go-ipfs/core"
10
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
11
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
12
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
13
- importer "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer"
14
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
10
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
11
+ importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer"
12
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
13
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
14
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
15
16
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
17
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
17
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
18
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
19
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
20
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
21
- chunker "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
22
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
23
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
20
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
21
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
22
+ chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
23
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
24
)
25
26
func getDagserv(t *testing.T) ipld.DAGService {
core/pathresolver.go
+8
-8
@@ -6,12 +6,12 @@ import (
6
"strings"
7
8
namesys "github.com/ipfs/go-ipfs/namesys"
9
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
10
- resolver "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path/resolver"
9
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
10
+ resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
11
12
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
13
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
13
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
14
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
14
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
15
)
16
17
// ErrNoNamesys is an explicit error for when an IPFS node doesn't
@@ -80,7 +80,7 @@ func Resolve(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver,
80
// It first checks if the path is already in the form of just a cid (<cid> or
81
// /ipfs/<cid>) and returns immediately if so. Otherwise, it falls back onto
82
// Resolve to perform resolution of the dagnode being referenced.
83
-func ResolveToCid(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver, p path.Path) (*cid.Cid, error) {
83
+func ResolveToCid(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver, p path.Path) (cid.Cid, error) {
84
85
// If the path is simply a cid, parse and return it. Parsed paths are already
86
// normalized (read: prepended with /ipfs/ if needed), so segment[1] should
@@ -93,17 +93,17 @@ func ResolveToCid(ctx context.Context, nsys namesys.NameSystem, r *resolver.Reso
93
// segment of the path and resolve its link to the last segment.
94
head, tail, err := p.PopLastSegment()
95
if err != nil {
96
- return nil, err
96
+ return cid.Cid{}, err
97
}
98
dagnode, err := Resolve(ctx, nsys, r, head)
99
if err != nil {
100
- return nil, err
100
+ return cid.Cid{}, err
101
}
102
103
// Extract and return the cid of the link to the target dag node.
104
link, _, err := dagnode.ResolveLink([]string{tail})
105
if err != nil {
106
- return nil, err
106
+ return cid.Cid{}, err
107
}
108
109
return link.Cid, nil
core/pathresolver_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
core "github.com/ipfs/go-ipfs/core"
7
coremock "github.com/ipfs/go-ipfs/core/mock"
8
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
8
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
9
)
10
11
func TestResolveNoComponents(t *testing.T) {
dagutils/diff.go
+5
-5
@@ -7,9 +7,9 @@ import (
7
8
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
10
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
11
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
12
- "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
10
+ "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
11
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
12
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
13
)
14
15
// These constants define the changes that can be applied to a DAG.
@@ -24,8 +24,8 @@ const (
24
type Change struct {
25
Type coreiface.ChangeType
26
Path string
27
- Before *cid.Cid
28
- After *cid.Cid
27
+ Before cid.Cid
28
+ After cid.Cid
29
}
30
31
// String prints a human-friendly line about a change.
dagutils/diffenum.go
+8
-8
@@ -4,16 +4,16 @@ import (
4
"context"
5
"fmt"
6
7
- mdag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
7
+ mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
8
9
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
10
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
9
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
10
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
11
)
12
13
// DiffEnumerate fetches every object in the graph pointed to by 'to' that is
14
// not in 'from'. This can be used to more efficiently fetch a graph if you can
15
// guarantee you already have the entirety of 'from'
16
-func DiffEnumerate(ctx context.Context, dserv ipld.NodeGetter, from, to *cid.Cid) error {
16
+func DiffEnumerate(ctx context.Context, dserv ipld.NodeGetter, from, to cid.Cid) error {
17
fnd, err := dserv.Get(ctx, from)
18
if err != nil {
19
return fmt.Errorf("get %s: %s", from, err)
@@ -31,12 +31,12 @@ func DiffEnumerate(ctx context.Context, dserv ipld.NodeGetter, from, to *cid.Cid
31
// Since we're already assuming we have everything in the 'from' graph,
32
// add all those cids to our 'already seen' set to avoid potentially
33
// enumerating them later
34
- if c.bef != nil {
34
+ if c.bef.Defined() {
35
sset.Add(c.bef)
36
}
37
}
38
for _, c := range diff {
39
- if c.bef == nil {
39
+ if !c.bef.Defined() {
40
if sset.Has(c.aft) {
41
continue
42
}
@@ -59,7 +59,7 @@ func DiffEnumerate(ctx context.Context, dserv ipld.NodeGetter, from, to *cid.Cid
59
// if bef is nil and aft is not, that means aft was newly added
60
// if aft is nil and bef is not, that means bef was deleted
61
type diffpair struct {
62
- bef, aft *cid.Cid
62
+ bef, aft cid.Cid
63
}
64
65
// getLinkDiff returns a changeset between nodes 'a' and 'b'. Currently does
@@ -67,7 +67,7 @@ type diffpair struct {
67
func getLinkDiff(a, b ipld.Node) []diffpair {
68
ina := make(map[string]*ipld.Link)
69
inb := make(map[string]*ipld.Link)
70
- var aonly []*cid.Cid
70
+ var aonly []cid.Cid
71
for _, l := range b.Links() {
72
inb[l.Cid.KeyString()] = l
73
}
dagutils/diffenum_test.go
+11
-11
@@ -5,11 +5,11 @@ import (
5
"fmt"
6
"testing"
7
8
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- mdtest "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag/test"
8
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
+ mdtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test"
10
11
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
12
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
13
)
14
15
func buildNode(name string, desc map[string]ndesc, out map[string]ipld.Node) ipld.Node {
@@ -147,7 +147,7 @@ func TestDiffEnumBasic(t *testing.T) {
147
t.Fatal(err)
148
}
149
150
- err = assertCidList(lgds.log, []*cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid()})
150
+ err = assertCidList(lgds.log, []cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid()})
151
if err != nil {
152
t.Fatal(err)
153
}
@@ -155,10 +155,10 @@ func TestDiffEnumBasic(t *testing.T) {
155
156
type getLogger struct {
157
ds ipld.NodeGetter
158
- log []*cid.Cid
158
+ log []cid.Cid
159
}
160
161
-func (gl *getLogger) Get(ctx context.Context, c *cid.Cid) (ipld.Node, error) {
161
+func (gl *getLogger) Get(ctx context.Context, c cid.Cid) (ipld.Node, error) {
162
nd, err := gl.ds.Get(ctx, c)
163
if err != nil {
164
return nil, err
@@ -167,7 +167,7 @@ func (gl *getLogger) Get(ctx context.Context, c *cid.Cid) (ipld.Node, error) {
167
return nd, nil
168
}
169
170
-func (gl *getLogger) GetMany(ctx context.Context, cids []*cid.Cid) <-chan *ipld.NodeOption {
170
+func (gl *getLogger) GetMany(ctx context.Context, cids []cid.Cid) <-chan *ipld.NodeOption {
171
outCh := make(chan *ipld.NodeOption, len(cids))
172
nds := gl.ds.GetMany(ctx, cids)
173
for no := range nds {
@@ -183,7 +183,7 @@ func (gl *getLogger) GetMany(ctx context.Context, cids []*cid.Cid) <-chan *ipld.
183
return nds
184
}
185
186
-func assertCidList(a, b []*cid.Cid) error {
186
+func assertCidList(a, b []cid.Cid) error {
187
if len(a) != len(b) {
188
return fmt.Errorf("got different number of cids than expected")
189
}
@@ -215,7 +215,7 @@ func TestDiffEnumFail(t *testing.T) {
215
t.Fatal("expected err not found")
216
}
217
218
- err = assertCidList(lgds.log, []*cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid()})
218
+ err = assertCidList(lgds.log, []cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid()})
219
if err != nil {
220
t.Fatal(err)
221
}
@@ -242,7 +242,7 @@ func TestDiffEnumRecurse(t *testing.T) {
242
t.Fatal(err)
243
}
244
245
- err = assertCidList(lgds.log, []*cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid(), nds["d"].Cid()})
245
+ err = assertCidList(lgds.log, []cid.Cid{nds["a1"].Cid(), nds["a2"].Cid(), nds["c"].Cid(), nds["d"].Cid()})
246
if err != nil {
247
t.Fatal(err)
248
}
dagutils/utils.go
+6
-6
@@ -4,15 +4,15 @@ import (
4
"context"
5
"errors"
6
7
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
8
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
7
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
8
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
10
11
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
11
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
12
syncds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
14
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
15
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
13
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
14
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
15
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
16
)
17
18
// Editor represents a ProtoNode tree editor and provides methods to
dagutils/utils_test.go
+6
-6
@@ -4,12 +4,12 @@ import (
4
"context"
5
"testing"
6
7
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
8
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- mdtest "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag/test"
7
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
8
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
+ mdtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test"
10
11
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
12
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
13
)
14
15
func TestAddLink(t *testing.T) {
@@ -41,7 +41,7 @@ func TestAddLink(t *testing.T) {
41
}
42
}
43
44
-func assertNodeAtPath(t *testing.T, ds ipld.DAGService, root *dag.ProtoNode, pth string, exp *cid.Cid) {
44
+func assertNodeAtPath(t *testing.T, ds ipld.DAGService, root *dag.ProtoNode, pth string, exp cid.Cid) {
45
parts := path.SplitList(pth)
46
cur := root
47
for _, e := range parts {
exchange/reprovide/providers.go
+8
-8
@@ -5,29 +5,29 @@ import (
5
6
pin "github.com/ipfs/go-ipfs/pin"
7
8
- merkledag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- cidutil "gx/ipfs/QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5/go-cidutil"
10
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
11
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
12
- blocks "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
8
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
9
+ merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
10
+ cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil"
11
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
12
+ blocks "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
13
)
14
15
// NewBlockstoreProvider returns key provider using bstore.AllKeysChan
16
func NewBlockstoreProvider(bstore blocks.Blockstore) KeyChanFunc {
17
- return func(ctx context.Context) (<-chan *cid.Cid, error) {
17
+ return func(ctx context.Context) (<-chan cid.Cid, error) {
18
return bstore.AllKeysChan(ctx)
19
}
20
}
21
22
// NewPinnedProvider returns provider supplying pinned keys
23
func NewPinnedProvider(pinning pin.Pinner, dag ipld.DAGService, onlyRoots bool) KeyChanFunc {
24
- return func(ctx context.Context) (<-chan *cid.Cid, error) {
24
+ return func(ctx context.Context) (<-chan cid.Cid, error) {
25
set, err := pinSet(ctx, pinning, dag, onlyRoots)
26
if err != nil {
27
return nil, err
28
}
29
30
- outCh := make(chan *cid.Cid)
30
+ outCh := make(chan cid.Cid)
31
go func() {
32
defer close(outCh)
33
for c := range set.New {
exchange/reprovide/reprovide.go
+4
-4
@@ -6,16 +6,16 @@ import (
6
"time"
7
8
backoff "gx/ipfs/QmPJUtEJsm5YLUWhF6imvyCH8KZXRJa9Wup7FDMwTy5Ufz/backoff"
9
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
10
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
10
- "gx/ipfs/QmVUhfewLZpSaAiBYCpw2krYMaiVmFuhr2iurQLuRoU6sD/go-verifcid"
11
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
12
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
11
+ "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid"
12
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
13
)
14
15
var log = logging.Logger("reprovider")
16
17
//KeyChanFunc is function streaming CIDs to pass to content routing
18
-type KeyChanFunc func(context.Context) (<-chan *cid.Cid, error)
18
+type KeyChanFunc func(context.Context) (<-chan cid.Cid, error)
19
type doneFunc func(error)
20
21
type Reprovider struct {
exchange/reprovide/reprovide_test.go
+3
-3
@@ -5,12 +5,12 @@ import (
5
"testing"
6
7
testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil"
8
- mock "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/mock"
8
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
9
+ mock "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock"
10
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
11
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
11
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
12
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
13
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
13
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
14
15
. "github.com/ipfs/go-ipfs/exchange/reprovide"
16
)
filestore/filestore.go
+10
-10
@@ -11,12 +11,12 @@ import (
11
"context"
12
"errors"
13
14
+ posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo"
15
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
16
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
17
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
18
dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query"
16
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
17
- posinfo "gx/ipfs/QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU/go-ipfs-posinfo"
18
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
19
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
19
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
20
)
21
22
var log = logging.Logger("filestore")
@@ -49,7 +49,7 @@ func NewFilestore(bs blockstore.Blockstore, fm *FileManager) *Filestore {
49
50
// AllKeysChan returns a channel from which to read the keys stored in
51
// the blockstore. If the given context is cancelled the channel will be closed.
52
-func (f *Filestore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) {
52
+func (f *Filestore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
53
ctx, cancel := context.WithCancel(ctx)
54
55
a, err := f.bs.AllKeysChan(ctx)
@@ -58,7 +58,7 @@ func (f *Filestore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) {
58
return nil, err
59
}
60
61
- out := make(chan *cid.Cid, dsq.KeysOnlyBufSize)
61
+ out := make(chan cid.Cid, dsq.KeysOnlyBufSize)
62
go func() {
63
defer cancel()
64
defer close(out)
@@ -115,7 +115,7 @@ func (f *Filestore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) {
115
// blockstore. As expected, in the case of FileManager blocks, only the
116
// reference is deleted, not its contents. It may return
117
// ErrNotFound when the block is not stored.
118
-func (f *Filestore) DeleteBlock(c *cid.Cid) error {
118
+func (f *Filestore) DeleteBlock(c cid.Cid) error {
119
err1 := f.bs.DeleteBlock(c)
120
if err1 != nil && err1 != blockstore.ErrNotFound {
121
return err1
@@ -140,7 +140,7 @@ func (f *Filestore) DeleteBlock(c *cid.Cid) error {
140
141
// Get retrieves the block with the given Cid. It may return
142
// ErrNotFound when the block is not stored.
143
-func (f *Filestore) Get(c *cid.Cid) (blocks.Block, error) {
143
+func (f *Filestore) Get(c cid.Cid) (blocks.Block, error) {
144
blk, err := f.bs.Get(c)
145
switch err {
146
case nil:
@@ -154,7 +154,7 @@ func (f *Filestore) Get(c *cid.Cid) (blocks.Block, error) {
154
155
// GetSize returns the size of the requested block. It may return ErrNotFound
156
// when the block is not stored.
157
-func (f *Filestore) GetSize(c *cid.Cid) (int, error) {
157
+func (f *Filestore) GetSize(c cid.Cid) (int, error) {
158
size, err := f.bs.GetSize(c)
159
switch err {
160
case nil:
@@ -168,7 +168,7 @@ func (f *Filestore) GetSize(c *cid.Cid) (int, error) {
168
169
// Has returns true if the block with the given Cid is
170
// stored in the Filestore.
171
-func (f *Filestore) Has(c *cid.Cid) (bool, error) {
171
+func (f *Filestore) Has(c cid.Cid) (bool, error) {
172
has, err := f.bs.Has(c)
173
if err != nil {
174
return false, err
filestore/filestore_test.go
+7
-7
@@ -7,12 +7,12 @@ import (
7
"math/rand"
8
"testing"
9
10
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
10
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
11
12
+ posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo"
13
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
14
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
13
- posinfo "gx/ipfs/QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU/go-ipfs-posinfo"
14
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
15
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
16
)
17
18
func newTestFilestore(t *testing.T) (string, *Filestore) {
@@ -55,7 +55,7 @@ func TestBasicFilestore(t *testing.T) {
55
t.Fatal(err)
56
}
57
58
- var cids []*cid.Cid
58
+ var cids []cid.Cid
59
for i := 0; i < 100; i++ {
60
n := &posinfo.FilestoreNode{
61
PosInfo: &posinfo.PosInfo{
@@ -104,7 +104,7 @@ func TestBasicFilestore(t *testing.T) {
104
}
105
}
106
107
-func randomFileAdd(t *testing.T, fs *Filestore, dir string, size int) (string, []*cid.Cid) {
107
+func randomFileAdd(t *testing.T, fs *Filestore, dir string, size int) (string, []cid.Cid) {
108
buf := make([]byte, size)
109
rand.Read(buf)
110
@@ -113,7 +113,7 @@ func randomFileAdd(t *testing.T, fs *Filestore, dir string, size int) (string, [
113
t.Fatal(err)
114
}
115
116
- var out []*cid.Cid
116
+ var out []cid.Cid
117
for i := 0; i < size/10; i++ {
118
n := &posinfo.FilestoreNode{
119
PosInfo: &posinfo.PosInfo{
filestore/fsrefstore.go
+15
-15
@@ -10,15 +10,15 @@ import (
10
11
pb "github.com/ipfs/go-ipfs/filestore/pb"
12
13
+ posinfo "gx/ipfs/QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H/go-ipfs-posinfo"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
16
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
17
dsns "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/namespace"
18
dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query"
16
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
17
- posinfo "gx/ipfs/QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU/go-ipfs-posinfo"
18
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
19
+ dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help"
20
proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
20
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
21
- dshelp "gx/ipfs/Qmf1xGr3SyBpiPp3ZDuKkYMh4gnRk9K4QnbL17kstnf35h/go-ipfs-ds-help"
21
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
22
)
23
24
// FilestorePrefix identifies the key prefix for FileManager blocks.
@@ -60,7 +60,7 @@ func NewFileManager(ds ds.Batching, root string) *FileManager {
60
// AllKeysChan returns a channel from which to read the keys stored in
61
// the FileManager. If the given context is cancelled the channel will be
62
// closed.
63
-func (f *FileManager) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) {
63
+func (f *FileManager) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
64
q := dsq.Query{KeysOnly: true}
65
66
res, err := f.ds.Query(q)
@@ -68,7 +68,7 @@ func (f *FileManager) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error)
68
return nil, err
69
}
70
71
- out := make(chan *cid.Cid, dsq.KeysOnlyBufSize)
71
+ out := make(chan cid.Cid, dsq.KeysOnlyBufSize)
72
go func() {
73
defer close(out)
74
for {
@@ -97,7 +97,7 @@ func (f *FileManager) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error)
97
98
// DeleteBlock deletes the reference-block from the underlying
99
// datastore. It does not touch the referenced data.
100
-func (f *FileManager) DeleteBlock(c *cid.Cid) error {
100
+func (f *FileManager) DeleteBlock(c cid.Cid) error {
101
err := f.ds.Delete(dshelp.CidToDsKey(c))
102
if err == ds.ErrNotFound {
103
return blockstore.ErrNotFound
@@ -109,7 +109,7 @@ func (f *FileManager) DeleteBlock(c *cid.Cid) error {
109
// is done in two steps: the first step retrieves the reference
110
// block from the datastore. The second step uses the stored
111
// path and offsets to read the raw block data directly from disk.
112
-func (f *FileManager) Get(c *cid.Cid) (blocks.Block, error) {
112
+func (f *FileManager) Get(c cid.Cid) (blocks.Block, error) {
113
dobj, err := f.getDataObj(c)
114
if err != nil {
115
return nil, err
@@ -126,7 +126,7 @@ func (f *FileManager) Get(c *cid.Cid) (blocks.Block, error) {
126
//
127
// This method may successfully return the size even if returning the block
128
// would fail because the associated file is no longer available.
129
-func (f *FileManager) GetSize(c *cid.Cid) (int, error) {
129
+func (f *FileManager) GetSize(c cid.Cid) (int, error) {
130
dobj, err := f.getDataObj(c)
131
if err != nil {
132
return -1, err
@@ -134,14 +134,14 @@ func (f *FileManager) GetSize(c *cid.Cid) (int, error) {
134
return int(dobj.GetSize_()), nil
135
}
136
137
-func (f *FileManager) readDataObj(c *cid.Cid, d *pb.DataObj) ([]byte, error) {
137
+func (f *FileManager) readDataObj(c cid.Cid, d *pb.DataObj) ([]byte, error) {
138
if IsURL(d.GetFilePath()) {
139
return f.readURLDataObj(c, d)
140
}
141
return f.readFileDataObj(c, d)
142
}
143
144
-func (f *FileManager) getDataObj(c *cid.Cid) (*pb.DataObj, error) {
144
+func (f *FileManager) getDataObj(c cid.Cid) (*pb.DataObj, error) {
145
o, err := f.ds.Get(dshelp.CidToDsKey(c))
146
switch err {
147
case ds.ErrNotFound:
@@ -164,7 +164,7 @@ func unmarshalDataObj(data []byte) (*pb.DataObj, error) {
164
return &dobj, nil
165
}
166
167
-func (f *FileManager) readFileDataObj(c *cid.Cid, d *pb.DataObj) ([]byte, error) {
167
+func (f *FileManager) readFileDataObj(c cid.Cid, d *pb.DataObj) ([]byte, error) {
168
if !f.AllowFiles {
169
return nil, ErrFilestoreNotEnabled
170
}
@@ -207,7 +207,7 @@ func (f *FileManager) readFileDataObj(c *cid.Cid, d *pb.DataObj) ([]byte, error)
207
}
208
209
// reads and verifies the block from URL
210
-func (f *FileManager) readURLDataObj(c *cid.Cid, d *pb.DataObj) ([]byte, error) {
210
+func (f *FileManager) readURLDataObj(c cid.Cid, d *pb.DataObj) ([]byte, error) {
211
if !f.AllowUrls {
212
return nil, ErrUrlstoreNotEnabled
213
}
@@ -252,7 +252,7 @@ func (f *FileManager) readURLDataObj(c *cid.Cid, d *pb.DataObj) ([]byte, error)
252
253
// Has returns if the FileManager is storing a block reference. It does not
254
// validate the data, nor checks if the reference is valid.
255
-func (f *FileManager) Has(c *cid.Cid) (bool, error) {
255
+func (f *FileManager) Has(c cid.Cid) (bool, error) {
256
// NOTE: interesting thing to consider. Has doesnt validate the data.
257
// So the data on disk could be invalid, and we could think we have it.
258
dsk := dshelp.CidToDsKey(c)
filestore/util.go
+12
-12
@@ -6,11 +6,11 @@ import (
6
7
pb "github.com/ipfs/go-ipfs/filestore/pb"
8
9
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
10
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
11
dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query"
11
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
12
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
13
- dshelp "gx/ipfs/Qmf1xGr3SyBpiPp3ZDuKkYMh4gnRk9K4QnbL17kstnf35h/go-ipfs-ds-help"
12
+ dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help"
13
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
14
)
15
16
// Status is used to identify the state of the block data referenced
@@ -60,7 +60,7 @@ func (s Status) Format() string {
60
type ListRes struct {
61
Status Status
62
ErrorMsg string
63
- Key *cid.Cid
63
+ Key cid.Cid
64
FilePath string
65
Offset uint64
66
Size uint64
@@ -69,7 +69,7 @@ type ListRes struct {
69
// FormatLong returns a human readable string for a ListRes object.
70
func (r *ListRes) FormatLong() string {
71
switch {
72
- case r.Key == nil:
72
+ case !r.Key.Defined():
73
return "<corrupt key>"
74
case r.FilePath == "":
75
return r.Key.String()
@@ -82,7 +82,7 @@ func (r *ListRes) FormatLong() string {
82
// of the given Filestore and returns a ListRes object with the information.
83
// List does not verify that the reference is valid or whether the
84
// raw data is accesible. See Verify().
85
-func List(fs *Filestore, key *cid.Cid) *ListRes {
85
+func List(fs *Filestore, key cid.Cid) *ListRes {
86
return list(fs, false, key)
87
}
88
@@ -101,7 +101,7 @@ func ListAll(fs *Filestore, fileOrder bool) (func() *ListRes, error) {
101
// of the given Filestore and returns a ListRes object with the information.
102
// Verify makes sure that the reference is valid and the block data can be
103
// read.
104
-func Verify(fs *Filestore, key *cid.Cid) *ListRes {
104
+func Verify(fs *Filestore, key cid.Cid) *ListRes {
105
return list(fs, true, key)
106
}
107
@@ -116,7 +116,7 @@ func VerifyAll(fs *Filestore, fileOrder bool) (func() *ListRes, error) {
116
return listAll(fs, true)
117
}
118
119
-func list(fs *Filestore, verify bool, key *cid.Cid) *ListRes {
119
+func list(fs *Filestore, verify bool, key cid.Cid) *ListRes {
120
dobj, err := fs.fm.getDataObj(key)
121
if err != nil {
122
return mkListRes(key, nil, err)
@@ -145,16 +145,16 @@ func listAll(fs *Filestore, verify bool) (func() *ListRes, error) {
145
}, nil
146
}
147
148
-func next(qr dsq.Results) (*cid.Cid, *pb.DataObj, error) {
148
+func next(qr dsq.Results) (cid.Cid, *pb.DataObj, error) {
149
v, ok := qr.NextSync()
150
if !ok {
151
- return nil, nil, nil
151
+ return cid.Cid{}, nil, nil
152
}
153
154
k := ds.RawKey(v.Key)
155
c, err := dshelp.DsKeyToCid(k)
156
if err != nil {
157
- return nil, nil, fmt.Errorf("decoding cid from filestore: %s", err)
157
+ return cid.Cid{}, nil, fmt.Errorf("decoding cid from filestore: %s", err)
158
}
159
160
dobj, err := unmarshalDataObj(v.Value)
@@ -252,7 +252,7 @@ func (l listEntries) Less(i, j int) bool {
252
return l[i].filePath < l[j].filePath
253
}
254
255
-func mkListRes(c *cid.Cid, d *pb.DataObj, err error) *ListRes {
255
+func mkListRes(c cid.Cid, d *pb.DataObj, err error) *ListRes {
256
status := StatusOk
257
errorMsg := ""
258
if err != nil {
fuse/ipns/common.go
+2
-2
@@ -5,9 +5,9 @@ import (
5
6
"github.com/ipfs/go-ipfs/core"
7
nsys "github.com/ipfs/go-ipfs/namesys"
8
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
8
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
9
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
10
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
10
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
11
)
12
13
// InitializeKeyspace sets the ipns record for the given key to
fuse/ipns/ipns_test.go
+1
-1
@@ -17,8 +17,8 @@ import (
17
18
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
19
ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci"
20
- offroute "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
20
fstest "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs/fstestutil"
21
+ offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
22
racedet "gx/ipfs/Qmf7HqcW7LtCi1W8y2bdx2eJpze74jkbKqpByxgXikdbLF/go-detect-race"
23
)
24
fuse/ipns/ipns_unix.go
+6
-6
@@ -13,17 +13,17 @@ import (
13
14
core "github.com/ipfs/go-ipfs/core"
15
namesys "github.com/ipfs/go-ipfs/namesys"
16
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
17
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
18
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
16
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
17
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
18
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
19
20
- mfs "gx/ipfs/QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ/go-mfs"
20
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
21
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
22
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
23
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
24
fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse"
25
fs "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs"
26
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
26
+ mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
27
)
28
29
func init() {
@@ -84,7 +84,7 @@ type Root struct {
84
}
85
86
func ipnsPubFunc(ipfs *core.IpfsNode, k ci.PrivKey) mfs.PubFunc {
87
- return func(ctx context.Context, c *cid.Cid) error {
87
+ return func(ctx context.Context, c cid.Cid) error {
88
return ipfs.Namesys.Publish(ctx, k, path.FromCid(c))
89
}
90
}
fuse/node/mount_test.go
+1
-1
@@ -17,7 +17,7 @@ import (
17
namesys "github.com/ipfs/go-ipfs/namesys"
18
19
ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci"
20
- offroute "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
20
+ offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
21
)
22
23
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/ipfs_test.go
+5
-5
@@ -16,15 +16,15 @@ import (
16
core "github.com/ipfs/go-ipfs/core"
17
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
18
coremock "github.com/ipfs/go-ipfs/core/mock"
19
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
20
- importer "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer"
21
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
19
+ importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer"
20
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
21
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
22
23
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
24
ci "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil/ci"
25
fstest "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs/fstestutil"
26
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
27
- chunker "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
26
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
27
+ chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
28
)
29
30
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/readonly_unix.go
+5
-5
@@ -11,16 +11,16 @@ import (
11
"syscall"
12
13
core "github.com/ipfs/go-ipfs/core"
14
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
15
- mdag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
16
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
17
- ftpb "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/pb"
14
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
15
+ ftpb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb"
16
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
17
+ mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
18
19
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
20
fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse"
21
fs "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs"
22
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
22
lgbl "gx/ipfs/QmZ4zF1mBrt8C2mSCM4ZYE4aAnv78f7GvrzufJC4G5tecK/go-libp2p-loggables"
23
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
24
proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
25
)
26
namesys/base.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
context "context"
8
9
opts "github.com/ipfs/go-ipfs/namesys/opts"
10
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
10
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
11
)
12
13
type resolver interface {
namesys/cache.go
+1
-1
@@ -3,7 +3,7 @@ package namesys
3
import (
4
"time"
5
6
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
6
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
7
)
8
9
func (ns *mpns) cacheGet(name string) (path.Path, bool) {
namesys/dns.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"time"
9
10
opts "github.com/ipfs/go-ipfs/namesys/opts"
11
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
11
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
12
isd "gx/ipfs/QmZmmuAXgX73UQmX1jRKjTGmjzq24Jinqkq8vzkBtno4uX/go-is-domain"
13
)
14
namesys/interface.go
+1
-1
@@ -36,7 +36,7 @@ import (
36
context "context"
37
38
opts "github.com/ipfs/go-ipfs/namesys/opts"
39
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
39
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
40
41
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
42
)
namesys/ipns_resolver_validation_test.go
+5
-5
@@ -6,20 +6,20 @@ import (
6
"time"
7
8
opts "github.com/ipfs/go-ipfs/namesys/opts"
9
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
9
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
10
11
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
12
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
13
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
14
testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil"
15
- mockrouting "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/mock"
16
- offline "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
15
+ mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock"
16
+ offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
17
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
18
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
19
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
20
- ropts "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing/options"
19
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
20
record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
21
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
22
+ ropts "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing/options"
23
pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
24
pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
25
)
namesys/namesys.go
+2
-2
@@ -6,15 +6,15 @@ import (
6
"time"
7
8
opts "github.com/ipfs/go-ipfs/namesys/opts"
9
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
9
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
10
11
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
12
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
13
lru "gx/ipfs/QmQjMHF8ptRgx4E57UFMiT4YM6kqaJeYxZ1MCDX23aw4rK/golang-lru"
14
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
15
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
16
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
16
isd "gx/ipfs/QmZmmuAXgX73UQmX1jRKjTGmjzq24Jinqkq8vzkBtno4uX/go-is-domain"
17
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
18
)
19
20
// mpns (a multi-protocol NameSystem) implements generic IPFS naming.
namesys/namesys_test.go
+3
-3
@@ -7,12 +7,12 @@ import (
7
"time"
8
9
opts "github.com/ipfs/go-ipfs/namesys/opts"
10
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
11
- "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
10
+ "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
11
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
12
13
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
14
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
15
- offroute "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/offline"
15
+ offroute "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
16
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
17
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
18
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
namesys/proquint.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
context "context"
8
9
opts "github.com/ipfs/go-ipfs/namesys/opts"
10
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
10
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
11
proquint "gx/ipfs/QmYnf27kzqR2cxt6LFZdrAFJuQd6785fTkBvMuEj9EeRxM/proquint"
12
)
13
namesys/publisher.go
+3
-3
@@ -7,16 +7,16 @@ import (
7
"time"
8
9
pin "github.com/ipfs/go-ipfs/pin"
10
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
11
- ft "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs"
10
+ ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
11
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
12
13
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
14
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
15
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
16
dsquery "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query"
17
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
17
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
18
pb "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns/pb"
19
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
20
proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
21
base32 "gx/ipfs/QmfVj3x4D6Jkq9SEoi5n2NmoUomLwoeiwnYz2KQa15wRw6/base32"
22
)
namesys/publisher_test.go
+2
-2
@@ -9,12 +9,12 @@ import (
9
ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
10
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
11
testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil"
12
- mockrouting "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/mock"
12
+ mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock"
13
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
14
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
15
+ dshelp "gx/ipfs/QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b/go-ipfs-ds-help"
16
ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
17
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
17
- dshelp "gx/ipfs/Qmf1xGr3SyBpiPp3ZDuKkYMh4gnRk9K4QnbL17kstnf35h/go-ipfs-ds-help"
18
)
19
20
type identity struct {
namesys/republisher/repub.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
keystore "github.com/ipfs/go-ipfs/keystore"
9
namesys "github.com/ipfs/go-ipfs/namesys"
10
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
10
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
11
12
ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
13
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
namesys/republisher/repub_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
mock "github.com/ipfs/go-ipfs/core/mock"
11
namesys "github.com/ipfs/go-ipfs/namesys"
12
. "github.com/ipfs/go-ipfs/namesys/republisher"
13
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
13
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
14
15
goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16
mocknet "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/net/mock"
namesys/resolve_test.go
+2
-2
@@ -6,11 +6,11 @@ import (
6
"testing"
7
"time"
8
9
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
9
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
10
11
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
12
testutil "gx/ipfs/QmRNhSdqzMcuRxX9A1egBeQ3BhDTguDV5HPwi8wRykkPU8/go-testutil"
13
- mockrouting "gx/ipfs/QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN/go-ipfs-routing/mock"
13
+ mockrouting "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/mock"
14
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
15
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
16
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
namesys/routing.go
+4
-4
@@ -6,16 +6,16 @@ import (
6
"time"
7
8
opts "github.com/ipfs/go-ipfs/namesys/opts"
9
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
9
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
10
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
13
peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
13
- dht "gx/ipfs/QmRNxiPpZf3skMAtmDJpgHuW9uj1ukqV1zjANj9d6bmHfE/go-libp2p-kad-dht"
14
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
15
- routing "gx/ipfs/QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU/go-libp2p-routing"
16
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
+ dht "gx/ipfs/QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp/go-libp2p-kad-dht"
16
ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
17
pb "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns/pb"
18
+ routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
19
proto "gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
20
)
21
package.json
+50
-50
@@ -130,9 +130,9 @@
130
},
131
{
132
"author": "whyrusleeping",
133
- "hash": "QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb",
133
+ "hash": "QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7",
134
"name": "go-cid",
135
- "version": "0.8.0"
135
+ "version": "0.9.0"
136
},
137
{
138
"author": "whyrusleeping",
@@ -171,9 +171,9 @@
171
"version": "0.2.0"
172
},
173
{
174
- "hash": "QmRNxiPpZf3skMAtmDJpgHuW9uj1ukqV1zjANj9d6bmHfE",
174
+ "hash": "QmaXYSwxqJsX3EoGb1ZV2toZ9fXc8hWJPaBW1XAp1h2Tsp",
175
"name": "go-libp2p-kad-dht",
176
- "version": "4.3.9"
176
+ "version": "4.4.0"
177
},
178
{
179
"author": "whyrusleeping",
@@ -189,15 +189,15 @@
189
},
190
{
191
"author": "whyrusleeping",
192
- "hash": "QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC",
192
+ "hash": "QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL",
193
"name": "go-ipld-format",
194
- "version": "0.5.8"
194
+ "version": "0.6.0"
195
},
196
{
197
"author": "whyrusleeping",
198
- "hash": "QmepvyyduWnXHm1G7ybmGbJfQQHTAo36DjP2nvF7H7ZXjE",
198
+ "hash": "QmPrv66vmh2P7vLJMpYx6DWLTNKvVB4Jdkyxs6V3QvWKvf",
199
"name": "go-ipld-cbor",
200
- "version": "1.2.17"
200
+ "version": "1.3.0"
201
},
202
{
203
"author": "lgierth",
@@ -247,9 +247,9 @@
247
},
248
{
249
"author": "whyrusleeping",
250
- "hash": "QmSbvata2WqNkqGtZNg8MR3SKwnB8iQ7vTPJgWqB8bC5kR",
250
+ "hash": "QmekxXDhCxCJRNuzmHreuaT3BsuJcsjcXWNrtV9C8DRHtd",
251
"name": "go-multibase",
252
- "version": "0.2.7"
252
+ "version": "0.3.0"
253
},
254
{
255
"author": "multiformats",
@@ -328,20 +328,20 @@
328
},
329
{
330
"author": "stebalien",
331
- "hash": "QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3",
331
+ "hash": "QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM",
332
"name": "go-block-format",
333
- "version": "0.1.11"
333
+ "version": "0.2.0"
334
},
335
{
336
- "hash": "QmY9JUvS8kbgao3XbPh6WAV3ChE2nxGKhcGTHiwMC4gmcU",
336
+ "hash": "QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch",
337
"name": "go-libp2p-routing",
338
- "version": "2.4.10"
338
+ "version": "2.5.0"
339
},
340
{
341
"author": "whyrusleeping",
342
- "hash": "QmTH9uimkEFHc7HcrFSG2pMskWLSfnRb8HKUngiP7r4iDN",
342
+ "hash": "QmRNxeMQs2eVPouLxwa4tN72yTLLgWAi1cChXqgdEz5Ko4",
343
"name": "go-ipld-git",
344
- "version": "0.2.5"
344
+ "version": "0.3.0"
345
},
346
{
347
"hash": "QmSW4uNHbvQia8iZDXzbwjiyHQtnyo9aFqfQAMasj3TJ6Y",
@@ -398,15 +398,15 @@
398
},
399
{
400
"author": "hector",
401
- "hash": "QmXD4grfThQ4LwVoEEfe4dgR7ukmbV9TppM5Q4SPowp7hU",
401
+ "hash": "QmPG32VXR5jmpo9q8R9FNdR4Ae97Ky9CiZE6SctJLUB79H",
402
"name": "go-ipfs-posinfo",
403
- "version": "0.0.6"
403
+ "version": "0.1.0"
404
},
405
{
406
"author": "hsanjuan",
407
- "hash": "QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK",
407
+ "hash": "QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm",
408
"name": "go-ipfs-chunker",
409
- "version": "0.0.11"
409
+ "version": "0.1.0"
410
},
411
{
412
"author": "jbenet",
@@ -416,21 +416,21 @@
416
},
417
{
418
"author": "hsanjuan",
419
- "hash": "Qmf1xGr3SyBpiPp3ZDuKkYMh4gnRk9K4QnbL17kstnf35h",
419
+ "hash": "QmXejiSr776HgKLEGSs7unW7GT82AgfMbQX5crfSybGU8b",
420
"name": "go-ipfs-ds-help",
421
- "version": "0.0.10"
421
+ "version": "0.1.0"
422
},
423
{
424
"author": "hsanjuan",
425
- "hash": "QmRuUsZEg2WLCuidJGHVmE1NreHDmXWKLS466PKyDpXMhN",
425
+ "hash": "QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6",
426
"name": "go-ipfs-routing",
427
- "version": "0.0.25"
427
+ "version": "0.1.0"
428
},
429
{
430
"author": "hsanjuan",
431
- "hash": "Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i",
431
+ "hash": "QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS",
432
"name": "go-ipfs-blockstore",
433
- "version": "0.0.20"
433
+ "version": "0.1.0"
434
},
435
{
436
"author": "whyrusleeping",
@@ -452,27 +452,27 @@
452
},
453
{
454
"author": "hsanjuan",
455
- "hash": "QmWw71Mz9PXKgYG8ZfTYN7Ax2Zm48Eurbne3wC2y7CKmLz",
455
+ "hash": "QmR1nncPsZR14A4hWr39mq8Lm7BGgS68bHVT9nop8NpWEM",
456
"name": "go-ipfs-exchange-interface",
457
- "version": "0.0.6"
457
+ "version": "0.1.0"
458
},
459
{
460
"author": "hsanjuan",
461
- "hash": "QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r",
461
+ "hash": "QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT",
462
"name": "go-ipfs-exchange-offline",
463
- "version": "0.0.17"
463
+ "version": "0.1.0"
464
},
465
{
466
"author": "stebalien",
467
- "hash": "QmbcvfZBCN6FmPsL8wJmJxefmMNtk55h3uB5YJgVeqjfpK",
467
+ "hash": "QmYNHDSyFKfvySMY4AHuouMyz5rL1NoFJdjG7kfWA9tNwU",
468
"name": "go-libp2p-pubsub-router",
469
- "version": "0.3.17"
469
+ "version": "0.4.0"
470
},
471
{
472
"author": "Stebalien",
473
- "hash": "QmUy9RAnhX9LBEUbhg8mvrouMRsoF27ycvT2iZsSG8V7Sv",
473
+ "hash": "QmSFHnkFwayfnRKK1Z8jBUauMYMkHrZpQyvbxkFoPYb1VQ",
474
"name": "go-libp2p-routing-helpers",
475
- "version": "0.2.11"
475
+ "version": "0.3.0"
476
},
477
{
478
"author": "fsnotify",
@@ -488,33 +488,33 @@
488
},
489
{
490
"author": "why",
491
- "hash": "QmVDDgboX5nPUE4pBcK2xC1b9XbStA4t2KrUWBRMr9AiFd",
491
+ "hash": "QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u",
492
"name": "go-bitswap",
493
- "version": "1.0.15"
493
+ "version": "1.1.0"
494
},
495
{
496
"author": "why",
497
- "hash": "QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77",
497
+ "hash": "QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m",
498
"name": "go-blockservice",
499
- "version": "1.0.14"
499
+ "version": "1.1.0"
500
},
501
{
502
"author": "why",
503
- "hash": "QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a",
503
+ "hash": "QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC",
504
"name": "go-merkledag",
505
- "version": "1.0.14"
505
+ "version": "1.1.0"
506
},
507
{
508
"author": "why",
509
- "hash": "QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM",
509
+ "hash": "QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3",
510
"name": "go-path",
511
- "version": "1.0.14"
511
+ "version": "1.1.0"
512
},
513
{
514
"author": "why",
515
- "hash": "QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59",
515
+ "hash": "QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA",
516
"name": "go-unixfs",
517
- "version": "1.0.16"
517
+ "version": "1.1.0"
518
},
519
{
520
"author": "magik6k",
@@ -524,21 +524,21 @@
524
},
525
{
526
"author": "why",
527
- "hash": "QmVUhfewLZpSaAiBYCpw2krYMaiVmFuhr2iurQLuRoU6sD",
527
+ "hash": "QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT",
528
"name": "go-verifcid",
529
- "version": "0.0.4"
529
+ "version": "0.1.0"
530
},
531
{
532
"author": "hsanjuan",
533
- "hash": "QmPcR9Eft4i3XU5DXdnmNY8SWRuFnJms58NKjY1Hso8WiQ",
533
+ "hash": "QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno",
534
"name": "go-mfs",
535
- "version": "0.0.6"
535
+ "version": "0.1.0"
536
},
537
{
538
"author": "kevina",
539
- "hash": "QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5",
539
+ "hash": "QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh",
540
"name": "go-cidutil",
541
- "version": "0.0.2"
541
+ "version": "0.1.0"
542
},
543
{
544
"author": "lgierth",
pin/gc/gc.go
+16
-16
@@ -8,16 +8,16 @@ import (
8
"strings"
9
10
pin "github.com/ipfs/go-ipfs/pin"
11
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
12
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
11
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
12
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
13
14
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
14
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
15
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
16
dstore "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
17
- "gx/ipfs/QmVUhfewLZpSaAiBYCpw2krYMaiVmFuhr2iurQLuRoU6sD/go-verifcid"
18
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
19
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
20
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
17
+ "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid"
18
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
19
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
20
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
21
)
22
23
var log = logging.Logger("gc")
@@ -25,7 +25,7 @@ var log = logging.Logger("gc")
25
// Result represents an incremental output from a garbage collection
26
// run. It contains either an error, or the cid of a removed object.
27
type Result struct {
28
- KeyRemoved *cid.Cid
28
+ KeyRemoved cid.Cid
29
Error error
30
}
31
@@ -38,7 +38,7 @@ type Result struct {
38
//
39
// The routine then iterates over every block in the blockstore and
40
// deletes any block that is not found in the marked set.
41
-func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn pin.Pinner, bestEffortRoots []*cid.Cid) <-chan Result {
41
+func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn pin.Pinner, bestEffortRoots []cid.Cid) <-chan Result {
42
43
elock := log.EventBegin(ctx, "GC.lockWait")
44
unlocker := bs.GCLock()
@@ -130,8 +130,8 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
130
// Descendants recursively finds all the descendants of the given roots and
131
// adds them to the given cid.Set, using the provided dag.GetLinks function
132
// to walk the tree.
133
-func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots []*cid.Cid) error {
134
- verifyGetLinks := func(ctx context.Context, c *cid.Cid) ([]*ipld.Link, error) {
133
+func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots []cid.Cid) error {
134
+ verifyGetLinks := func(ctx context.Context, c cid.Cid) ([]*ipld.Link, error) {
135
err := verifcid.ValidateCid(c)
136
if err != nil {
137
return nil, err
@@ -168,12 +168,12 @@ func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots
168
169
// ColoredSet computes the set of nodes in the graph that are pinned by the
170
// pins in the given pinner.
171
-func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffortRoots []*cid.Cid, output chan<- Result) (*cid.Set, error) {
171
+func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffortRoots []cid.Cid, output chan<- Result) (*cid.Set, error) {
172
// KeySet currently implemented in memory, in the future, may be bloom filter or
173
// disk backed to conserve memory.
174
errors := false
175
gcs := cid.NewSet()
176
- getLinks := func(ctx context.Context, cid *cid.Cid) ([]*ipld.Link, error) {
176
+ getLinks := func(ctx context.Context, cid cid.Cid) ([]*ipld.Link, error) {
177
links, err := ipld.GetLinks(ctx, ng, cid)
178
if err != nil {
179
errors = true
@@ -187,7 +187,7 @@ func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffo
187
output <- Result{Error: err}
188
}
189
190
- bestEffortGetLinks := func(ctx context.Context, cid *cid.Cid) ([]*ipld.Link, error) {
190
+ bestEffortGetLinks := func(ctx context.Context, cid cid.Cid) ([]*ipld.Link, error) {
191
links, err := ipld.GetLinks(ctx, ng, cid)
192
if err != nil && err != ipld.ErrNotFound {
193
errors = true
@@ -230,7 +230,7 @@ var ErrCannotDeleteSomeBlocks = errors.New("garbage collection incomplete: could
230
// CannotFetchLinksError provides detailed information about which links
231
// could not be fetched and can appear as a Result in the GC output channel.
232
type CannotFetchLinksError struct {
233
- Key *cid.Cid
233
+ Key cid.Cid
234
Err error
235
}
236
@@ -244,7 +244,7 @@ func (e *CannotFetchLinksError) Error() string {
244
// blocks could not be deleted and can appear as a Result in the GC output
245
// channel.
246
type CannotDeleteBlockError struct {
247
- Key *cid.Cid
247
+ Key cid.Cid
248
Err error
249
}
250
pin/pin.go
+33
-33
@@ -10,19 +10,19 @@ import (
10
"time"
11
12
"github.com/ipfs/go-ipfs/dagutils"
13
- mdag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
13
+ mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
14
15
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
16
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
17
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
17
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
18
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
18
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
19
)
20
21
var log = logging.Logger("pin")
22
23
var pinDatastoreKey = ds.NewKey("/local/pins")
24
25
-var emptyKey *cid.Cid
25
+var emptyKey cid.Cid
26
27
func init() {
28
e, err := cid.Decode("QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n")
@@ -105,50 +105,50 @@ func StringToMode(s string) (Mode, bool) {
105
type Pinner interface {
106
// IsPinned returns whether or not the given cid is pinned
107
// and an explanation of why its pinned
108
- IsPinned(*cid.Cid) (string, bool, error)
108
+ IsPinned(cid.Cid) (string, bool, error)
109
110
// IsPinnedWithType returns whether or not the given cid is pinned with the
111
// given pin type, as well as returning the type of pin its pinned with.
112
- IsPinnedWithType(*cid.Cid, Mode) (string, bool, error)
112
+ IsPinnedWithType(cid.Cid, Mode) (string, bool, error)
113
114
// Pin the given node, optionally recursively.
115
Pin(ctx context.Context, node ipld.Node, recursive bool) error
116
117
// Unpin the given cid. If recursive is true, removes either a recursive or
118
// a direct pin. If recursive is false, only removes a direct pin.
119
- Unpin(ctx context.Context, cid *cid.Cid, recursive bool) error
119
+ Unpin(ctx context.Context, cid cid.Cid, recursive bool) error
120
121
// Update updates a recursive pin from one cid to another
122
// this is more efficient than simply pinning the new one and unpinning the
123
// old one
124
- Update(ctx context.Context, from, to *cid.Cid, unpin bool) error
124
+ Update(ctx context.Context, from, to cid.Cid, unpin bool) error
125
126
// Check if a set of keys are pinned, more efficient than
127
// calling IsPinned for each key
128
- CheckIfPinned(cids ...*cid.Cid) ([]Pinned, error)
128
+ CheckIfPinned(cids ...cid.Cid) ([]Pinned, error)
129
130
// PinWithMode is for manually editing the pin structure. Use with
131
// care! If used improperly, garbage collection may not be
132
// successful.
133
- PinWithMode(*cid.Cid, Mode)
133
+ PinWithMode(cid.Cid, Mode)
134
135
// RemovePinWithMode is for manually editing the pin structure.
136
// Use with care! If used improperly, garbage collection may not
137
// be successful.
138
- RemovePinWithMode(*cid.Cid, Mode)
138
+ RemovePinWithMode(cid.Cid, Mode)
139
140
// Flush writes the pin state to the backing datastore
141
Flush() error
142
143
// DirectKeys returns all directly pinned cids
144
- DirectKeys() []*cid.Cid
144
+ DirectKeys() []cid.Cid
145
146
// DirectKeys returns all recursively pinned cids
147
- RecursiveKeys() []*cid.Cid
147
+ RecursiveKeys() []cid.Cid
148
149
// InternalPins returns all cids kept pinned for the internal state of the
150
// pinner
151
- InternalPins() []*cid.Cid
151
+ InternalPins() []cid.Cid
152
}
153
154
// Pinned represents CID which has been pinned with a pinning strategy.
@@ -156,9 +156,9 @@ type Pinner interface {
156
// case that the item is not pinned directly (but rather pinned recursively
157
// by some ascendant).
158
type Pinned struct {
159
- Key *cid.Cid
159
+ Key cid.Cid
160
Mode Mode
161
- Via *cid.Cid
161
+ Via cid.Cid
162
}
163
164
// Pinned returns whether or not the given cid is pinned
@@ -254,7 +254,7 @@ func (p *pinner) Pin(ctx context.Context, node ipld.Node, recurse bool) error {
254
var ErrNotPinned = fmt.Errorf("not pinned")
255
256
// Unpin a given key
257
-func (p *pinner) Unpin(ctx context.Context, c *cid.Cid, recursive bool) error {
257
+func (p *pinner) Unpin(ctx context.Context, c cid.Cid, recursive bool) error {
258
p.lock.Lock()
259
defer p.lock.Unlock()
260
reason, pinned, err := p.isPinnedWithType(c, Any)
@@ -279,13 +279,13 @@ func (p *pinner) Unpin(ctx context.Context, c *cid.Cid, recursive bool) error {
279
}
280
}
281
282
-func (p *pinner) isInternalPin(c *cid.Cid) bool {
282
+func (p *pinner) isInternalPin(c cid.Cid) bool {
283
return p.internalPin.Has(c)
284
}
285
286
// IsPinned returns whether or not the given key is pinned
287
// and an explanation of why its pinned
288
-func (p *pinner) IsPinned(c *cid.Cid) (string, bool, error) {
288
+func (p *pinner) IsPinned(c cid.Cid) (string, bool, error) {
289
p.lock.RLock()
290
defer p.lock.RUnlock()
291
return p.isPinnedWithType(c, Any)
@@ -293,7 +293,7 @@ func (p *pinner) IsPinned(c *cid.Cid) (string, bool, error) {
293
294
// IsPinnedWithType returns whether or not the given cid is pinned with the
295
// given pin type, as well as returning the type of pin its pinned with.
296
-func (p *pinner) IsPinnedWithType(c *cid.Cid, mode Mode) (string, bool, error) {
296
+func (p *pinner) IsPinnedWithType(c cid.Cid, mode Mode) (string, bool, error) {
297
p.lock.RLock()
298
defer p.lock.RUnlock()
299
return p.isPinnedWithType(c, mode)
@@ -301,7 +301,7 @@ func (p *pinner) IsPinnedWithType(c *cid.Cid, mode Mode) (string, bool, error) {
301
302
// isPinnedWithType is the implementation of IsPinnedWithType that does not lock.
303
// intended for use by other pinned methods that already take locks
304
-func (p *pinner) isPinnedWithType(c *cid.Cid, mode Mode) (string, bool, error) {
304
+func (p *pinner) isPinnedWithType(c cid.Cid, mode Mode) (string, bool, error) {
305
switch mode {
306
case Any, Direct, Indirect, Recursive, Internal:
307
default:
@@ -346,7 +346,7 @@ func (p *pinner) isPinnedWithType(c *cid.Cid, mode Mode) (string, bool, error) {
346
347
// CheckIfPinned Checks if a set of keys are pinned, more efficient than
348
// calling IsPinned for each key, returns the pinned status of cid(s)
349
-func (p *pinner) CheckIfPinned(cids ...*cid.Cid) ([]Pinned, error) {
349
+func (p *pinner) CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) {
350
p.lock.RLock()
351
defer p.lock.RUnlock()
352
pinned := make([]Pinned, 0, len(cids))
@@ -366,8 +366,8 @@ func (p *pinner) CheckIfPinned(cids ...*cid.Cid) ([]Pinned, error) {
366
}
367
368
// Now walk all recursive pins to check for indirect pins
369
- var checkChildren func(*cid.Cid, *cid.Cid) error
370
- checkChildren = func(rk, parentKey *cid.Cid) error {
369
+ var checkChildren func(cid.Cid, cid.Cid) error
370
+ checkChildren = func(rk, parentKey cid.Cid) error {
371
links, err := ipld.GetLinks(context.TODO(), p.dserv, parentKey)
372
if err != nil {
373
return err
@@ -414,7 +414,7 @@ func (p *pinner) CheckIfPinned(cids ...*cid.Cid) ([]Pinned, error) {
414
// RemovePinWithMode is for manually editing the pin structure.
415
// Use with care! If used improperly, garbage collection may not
416
// be successful.
417
-func (p *pinner) RemovePinWithMode(c *cid.Cid, mode Mode) {
417
+func (p *pinner) RemovePinWithMode(c cid.Cid, mode Mode) {
418
p.lock.Lock()
419
defer p.lock.Unlock()
420
switch mode {
@@ -428,7 +428,7 @@ func (p *pinner) RemovePinWithMode(c *cid.Cid, mode Mode) {
428
}
429
}
430
431
-func cidSetWithValues(cids []*cid.Cid) *cid.Set {
431
+func cidSetWithValues(cids []cid.Cid) *cid.Set {
432
out := cid.NewSet()
433
for _, c := range cids {
434
out.Add(c)
@@ -493,19 +493,19 @@ func LoadPinner(d ds.Datastore, dserv, internal ipld.DAGService) (Pinner, error)
493
}
494
495
// DirectKeys returns a slice containing the directly pinned keys
496
-func (p *pinner) DirectKeys() []*cid.Cid {
496
+func (p *pinner) DirectKeys() []cid.Cid {
497
return p.directPin.Keys()
498
}
499
500
// RecursiveKeys returns a slice containing the recursively pinned keys
501
-func (p *pinner) RecursiveKeys() []*cid.Cid {
501
+func (p *pinner) RecursiveKeys() []cid.Cid {
502
return p.recursePin.Keys()
503
}
504
505
// Update updates a recursive pin from one cid to another
506
// this is more efficient than simply pinning the new one and unpinning the
507
// old one
508
-func (p *pinner) Update(ctx context.Context, from, to *cid.Cid, unpin bool) error {
508
+func (p *pinner) Update(ctx context.Context, from, to cid.Cid, unpin bool) error {
509
p.lock.Lock()
510
defer p.lock.Unlock()
511
@@ -579,17 +579,17 @@ func (p *pinner) Flush() error {
579
580
// InternalPins returns all cids kept pinned for the internal state of the
581
// pinner
582
-func (p *pinner) InternalPins() []*cid.Cid {
582
+func (p *pinner) InternalPins() []cid.Cid {
583
p.lock.Lock()
584
defer p.lock.Unlock()
585
- var out []*cid.Cid
585
+ var out []cid.Cid
586
out = append(out, p.internalPin.Keys()...)
587
return out
588
}
589
590
// PinWithMode allows the user to have fine grained control over pin
591
// counts
592
-func (p *pinner) PinWithMode(c *cid.Cid, mode Mode) {
592
+func (p *pinner) PinWithMode(c cid.Cid, mode Mode) {
593
p.lock.Lock()
594
defer p.lock.Unlock()
595
switch mode {
@@ -602,7 +602,7 @@ func (p *pinner) PinWithMode(c *cid.Cid, mode Mode) {
602
603
// hasChild recursively looks for a Cid among the children of a root Cid.
604
// The visit function can be used to shortcut already-visited branches.
605
-func hasChild(ng ipld.NodeGetter, root *cid.Cid, child *cid.Cid, visit func(*cid.Cid) bool) (bool, error) {
605
+func hasChild(ng ipld.NodeGetter, root cid.Cid, child cid.Cid, visit func(cid.Cid) bool) (bool, error) {
606
links, err := ipld.GetLinks(context.TODO(), ng, root)
607
if err != nil {
608
return false, err
pin/pin_test.go
+9
-9
@@ -5,20 +5,20 @@ import (
5
"testing"
6
"time"
7
8
- mdag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- bs "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
8
+ mdag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
+ bs "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
10
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
util "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
12
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
13
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
14
dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
15
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
16
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
15
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
16
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
17
)
18
19
var rand = util.NewTimeSeededRand()
20
21
-func randNode() (*mdag.ProtoNode, *cid.Cid) {
21
+func randNode() (*mdag.ProtoNode, cid.Cid) {
22
nd := new(mdag.ProtoNode)
23
nd.SetData(make([]byte, 32))
24
rand.Read(nd.Data())
@@ -26,7 +26,7 @@ func randNode() (*mdag.ProtoNode, *cid.Cid) {
26
return nd, k
27
}
28
29
-func assertPinned(t *testing.T, p Pinner, c *cid.Cid, failmsg string) {
29
+func assertPinned(t *testing.T, p Pinner, c cid.Cid, failmsg string) {
30
_, pinned, err := p.IsPinned(c)
31
if err != nil {
32
t.Fatal(err)
@@ -37,7 +37,7 @@ func assertPinned(t *testing.T, p Pinner, c *cid.Cid, failmsg string) {
37
}
38
}
39
40
-func assertUnpinned(t *testing.T, p Pinner, c *cid.Cid, failmsg string) {
40
+func assertUnpinned(t *testing.T, p Pinner, c cid.Cid, failmsg string) {
41
_, pinned, err := p.IsPinned(c)
42
if err != nil {
43
t.Fatal(err)
@@ -187,7 +187,7 @@ func TestIsPinnedLookup(t *testing.T) {
187
p := NewPinner(dstore, dserv, dserv)
188
189
aNodes := make([]*mdag.ProtoNode, aBranchLen)
190
- aKeys := make([]*cid.Cid, aBranchLen)
190
+ aKeys := make([]cid.Cid, aBranchLen)
191
for i := 0; i < aBranchLen; i++ {
192
a, _ := randNode()
193
if i >= 1 {
pin/set.go
+13
-13
@@ -10,10 +10,10 @@ import (
10
"sort"
11
12
"github.com/ipfs/go-ipfs/pin/internal/pb"
13
- "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
13
+ "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
14
15
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
16
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
16
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
17
"gx/ipfs/QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8/gogo-protobuf/proto"
18
)
19
@@ -25,7 +25,7 @@ const (
25
maxItems = 8192
26
)
27
28
-func hash(seed uint32, c *cid.Cid) uint32 {
28
+func hash(seed uint32, c cid.Cid) uint32 {
29
var buf [4]byte
30
binary.LittleEndian.PutUint32(buf[:], seed)
31
h := fnv.New32a()
@@ -34,9 +34,9 @@ func hash(seed uint32, c *cid.Cid) uint32 {
34
return h.Sum32()
35
}
36
37
-type itemIterator func() (c *cid.Cid, ok bool)
37
+type itemIterator func() (c cid.Cid, ok bool)
38
39
-type keyObserver func(*cid.Cid)
39
+type keyObserver func(cid.Cid)
40
41
type sortByHash struct {
42
links []*ipld.Link
@@ -97,7 +97,7 @@ func storeItems(ctx context.Context, dag ipld.DAGService, estimatedLen uint64, d
97
sort.Stable(s)
98
}
99
100
- hashed := make([][]*cid.Cid, defaultFanout)
100
+ hashed := make([][]cid.Cid, defaultFanout)
101
for {
102
// This loop essentially enumerates every single item in the set
103
// and maps them all into a set of buckets. Each bucket will be recursively
@@ -238,7 +238,7 @@ func walkItems(ctx context.Context, dag ipld.DAGService, n *merkledag.ProtoNode,
238
return nil
239
}
240
241
-func loadSet(ctx context.Context, dag ipld.DAGService, root *merkledag.ProtoNode, name string, internalKeys keyObserver) ([]*cid.Cid, error) {
241
+func loadSet(ctx context.Context, dag ipld.DAGService, root *merkledag.ProtoNode, name string, internalKeys keyObserver) ([]cid.Cid, error) {
242
l, err := root.GetNodeLink(name)
243
if err != nil {
244
return nil, err
@@ -257,7 +257,7 @@ func loadSet(ctx context.Context, dag ipld.DAGService, root *merkledag.ProtoNode
257
return nil, merkledag.ErrNotProtobuf
258
}
259
260
- var res []*cid.Cid
260
+ var res []cid.Cid
261
walk := func(idx int, link *ipld.Link) error {
262
res = append(res, link.Cid)
263
return nil
@@ -269,10 +269,10 @@ func loadSet(ctx context.Context, dag ipld.DAGService, root *merkledag.ProtoNode
269
return res, nil
270
}
271
272
-func getCidListIterator(cids []*cid.Cid) itemIterator {
273
- return func() (c *cid.Cid, ok bool) {
272
+func getCidListIterator(cids []cid.Cid) itemIterator {
273
+ return func() (c cid.Cid, ok bool) {
274
if len(cids) == 0 {
275
- return nil, false
275
+ return cid.Cid{}, false
276
}
277
278
first := cids[0]
@@ -281,7 +281,7 @@ func getCidListIterator(cids []*cid.Cid) itemIterator {
281
}
282
}
283
284
-func storeSet(ctx context.Context, dag ipld.DAGService, cids []*cid.Cid, internalKeys keyObserver) (*merkledag.ProtoNode, error) {
284
+func storeSet(ctx context.Context, dag ipld.DAGService, cids []cid.Cid, internalKeys keyObserver) (*merkledag.ProtoNode, error) {
285
iter := getCidListIterator(cids)
286
287
n, err := storeItems(ctx, dag, uint64(len(cids)), 0, iter, internalKeys)
pin/set_test.go
+7
-7
@@ -5,17 +5,17 @@ import (
5
"encoding/binary"
6
"testing"
7
8
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
9
- bserv "gx/ipfs/QmQLG22wSEStiociTSKQpZAuuaaWoF1B3iKyjPFvWiTQ77/go-blockservice"
8
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
9
+ bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
10
11
- offline "gx/ipfs/QmPuLWvxK1vg6ckKUpT53Dow9VLCcQGdL5Trwxa8PTLp7r/go-ipfs-exchange-offline"
11
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
12
ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
13
dsq "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query"
14
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
15
- blockstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
14
+ offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
15
+ blockstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
16
)
17
18
-func ignoreCids(_ *cid.Cid) {}
18
+func ignoreCids(_ cid.Cid) {}
19
20
func objCount(d ds.Datastore) int {
21
q := dsq.Query{KeysOnly: true}
@@ -46,7 +46,7 @@ func TestSet(t *testing.T) {
46
// an infinite recursion and crash (OOM)
47
limit := uint32((defaultFanout * maxItems) + 1)
48
49
- var inputs []*cid.Cid
49
+ var inputs []cid.Cid
50
buf := make([]byte, 4)
51
for i := uint32(0); i < limit; i++ {
52
binary.BigEndian.PutUint32(buf, i)
plugin/ipld.go
+1
-1
@@ -3,7 +3,7 @@ package plugin
3
import (
4
"github.com/ipfs/go-ipfs/core/coredag"
5
6
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
6
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
7
)
8
9
// PluginIPLD is an interface that can be implemented to add handlers for
plugin/loader/initializer.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"github.com/ipfs/go-ipfs/plugin"
6
"gx/ipfs/QmWLWmRVSiagqP15jczsGME1qpob6HDbtbHAY2he9W5iUo/opentracing-go"
7
8
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
8
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
9
)
10
11
func initialize(plugins []plugin.Plugin) error {
plugin/plugins/git/git.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"github.com/ipfs/go-ipfs/core/coredag"
10
"github.com/ipfs/go-ipfs/plugin"
11
12
+ "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
13
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
13
- git "gx/ipfs/QmTH9uimkEFHc7HcrFSG2pMskWLSfnRb8HKUngiP7r4iDN/go-ipld-git"
14
- "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
15
- "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
14
+ git "gx/ipfs/QmRNxeMQs2eVPouLxwa4tN72yTLLgWAi1cChXqgdEz5Ko4/go-ipld-git"
15
+ "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
16
)
17
18
// Plugins is exported list of plugins that will be loaded
tar/format.go
+6
-6
@@ -9,14 +9,14 @@ import (
9
"strings"
10
11
"github.com/ipfs/go-ipfs/dagutils"
12
- path "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
13
- dag "gx/ipfs/QmNr4E8z9bGTztvHJktp7uQaMdx9p3r9Asrq6eYk7iCh4a/go-merkledag"
14
- importer "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/importer"
15
- uio "gx/ipfs/QmWAfTyD6KEBm7bzqNRBPvqKrZCDtn5PGbs9V1DKfnVK59/go-unixfs/io"
12
+ importer "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer"
13
+ uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
14
+ path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
15
+ dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
16
17
logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
18
- ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
19
- chunker "gx/ipfs/QmXzBbJo2sLf3uwjNTeoWYiJV7CjAhkiA4twtLvwJSSNdK/go-ipfs-chunker"
18
+ ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
19
+ chunker "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
20
)
21
22
var log = logging.Logger("tarfmt")
test/integration/bitswap_wo_routing_test.go
+2
-2
@@ -7,10 +7,10 @@ import (
7
8
"github.com/ipfs/go-ipfs/core"
9
"github.com/ipfs/go-ipfs/core/mock"
10
- "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
10
+ "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
11
12
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
13
mocknet "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p/p2p/net/mock"
13
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
14
)
15
16
func TestBitswapWithoutRouting(t *testing.T) {
test/sharness/t0275-cid-security.sh
+1
-1
@@ -19,7 +19,7 @@ test_expect_success "error reason is pointed out" '
19
'
20
21
test_expect_success "adding using too short of a hash function gives out an error" '
22
- echo foo | test_must_fail ipfs block put --mhlen 19 2>block_out
22
+ echo foo | test_must_fail ipfs block put -f protobuf --mhlen 19 2>block_out
23
'
24
25
test_expect_success "error reason is pointed out" '
thirdparty/cidv0v1/blockstore.go
+12
-12
@@ -1,10 +1,10 @@
1
package cidv0v1
2
3
import (
4
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
5
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
5
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
6
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
7
- bs "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
6
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
7
+ bs "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
8
)
9
10
type blockstore struct {
@@ -15,19 +15,19 @@ func NewBlockstore(b bs.Blockstore) bs.Blockstore {
15
return &blockstore{b}
16
}
17
18
-func (b *blockstore) Has(c *cid.Cid) (bool, error) {
18
+func (b *blockstore) Has(c cid.Cid) (bool, error) {
19
have, err := b.Blockstore.Has(c)
20
if have || err != nil {
21
return have, err
22
}
23
c1 := tryOtherCidVersion(c)
24
- if c1 == nil {
24
+ if !c1.Defined() {
25
return false, nil
26
}
27
return b.Blockstore.Has(c1)
28
}
29
30
-func (b *blockstore) Get(c *cid.Cid) (blocks.Block, error) {
30
+func (b *blockstore) Get(c cid.Cid) (blocks.Block, error) {
31
block, err := b.Blockstore.Get(c)
32
if err == nil {
33
return block, nil
@@ -36,7 +36,7 @@ func (b *blockstore) Get(c *cid.Cid) (blocks.Block, error) {
36
return nil, err
37
}
38
c1 := tryOtherCidVersion(c)
39
- if c1 == nil {
39
+ if !c1.Defined() {
40
return nil, bs.ErrNotFound
41
}
42
block, err = b.Blockstore.Get(c1)
@@ -57,7 +57,7 @@ func (b *blockstore) Get(c *cid.Cid) (blocks.Block, error) {
57
return block, nil
58
}
59
60
-func (b *blockstore) GetSize(c *cid.Cid) (int, error) {
60
+func (b *blockstore) GetSize(c cid.Cid) (int, error) {
61
size, err := b.Blockstore.GetSize(c)
62
if err == nil {
63
return size, nil
@@ -66,18 +66,18 @@ func (b *blockstore) GetSize(c *cid.Cid) (int, error) {
66
return -1, err
67
}
68
c1 := tryOtherCidVersion(c)
69
- if c1 == nil {
69
+ if !c1.Defined() {
70
return -1, bs.ErrNotFound
71
}
72
return b.Blockstore.GetSize(c1)
73
}
74
75
-func tryOtherCidVersion(c *cid.Cid) *cid.Cid {
75
+func tryOtherCidVersion(c cid.Cid) cid.Cid {
76
prefix := c.Prefix()
77
if prefix.Codec != cid.DagProtobuf || prefix.MhType != mh.SHA2_256 || prefix.MhLength != 32 {
78
- return nil
78
+ return cid.Undef
79
}
80
- var c1 *cid.Cid
80
+ var c1 cid.Cid
81
if prefix.Version == 0 {
82
c1 = cid.NewCidV1(cid.DagProtobuf, c.Hash())
83
} else {
thirdparty/verifbs/verifbs.go
+6
-6
@@ -1,10 +1,10 @@
1
package verifbs
2
3
import (
4
- "gx/ipfs/QmVUhfewLZpSaAiBYCpw2krYMaiVmFuhr2iurQLuRoU6sD/go-verifcid"
5
- blocks "gx/ipfs/QmWAzSEoqZ6xU6pu8yL8e5WaMb7wtbfbhhN4p1DknUPtr3/go-block-format"
6
- cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
7
- bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
4
+ cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
5
+ blocks "gx/ipfs/QmRcHuYzAyswytBuMF78rj3LTChYszomRFXNg4685ZN1WM/go-block-format"
6
+ "gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid"
7
+ bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
8
)
9
10
type VerifBSGC struct {
@@ -27,7 +27,7 @@ func (bs *VerifBSGC) PutMany(blks []blocks.Block) error {
27
return bs.GCBlockstore.PutMany(blks)
28
}
29
30
-func (bs *VerifBSGC) Get(c *cid.Cid) (blocks.Block, error) {
30
+func (bs *VerifBSGC) Get(c cid.Cid) (blocks.Block, error) {
31
if err := verifcid.ValidateCid(c); err != nil {
32
return nil, err
33
}
@@ -54,7 +54,7 @@ func (bs *VerifBS) PutMany(blks []blocks.Block) error {
54
return bs.Blockstore.PutMany(blks)
55
}
56
57
-func (bs *VerifBS) Get(c *cid.Cid) (blocks.Block, error) {
57
+func (bs *VerifBS) Get(c cid.Cid) (blocks.Block, error) {
58
if err := verifcid.ValidateCid(c); err != nil {
59
return nil, err
60
}