@cryptotaxi247 / kubo / commits / b96a7a057

extract go-unixfs (importers and unixfs)

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Jeromy committed Jul 30, 2018 at 14:35 UTC b96a7a0579c1b94828cfe544c9a9f0b0830fefc6
59 files changed +112 -106
assets/assets.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 "github.com/ipfs/go-ipfs/core"
13 "github.com/ipfs/go-ipfs/core/coreunix"
14 - uio "github.com/ipfs/go-ipfs/unixfs/io"
14 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
15 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
16
17 // this import keeps gx from thinking the dep isn't used
core/builder.go
+1 -1
@@ -14,9 +14,9 @@ import (
14 repo "github.com/ipfs/go-ipfs/repo"
15 cfg "github.com/ipfs/go-ipfs/repo/config"
16 "github.com/ipfs/go-ipfs/thirdparty/verifbs"
17 - uio "github.com/ipfs/go-ipfs/unixfs/io"
17 bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
19 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
20 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
21
22 offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
core/commands/add.go
+1 -1
@@ -11,10 +11,10 @@ import (
11 "github.com/ipfs/go-ipfs/core/coreunix"
12 filestore "github.com/ipfs/go-ipfs/filestore"
13 mfs "github.com/ipfs/go-ipfs/mfs"
14 - ft "github.com/ipfs/go-ipfs/unixfs"
14 blockservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
15 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
16 dagtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
17 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
18
19 cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
20 mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
core/commands/files.go
+2 -2
@@ -16,10 +16,10 @@ import (
16 core "github.com/ipfs/go-ipfs/core"
17 e "github.com/ipfs/go-ipfs/core/commands/e"
18 mfs "github.com/ipfs/go-ipfs/mfs"
19 - ft "github.com/ipfs/go-ipfs/unixfs"
20 - uio "github.com/ipfs/go-ipfs/unixfs/io"
19 bservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
20 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
21 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
22 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
23 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
24 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
25
core/commands/get.go
+1 -1
@@ -11,8 +11,8 @@ import (
11
12 core "github.com/ipfs/go-ipfs/core"
13 e "github.com/ipfs/go-ipfs/core/commands/e"
14 - uarchive "github.com/ipfs/go-ipfs/unixfs/archive"
14 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
15 + uarchive "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/archive"
16 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
17
18 "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
core/commands/ls.go
+3 -3
@@ -9,11 +9,11 @@ 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 - unixfs "github.com/ipfs/go-ipfs/unixfs"
13 - uio "github.com/ipfs/go-ipfs/unixfs/io"
14 - unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
12 blockservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
13 merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
14 + unixfs "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16 + unixfspb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
17 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
18 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
19
core/commands/object/object.go
+1 -1
@@ -18,8 +18,8 @@ import (
18 core "github.com/ipfs/go-ipfs/core"
19 e "github.com/ipfs/go-ipfs/core/commands/e"
20 pin "github.com/ipfs/go-ipfs/pin"
21 - ft "github.com/ipfs/go-ipfs/unixfs"
21 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
22 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
23 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
24
25 cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
core/commands/object/patch.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 core "github.com/ipfs/go-ipfs/core"
12 e "github.com/ipfs/go-ipfs/core/commands/e"
13 "github.com/ipfs/go-ipfs/dagutils"
14 - ft "github.com/ipfs/go-ipfs/unixfs"
14 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
15 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
16 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
17
18 cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
core/commands/pin.go
+1 -1
@@ -12,7 +12,7 @@ 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 "github.com/ipfs/go-ipfs/unixfs/io"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16
17 bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18 "gx/ipfs/QmQwgv79RHrRnoXmhnpC1BPtY55HHeneGMpPwmmBU1fUAG/go-verifcid"
core/commands/unixfs/ls.go
+3 -3
@@ -12,10 +12,10 @@ 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 - unixfs "github.com/ipfs/go-ipfs/unixfs"
16 - uio "github.com/ipfs/go-ipfs/unixfs/io"
17 - unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
15 merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
16 + unixfs "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
17 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
18 + unixfspb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
19 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
20 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
21 )
core/commands/urlstore.go
+3 -3
@@ -6,9 +6,9 @@ import (
6 "net/http"
7
8 filestore "github.com/ipfs/go-ipfs/filestore"
9 - balanced "github.com/ipfs/go-ipfs/importer/balanced"
10 - ihelper "github.com/ipfs/go-ipfs/importer/helpers"
11 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
9 + balanced "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/balanced"
10 + ihelper "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
11 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
12
13 cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
14 mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
core/core.go
+1 -1
@@ -30,11 +30,11 @@ import (
30 pin "github.com/ipfs/go-ipfs/pin"
31 repo "github.com/ipfs/go-ipfs/repo"
32 config "github.com/ipfs/go-ipfs/repo/config"
33 - ft "github.com/ipfs/go-ipfs/unixfs"
33 bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
34 merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
35 bitswap "gx/ipfs/QmSLYFS88MpPsszqWdhGSxvHyoTnmaU4A74SD6KGib6Z3m/go-bitswap"
36 bsnet "gx/ipfs/QmSLYFS88MpPsszqWdhGSxvHyoTnmaU4A74SD6KGib6Z3m/go-bitswap/network"
37 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
38 "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
39
40 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
core/coreapi/object.go
+1 -1
@@ -14,8 +14,8 @@ import (
14 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
15 caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
16 "github.com/ipfs/go-ipfs/dagutils"
17 - ft "github.com/ipfs/go-ipfs/unixfs"
17 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
18 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
19
20 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
21 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
core/coreapi/path.go
+1 -1
@@ -8,7 +8,7 @@ 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 - uio "github.com/ipfs/go-ipfs/unixfs/io"
11 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
12 ipfspath "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
13 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
14
core/coreapi/unixfs.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
8 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
9 - uio "github.com/ipfs/go-ipfs/unixfs/io"
9 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
10
11 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
12 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
core/coreapi/unixfs_test.go
+1 -1
@@ -17,8 +17,8 @@ import (
17 keystore "github.com/ipfs/go-ipfs/keystore"
18 repo "github.com/ipfs/go-ipfs/repo"
19 config "github.com/ipfs/go-ipfs/repo/config"
20 - unixfs "github.com/ipfs/go-ipfs/unixfs"
20 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
21 + unixfs "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
22
23 cbor "gx/ipfs/QmWrbExtUaQQHjJ8FVVDAWj5o1MRAELDUV3VmoQsZHHb6L/go-ipld-cbor"
24 peer "gx/ipfs/QmdVrMn1LhB4ybb8hMVaMLXnA8XRSewMnK6YqXKXoTcRvN/go-libp2p-peer"
core/corehttp/gateway_handler.go
+3 -3
@@ -15,10 +15,10 @@ import (
15 core "github.com/ipfs/go-ipfs/core"
16 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
17 "github.com/ipfs/go-ipfs/dagutils"
18 - "github.com/ipfs/go-ipfs/importer"
19 - ft "github.com/ipfs/go-ipfs/unixfs"
20 - uio "github.com/ipfs/go-ipfs/unixfs/io"
18 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
19 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
20 + "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer"
21 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
22 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
23 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
24
core/corerepo/pinning.go
+1 -1
@@ -18,7 +18,7 @@ import (
18 "fmt"
19
20 "github.com/ipfs/go-ipfs/core"
21 - uio "github.com/ipfs/go-ipfs/unixfs/io"
21 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
22 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
23 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
24
core/coreunix/add.go
+4 -4
@@ -11,13 +11,13 @@ import (
11 "strconv"
12
13 core "github.com/ipfs/go-ipfs/core"
14 - balanced "github.com/ipfs/go-ipfs/importer/balanced"
15 - ihelper "github.com/ipfs/go-ipfs/importer/helpers"
16 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
14 mfs "github.com/ipfs/go-ipfs/mfs"
15 "github.com/ipfs/go-ipfs/pin"
19 - unixfs "github.com/ipfs/go-ipfs/unixfs"
16 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
17 + unixfs "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
18 + balanced "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/balanced"
19 + ihelper "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
20 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
21
22 posinfo "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
23 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
core/coreunix/cat.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "context"
5
6 core "github.com/ipfs/go-ipfs/core"
7 - uio "github.com/ipfs/go-ipfs/unixfs/io"
7 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
8 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
9 resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
10 )
core/coreunix/metadata.go
+1 -1
@@ -2,8 +2,8 @@ package coreunix
2
3 import (
4 core "github.com/ipfs/go-ipfs/core"
5 - ft "github.com/ipfs/go-ipfs/unixfs"
5 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
6 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
7 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
8 )
9
core/coreunix/metadata_test.go
+3 -3
@@ -7,11 +7,11 @@ import (
7 "testing"
8
9 core "github.com/ipfs/go-ipfs/core"
10 - importer "github.com/ipfs/go-ipfs/importer"
11 - ft "github.com/ipfs/go-ipfs/unixfs"
12 - uio "github.com/ipfs/go-ipfs/unixfs/io"
10 bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
11 merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
12 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
13 + importer "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer"
14 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
15
16 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
17 offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
fuse/ipns/common.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 "github.com/ipfs/go-ipfs/core"
7 nsys "github.com/ipfs/go-ipfs/namesys"
8 - ft "github.com/ipfs/go-ipfs/unixfs"
8 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
9 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
10 ci "gx/ipfs/Qme1knMqwt1hKZbc1BmQFmnm9f36nyQGwXxPGVpVJ9rMK5/go-libp2p-crypto"
11 )
fuse/ipns/ipns_unix.go
+1 -1
@@ -14,8 +14,8 @@ import (
14 core "github.com/ipfs/go-ipfs/core"
15 mfs "github.com/ipfs/go-ipfs/mfs"
16 namesys "github.com/ipfs/go-ipfs/namesys"
17 - ft "github.com/ipfs/go-ipfs/unixfs"
17 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
18 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
19 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
20
21 fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse"
fuse/readonly/ipfs_test.go
+2 -2
@@ -16,9 +16,9 @@ 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 - importer "github.com/ipfs/go-ipfs/importer"
20 - uio "github.com/ipfs/go-ipfs/unixfs/io"
19 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
20 + importer "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer"
21 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
22
23 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
24 fstest "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs/fstestutil"
fuse/readonly/readonly_unix.go
+2 -2
@@ -11,9 +11,9 @@ import (
11 "syscall"
12
13 core "github.com/ipfs/go-ipfs/core"
14 - uio "github.com/ipfs/go-ipfs/unixfs/io"
15 - ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
14 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16 + ftpb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
17 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
18
19 lgbl "gx/ipfs/QmRPkGkHLB72caXgdDYnoaWigXNWx95BcYDKV1n3KTEpaG/go-libp2p-loggables"
mfs/dir.go
+3 -3
@@ -9,10 +9,10 @@ import (
9 "sync"
10 "time"
11
12 - ft "github.com/ipfs/go-ipfs/unixfs"
13 - uio "github.com/ipfs/go-ipfs/unixfs/io"
14 - ufspb "github.com/ipfs/go-ipfs/unixfs/pb"
12 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
13 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
14 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
15 + ufspb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
16
17 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
18 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
mfs/fd.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "fmt"
5 "io"
6
7 - mod "github.com/ipfs/go-ipfs/unixfs/mod"
7 + mod "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/mod"
8
9 context "context"
10 )
mfs/file.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "fmt"
6 "sync"
7
8 - ft "github.com/ipfs/go-ipfs/unixfs"
9 - mod "github.com/ipfs/go-ipfs/unixfs/mod"
8 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10 + mod "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/mod"
11
12 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
13 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
mfs/mfs_test.go
+3 -3
@@ -14,11 +14,11 @@ import (
14 "testing"
15 "time"
16
17 - importer "github.com/ipfs/go-ipfs/importer"
18 - ft "github.com/ipfs/go-ipfs/unixfs"
19 - uio "github.com/ipfs/go-ipfs/unixfs/io"
17 bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
19 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
20 + importer "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer"
21 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
22 "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
23
24 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
mfs/system.go
+1 -1
@@ -16,8 +16,8 @@ import (
16 "sync"
17 "time"
18
19 - ft "github.com/ipfs/go-ipfs/unixfs"
19 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
20 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
21
22 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
23 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
namesys/namesys_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "time"
8
9 opts "github.com/ipfs/go-ipfs/namesys/opts"
10 - "github.com/ipfs/go-ipfs/unixfs"
10 + "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
11 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
12
13 pstore "gx/ipfs/QmZR2XWVVBCtbgBWnQhWk2xcQfaR3W8faQPriAiaaj7rsr/go-libp2p-peerstore"
namesys/publisher.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "time"
9
10 pin "github.com/ipfs/go-ipfs/pin"
11 - ft "github.com/ipfs/go-ipfs/unixfs"
11 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
12 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
13
14 routing "gx/ipfs/QmZ383TySJVeZWzGnWui6pRcKyYZk9VkKTuW7tmKRWk5au/go-libp2p-routing"
package.json
+6
@@ -569,6 +569,12 @@
569 "hash": "QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ",
570 "name": "go-path",
571 "version": "1.0.1"
572 + },
573 + {
574 + "author": "why",
575 + "hash": "QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP",
576 + "name": "go-unixfs",
577 + "version": "1.0.0"
578 }
579 ],
580 "gxVersion": "0.10.0",
tar/format.go
+2 -2
@@ -9,9 +9,9 @@ import (
9 "strings"
10
11 "github.com/ipfs/go-ipfs/dagutils"
12 - importer "github.com/ipfs/go-ipfs/importer"
13 - uio "github.com/ipfs/go-ipfs/unixfs/io"
12 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
13 + importer "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer"
14 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
15 path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
16
17 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
unixfs/archive/archive.go
+2 -2
@@ -8,8 +8,8 @@ import (
8 "io"
9 "path"
10
11 - tar "github.com/ipfs/go-ipfs/unixfs/archive/tar"
12 - uio "github.com/ipfs/go-ipfs/unixfs/io"
11 + tar "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/archive/tar"
12 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
13
14 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
15 )
unixfs/archive/tar/writer.go
+3 -3
@@ -10,10 +10,10 @@ import (
10 "path"
11 "time"
12
13 - ft "github.com/ipfs/go-ipfs/unixfs"
14 - uio "github.com/ipfs/go-ipfs/unixfs/io"
15 - upb "github.com/ipfs/go-ipfs/unixfs/pb"
13 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
14 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16 + upb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
17
18 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
19 )
unixfs/hamt/hamt.go
+2 -2
@@ -25,9 +25,9 @@ import (
25 "fmt"
26 "os"
27
28 - format "github.com/ipfs/go-ipfs/unixfs"
29 - upb "github.com/ipfs/go-ipfs/unixfs/pb"
28 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
29 + format "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
30 + upb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
31
32 bitfield "gx/ipfs/QmTbBs3Y3u5F69XNJzdnnc6SP5GKgcXxCDzx6w8m6piVRT/go-bitfield"
33 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
unixfs/hamt/hamt_stress_test.go
+1 -1
@@ -8,8 +8,8 @@ import (
8 "testing"
9 "time"
10
11 - ft "github.com/ipfs/go-ipfs/unixfs"
11 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
12 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
13
14 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
15 )
unixfs/hamt/hamt_test.go
+1 -1
@@ -10,9 +10,9 @@ import (
10 "time"
11
12 "github.com/ipfs/go-ipfs/dagutils"
13 - ft "github.com/ipfs/go-ipfs/unixfs"
13 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
14 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
15 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
16
17 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
18 )
unixfs/importer/balanced/balanced_test.go
+2 -2
@@ -9,10 +9,10 @@ import (
9 mrand "math/rand"
10 "testing"
11
12 - h "github.com/ipfs/go-ipfs/importer/helpers"
13 - uio "github.com/ipfs/go-ipfs/unixfs/io"
12 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
13 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
14 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16
17 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
18 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
unixfs/importer/balanced/builder.go
+3 -3
@@ -5,7 +5,7 @@
5 // depth (and having more intermediary nodes).
6 //
7 // Internal nodes are always represented by UnixFS nodes (of type `File`) encoded
8 -// inside DAG nodes (see the `go-ipfs/unixfs` package for details of UnixFS). In
8 +// inside DAG nodes (see the `go-unixfs` package for details of UnixFS). In
9 // contrast, leaf nodes with data have multiple possible representations: UnixFS
10 // nodes as above, raw nodes with just the file data (no format) and Filestore
11 // nodes (that directly link to the file on disk using a format stored on a raw
@@ -43,8 +43,8 @@ package balanced
43 import (
44 "errors"
45
46 - h "github.com/ipfs/go-ipfs/importer/helpers"
47 - ft "github.com/ipfs/go-ipfs/unixfs"
46 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
47 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
48
49 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
50 )
unixfs/importer/helpers/dagbuilder.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "io"
6 "os"
7
8 - ft "github.com/ipfs/go-ipfs/unixfs"
9 - pb "github.com/ipfs/go-ipfs/unixfs/pb"
8 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10 + pb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
11
12 pi "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
13 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
unixfs/importer/helpers/helpers.go
+1 -1
@@ -5,8 +5,8 @@ import (
5 "fmt"
6 "os"
7
8 - ft "github.com/ipfs/go-ipfs/unixfs"
8 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10
11 pi "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
12 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
unixfs/importer/importer.go
+3 -3
@@ -6,9 +6,9 @@ import (
6 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
7 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
8
9 - bal "github.com/ipfs/go-ipfs/importer/balanced"
10 - h "github.com/ipfs/go-ipfs/importer/helpers"
11 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
9 + bal "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/balanced"
10 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
11 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
12 )
13
14 // BuildDagFromReader creates a DAG given a DAGService and a Splitter
unixfs/importer/importer_test.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "io/ioutil"
8 "testing"
9
10 - uio "github.com/ipfs/go-ipfs/unixfs/io"
10 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
11 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
12
13 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
14 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
unixfs/importer/trickle/trickle_test.go
+3 -3
@@ -9,11 +9,11 @@ import (
9 mrand "math/rand"
10 "testing"
11
12 - h "github.com/ipfs/go-ipfs/importer/helpers"
13 - ft "github.com/ipfs/go-ipfs/unixfs"
14 - uio "github.com/ipfs/go-ipfs/unixfs/io"
12 merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
13 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
14 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
15 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
16 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
17
18 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
19 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
unixfs/importer/trickle/trickledag.go
+2 -2
@@ -20,9 +20,9 @@ import (
20 "errors"
21 "fmt"
22
23 - h "github.com/ipfs/go-ipfs/importer/helpers"
24 - ft "github.com/ipfs/go-ipfs/unixfs"
23 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
24 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
25 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
26
27 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
28 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
unixfs/io/dagreader.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "errors"
6 "io"
7
8 - ft "github.com/ipfs/go-ipfs/unixfs"
9 - ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
8 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10 + ftpb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
11
12 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
13 )
unixfs/io/dagreader_test.go
+2 -2
@@ -8,12 +8,12 @@ import (
8 "strings"
9 "testing"
10
11 - "github.com/ipfs/go-ipfs/unixfs"
11 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
12 + "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
13
14 context "context"
15
16 - testu "github.com/ipfs/go-ipfs/unixfs/test"
16 + testu "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/test"
17 )
18
19 func TestBasicRead(t *testing.T) {
unixfs/io/directory.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "fmt"
6 "os"
7
8 - format "github.com/ipfs/go-ipfs/unixfs"
9 - hamt "github.com/ipfs/go-ipfs/unixfs/hamt"
8 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9 + format "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10 + hamt "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/hamt"
11
12 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
13 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
unixfs/io/directory_test.go
+1 -1
@@ -5,8 +5,8 @@ import (
5 "fmt"
6 "testing"
7
8 - ft "github.com/ipfs/go-ipfs/unixfs"
8 mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
9 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
10 )
11
12 func TestEmptyNode(t *testing.T) {
unixfs/io/pbdagreader.go
+2 -2
@@ -6,9 +6,9 @@ import (
6 "fmt"
7 "io"
8
9 - ft "github.com/ipfs/go-ipfs/unixfs"
10 - ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
9 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
10 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
11 + ftpb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
12
13 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
14 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
unixfs/io/resolve.go
+2 -2
@@ -3,9 +3,9 @@ package io
3 import (
4 "context"
5
6 - ft "github.com/ipfs/go-ipfs/unixfs"
7 - hamt "github.com/ipfs/go-ipfs/unixfs/hamt"
6 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
7 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
8 + hamt "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/hamt"
9
10 ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
11 )
unixfs/mod/dagmodifier.go
+4 -4
@@ -8,11 +8,11 @@ import (
8 "errors"
9 "io"
10
11 - help "github.com/ipfs/go-ipfs/importer/helpers"
12 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
13 - ft "github.com/ipfs/go-ipfs/unixfs"
14 - uio "github.com/ipfs/go-ipfs/unixfs/io"
11 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
12 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
13 + help "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
14 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
15 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
16
17 chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"
18 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
unixfs/mod/dagmodifier_test.go
+4 -4
@@ -7,11 +7,11 @@ import (
7 "io/ioutil"
8 "testing"
9
10 - h "github.com/ipfs/go-ipfs/importer/helpers"
11 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
10 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
11 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
12
13 - uio "github.com/ipfs/go-ipfs/unixfs/io"
14 - testu "github.com/ipfs/go-ipfs/unixfs/test"
13 + uio "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/io"
14 + testu "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/test"
15
16 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
17 )
unixfs/test/utils.go
+3 -3
@@ -8,11 +8,11 @@ import (
8 "io/ioutil"
9 "testing"
10
11 - h "github.com/ipfs/go-ipfs/importer/helpers"
12 - trickle "github.com/ipfs/go-ipfs/importer/trickle"
13 - ft "github.com/ipfs/go-ipfs/unixfs"
11 mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
12 mdagmock "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
13 + ft "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs"
14 + h "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/helpers"
15 + trickle "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/importer/trickle"
16
17 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
18 mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
unixfs/unixfs.go
+1 -1
@@ -8,8 +8,8 @@ import (
8
9 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
10
11 - pb "github.com/ipfs/go-ipfs/unixfs/pb"
11 dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
12 + pb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
13 )
14
15 // Shorthands for protobuffer types
unixfs/unixfs_test.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
8
9 - pb "github.com/ipfs/go-ipfs/unixfs/pb"
9 + pb "gx/ipfs/QmSaz8Qg77gGqvDvLKeSAY7ivDEnramSWF6T7TcRwFpHtP/go-unixfs/pb"
10 )
11
12 func TestFSNode(t *testing.T) {