fs/file_handle.go | 3 +-- fs/filenode.go | 4 ++-- fs/torrentfs.go | 4 ---- fs/torrentfs_test.go | 2 +- iplist/iplist_test.go | 23 ----------------------- mse/mse.go | 1 - storage/file_test.go | 2 ++ diff --git a/fs/file_handle.go b/fs/file_handle.go index 592153c374667fdb3d95ca5a0d4d348f62cb9a93..f65400c6c1c6d593b93ff786d4e7ed38afbcc083 100644 --- a/fs/file_handle.go +++ b/fs/file_handle.go @@ -3,7 +3,6 @@ import ( "context" "io" - "os" "github.com/anacrolix/missinggo" "github.com/anacrolix/torrent" @@ -27,7 +26,7 @@ torrentfsReadRequests.Add(1) if req.Dir { panic("read on directory") } - pos, err := me.r.Seek(me.fn.TorrentOffset+req.Offset, os.SEEK_SET) + pos, err := me.r.Seek(me.fn.TorrentOffset+req.Offset, io.SeekStart) if err != nil { panic(err) } diff --git a/fs/filenode.go b/fs/filenode.go index 301d92d391458f7f5bf68049114f205bb4d3e847..db8507559c900c8fd42ad476e35805bf3967870c 100644 --- a/fs/filenode.go +++ b/fs/filenode.go @@ -1,7 +1,7 @@ package torrentfs import ( - "os" + "io" "bazil.org/fuse" fusefs "bazil.org/fuse/fs" @@ -26,6 +26,6 @@ } func (fn fileNode) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fusefs.Handle, error) { r := fn.t.NewReader() - r.Seek(fn.TorrentOffset, os.SEEK_SET) + r.Seek(fn.TorrentOffset, io.SeekStart) return fileHandle{fn, r}, nil } diff --git a/fs/torrentfs.go b/fs/torrentfs.go index edd644a4394f60c0499abf88aaf1885ac3d0caa0..32ead7fb04e82a0d3c45c4737f0cc7d4182ddf2c 100644 --- a/fs/torrentfs.go +++ b/fs/torrentfs.go @@ -52,10 +52,6 @@ FS *TorrentFS t *torrent.Torrent } -func (n *node) fsPath() string { - return "/" + n.metadata.Name + "/" + n.path -} - type dirNode struct { node } diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go index 45e0cee7c2318b48423824f66f3ee9cd56ac8f46..dd49303101967b164db0933e5936cc032277fcb9 100644 --- a/fs/torrentfs_test.go +++ b/fs/torrentfs_test.go @@ -214,7 +214,7 @@ size := attr.Size resp := &fuse.ReadResponse{ Data: make([]byte, size), } - h, err := node.(fusefs.NodeOpener).Open(nil, nil, nil) + h, err := node.(fusefs.NodeOpener).Open(context.TODO(), nil, nil) require.NoError(t, err) h.(fusefs.HandleReader).Read(netContext.Background(), &fuse.ReadRequest{ Size: int(size), diff --git a/iplist/iplist_test.go b/iplist/iplist_test.go index e8d2cbe46fcd93e651ef425f42e0ca1cedcb2443..43322983ac1c4f47ddf21f818613420bb5e4db92 100644 --- a/iplist/iplist_test.go +++ b/iplist/iplist_test.go @@ -3,12 +3,10 @@ import ( "bufio" "bytes" - "fmt" "net" "strings" "testing" - "github.com/anacrolix/missinggo" "github.com/bradfitz/iter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -72,27 +70,6 @@ func BenchmarkParseP2pBlocklist(b *testing.B) { for i := 0; i < b.N; i++ { sampleRanges(b) } -} - -func connRemoteAddrIP(network, laddr string, dialHost string) net.IP { - l, err := net.Listen(network, laddr) - if err != nil { - panic(err) - } - go func() { - c, err := net.Dial(network, net.JoinHostPort(dialHost, fmt.Sprintf("%d", missinggo.AddrPort(l.Addr())))) - if err != nil { - panic(err) - } - defer c.Close() - }() - c, err := l.Accept() - if err != nil { - panic(err) - } - defer c.Close() - ret := missinggo.AddrIP(c.RemoteAddr()) - return ret } func lookupOk(r Range, ok bool) bool { diff --git a/mse/mse.go b/mse/mse.go index 66390f3d1e048af4bb53db7de21dac31a2349b7a..9771507b3bd953f25436162a9aae06e11f41c1f8 100644 --- a/mse/mse.go +++ b/mse/mse.go @@ -238,7 +238,6 @@ for !h.writerDone { h.writerCond.Wait() } h.writerMu.Unlock() - return } func (h *handshake) writer() { diff --git a/storage/file_test.go b/storage/file_test.go index 5c63c94cecd5c50a4769db25ce4eddc37e1622a6..1a5e1b606d7df3b579f57424720927d2296abf05 100644 --- a/storage/file_test.go +++ b/storage/file_test.go @@ -28,7 +28,9 @@ } ts, err := s.OpenTorrent(info, metainfo.Hash{}) assert.NoError(t, err) f, err := os.Create(filepath.Join(td, "a")) + require.NoError(t, err) err = f.Truncate(1) + require.NoError(t, err) f.Close() var buf bytes.Buffer p := info.Piece(0)