From f83771b66086227effc8df069316a73397dcfbcd Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 4 Apr 2016 15:39:26 +1000
Subject: [PATCH] Apply ineffassign linter

---
 client.go                 | 4 ++--
 dht/dht_test.go           | 1 +
 fs/torrentfs_test.go      | 3 +--
 metainfo/metainfo_test.go | 8 +++-----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/client.go b/client.go
index 6ecfb13b..05f8ccf1 100644
--- a/client.go
+++ b/client.go
@@ -1366,7 +1366,7 @@ func (me *Client) connectionLoop(t *Torrent, c *connection) error {
 					break
 				}
 				var pexMsg peerExchangeMessage
-				err := bencode.Unmarshal(msg.ExtendedPayload, &pexMsg)
+				err = bencode.Unmarshal(msg.ExtendedPayload, &pexMsg)
 				if err != nil {
 					err = fmt.Errorf("error unmarshalling PEX message: %s", err)
 					break
@@ -1412,7 +1412,7 @@ func (me *Client) connectionLoop(t *Torrent, c *connection) error {
 			if msg.Port != 0 {
 				pingAddr.Port = int(msg.Port)
 			}
-			_, err = me.dHT.Ping(pingAddr)
+			me.dHT.Ping(pingAddr)
 		default:
 			err = fmt.Errorf("received unknown message type: %#v", msg.Type)
 		}
diff --git a/dht/dht_test.go b/dht/dht_test.go
index 345da41c..8464d805 100644
--- a/dht/dht_test.go
+++ b/dht/dht_test.go
@@ -161,6 +161,7 @@ func TestAnnounceTimeout(t *testing.T) {
 	})
 	require.NoError(t, err)
 	a, err := s.Announce("12341234123412341234", 0, true)
+	assert.NoError(t, err)
 	<-a.Peers
 	a.Close()
 	s.Close()
diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index 8334f109..e3e3d5e1 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -173,7 +173,6 @@ func TestDownloadOnDemand(t *testing.T) {
 		// the torrent to the seeder by magnet.
 		DisableMetainfoCache: true,
 	})
-	seeder.SetIPBlockList(nil)
 	require.NoError(t, err)
 	defer seeder.Close()
 	testutil.ExportStatusWriter(seeder, "s")
@@ -189,7 +188,7 @@ func TestDownloadOnDemand(t *testing.T) {
 		// with the same ID.
 		// PeerID: seeder.PeerID(),
 	})
-	leecher.SetIPBlockList(nil)
+	require.NoError(t, err)
 	testutil.ExportStatusWriter(leecher, "l")
 	defer leecher.Close()
 	leecherTorrent, _ := leecher.AddTorrent(layout.Metainfo)
diff --git a/metainfo/metainfo_test.go b/metainfo/metainfo_test.go
index ef0e1e1b..2f13c520 100644
--- a/metainfo/metainfo_test.go
+++ b/metainfo/metainfo_test.go
@@ -1,7 +1,6 @@
 package metainfo
 
 import (
-	"bytes"
 	"io"
 	"io/ioutil"
 	"path"
@@ -9,6 +8,7 @@ import (
 
 	"github.com/anacrolix/missinggo"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/anacrolix/torrent/bencode"
 )
@@ -38,10 +38,8 @@ func testFile(t *testing.T, filename string) {
 	// }
 
 	b, err := bencode.Marshal(mi.Info)
-	if !bytes.Equal(b, mi.Info.Bytes) {
-		t.Logf("\n%q\n%q", b[len(b)-20:], mi.Info.Bytes[len(mi.Info.Bytes)-20:])
-		t.Fatal("encoded and decoded bytes don't match")
-	}
+	require.NoError(t, err)
+	assert.EqualValues(t, b, mi.Info.Bytes)
 }
 
 func TestFile(t *testing.T) {