deps: switch to gx based fuse lib
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Feb 26, 2017 at 14:14 UTC
9ed4b9e46a968fd8b026ee2fd277a6874bf3300f
7 files changed
+28
-23
fuse/ipns/ipns_test.go
+6
-5
@@ -4,6 +4,7 @@ package ipns
4
5
import (
6
"bytes"
7
+ "context"
8
"fmt"
9
"io/ioutil"
10
mrand "math/rand"
@@ -11,15 +12,15 @@ import (
12
"sync"
13
"testing"
14
14
- fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
15
- racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
16
-
17
- context "context"
15
core "github.com/ipfs/go-ipfs/core"
16
namesys "github.com/ipfs/go-ipfs/namesys"
17
offroute "github.com/ipfs/go-ipfs/routing/offline"
18
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
19
+
20
+ racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
21
+
22
u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util"
23
+ fstest "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs/fstestutil"
24
)
25
26
func maybeSkipFuseTests(t *testing.T) {
@@ -135,7 +136,7 @@ func setupIpnsTest(t *testing.T, node *core.IpfsNode) (*core.IpfsNode, *mountWra
136
if err != nil {
137
t.Fatal(err)
138
}
138
- mnt, err := fstest.MountedT(t, fs)
139
+ mnt, err := fstest.MountedT(t, fs, nil)
140
if err != nil {
141
t.Fatal(err)
142
}
fuse/ipns/ipns_unix.go
+2
-3
@@ -10,9 +10,6 @@ import (
10
"fmt"
11
"os"
12
13
- fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
14
- fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
15
-
13
core "github.com/ipfs/go-ipfs/core"
14
dag "github.com/ipfs/go-ipfs/merkledag"
15
mfs "github.com/ipfs/go-ipfs/mfs"
@@ -23,6 +20,8 @@ import (
20
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
21
cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
22
peer "gx/ipfs/QmZcUPvPhD1Xvk6mwijYF8AfR3mG31S1YsEfHG4khrFPRr/go-libp2p-peer"
23
+ fuse "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse"
24
+ fs "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs"
25
)
26
27
func init() {
fuse/ipns/link_unix.go
+3
-3
@@ -3,11 +3,11 @@
3
package ipns
4
5
import (
6
+ "context"
7
"os"
8
8
- "context"
9
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
10
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
9
+ "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse"
10
+ "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs"
11
)
12
13
type Link struct {
fuse/mount/fuse.go
+3
-4
@@ -9,10 +9,9 @@ import (
9
"sync"
10
"time"
11
12
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
13
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
14
-
15
- goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
12
+ "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
13
+ "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse"
14
+ "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs"
15
)
16
17
var ErrNotMounted = errors.New("not mounted")
fuse/readonly/ipfs_test.go
+2
-2
@@ -22,10 +22,10 @@ import (
22
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
23
uio "github.com/ipfs/go-ipfs/unixfs/io"
24
25
- fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
25
cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
26
node "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
27
u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util"
28
+ fstest "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs/fstestutil"
29
)
30
31
func maybeSkipFuseTests(t *testing.T) {
@@ -58,7 +58,7 @@ func setupIpfsTest(t *testing.T, node *core.IpfsNode) (*core.IpfsNode, *fstest.M
58
}
59
60
fs := NewFileSystem(node)
61
- mnt, err := fstest.MountedT(t, fs)
61
+ mnt, err := fstest.MountedT(t, fs, nil)
62
if err != nil {
63
t.Fatal(err)
64
}
fuse/readonly/readonly_unix.go
+6
-6
@@ -4,23 +4,23 @@
4
package readonly
5
6
import (
7
+ "context"
8
"fmt"
9
"io"
10
"os"
11
"syscall"
12
12
- "context"
13
- logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
15
-
16
- fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
17
- fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
13
core "github.com/ipfs/go-ipfs/core"
14
mdag "github.com/ipfs/go-ipfs/merkledag"
15
path "github.com/ipfs/go-ipfs/path"
16
uio "github.com/ipfs/go-ipfs/unixfs/io"
17
ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
18
+
19
+ logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
20
lgbl "gx/ipfs/QmTcfnDHimxBJqx6utpnWqVHdvyquXgkwAvYt4zMaJMKS2/go-libp2p-loggables"
21
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
22
+ fuse "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse"
23
+ fs "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs"
24
)
25
26
var log = logging.Logger("fuse/ipfs")
package.json
+6
@@ -294,6 +294,12 @@
294
"hash": "QmQ2sk2irQYkeMMVKpLjq1bSiNPn9B5wZB53Nx8dd4dhnQ",
295
"name": "go-libp2p-pnet",
296
"version": "2.2.1"
297
+ },
298
+ {
299
+ "author": "kubuxu",
300
+ "hash": "QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9",
301
+ "name": "fuse",
302
+ "version": "0.1.3"
303
}
304
],
305
"gxVersion": "0.10.0",