Apply ineffassign linter

diff --git a/client.go b/client.go
index 6ecfb13baf27fdb5c33abed2e793a3948169acaa..05f8ccf1a97652491ea01dc46e58221b6de1c15c 100644 (file)
--- 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 345da41c808c4a7e5e67d87fb4a37989da49161c..8464d8053461aaa6c0b16333927fef4e7919aa90 100644 (file)
--- 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 8334f109239894e9f106240372fe2e75819daeaa..e3e3d5e1a4a7f8a5ebcfd26a9d43fb177ccbb93c 100644 (file)
--- 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 ef0e1e1b116b7e1522d3b89d1e48267b1856001c..2f13c52093552f74eb74608dbae2c411b4b220fa 100644 (file)
--- 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) {