From cecc70f4cc5da575bf9ae0e65fad7f473e03b9c1 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 8 Nov 2017 00:12:34 +1100
Subject: [PATCH] More megacheck

---
 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 ++
 7 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/fs/file_handle.go b/fs/file_handle.go
index 592153c3..f65400c6 100644
--- a/fs/file_handle.go
+++ b/fs/file_handle.go
@@ -3,7 +3,6 @@ package torrentfs
 import (
 	"context"
 	"io"
-	"os"
 
 	"github.com/anacrolix/missinggo"
 	"github.com/anacrolix/torrent"
@@ -27,7 +26,7 @@ func (me fileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse
 	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 301d92d3..db850755 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) Attr(ctx context.Context, attr *fuse.Attr) error {
 
 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 edd644a4..32ead7fb 100644
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -52,10 +52,6 @@ type node struct {
 	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 45e0cee7..dd493031 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -214,7 +214,7 @@ func TestDownloadOnDemand(t *testing.T) {
 	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 e8d2cbe4..43322983 100644
--- a/iplist/iplist_test.go
+++ b/iplist/iplist_test.go
@@ -3,12 +3,10 @@ package iplist
 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"
@@ -74,27 +72,6 @@ func BenchmarkParseP2pBlocklist(b *testing.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 {
 	return ok
 }
diff --git a/mse/mse.go b/mse/mse.go
index 66390f3d..9771507b 100644
--- a/mse/mse.go
+++ b/mse/mse.go
@@ -238,7 +238,6 @@ func (h *handshake) finishWriting() {
 		h.writerCond.Wait()
 	}
 	h.writerMu.Unlock()
-	return
 }
 
 func (h *handshake) writer() {
diff --git a/storage/file_test.go b/storage/file_test.go
index 5c63c94c..1a5e1b60 100644
--- a/storage/file_test.go
+++ b/storage/file_test.go
@@ -28,7 +28,9 @@ func TestShortFile(t *testing.T) {
 	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)