status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-24 06:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply ineffassign linter

Browse Source
This commit is contained in:
Matt Joiner 2016-04-04 15:39:26 +10:00
parent 82ee860e8d
commit f83771b660
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client.go
View File

@ -1366,7 +1366,7 @@ func (me *Client) connectionLoop(t *Torrent, c *connection) error {
break break
} }
var pexMsg peerExchangeMessage var pexMsg peerExchangeMessage
err := bencode.Unmarshal(msg.ExtendedPayload, &pexMsg) err = bencode.Unmarshal(msg.ExtendedPayload, &pexMsg)
if err != nil { if err != nil {
err = fmt.Errorf("error unmarshalling PEX message: %s", err) err = fmt.Errorf("error unmarshalling PEX message: %s", err)
break break
@ -1412,7 +1412,7 @@ func (me *Client) connectionLoop(t *Torrent, c *connection) error {
if msg.Port != 0 { if msg.Port != 0 {
pingAddr.Port = int(msg.Port) pingAddr.Port = int(msg.Port)
} }
_, err = me.dHT.Ping(pingAddr) me.dHT.Ping(pingAddr)
default: default:
err = fmt.Errorf("received unknown message type: %#v", msg.Type) err = fmt.Errorf("received unknown message type: %#v", msg.Type)
} }

1
dht/dht_test.go
View File

@ -161,6 +161,7 @@ func TestAnnounceTimeout(t *testing.T) {
}) })
require.NoError(t, err) require.NoError(t, err)
a, err := s.Announce("12341234123412341234", 0, true) a, err := s.Announce("12341234123412341234", 0, true)
assert.NoError(t, err)
<-a.Peers <-a.Peers
a.Close() a.Close()
s.Close() s.Close()

3
fs/torrentfs_test.go
View File

@ -173,7 +173,6 @@ func TestDownloadOnDemand(t *testing.T) {
// the torrent to the seeder by magnet. // the torrent to the seeder by magnet.
DisableMetainfoCache: true, DisableMetainfoCache: true,
}) })
seeder.SetIPBlockList(nil)
require.NoError(t, err) require.NoError(t, err)
defer seeder.Close() defer seeder.Close()
testutil.ExportStatusWriter(seeder, "s") testutil.ExportStatusWriter(seeder, "s")
@ -189,7 +188,7 @@ func TestDownloadOnDemand(t *testing.T) {
// with the same ID. // with the same ID.
// PeerID: seeder.PeerID(), // PeerID: seeder.PeerID(),
}) })
leecher.SetIPBlockList(nil) require.NoError(t, err)
testutil.ExportStatusWriter(leecher, "l") testutil.ExportStatusWriter(leecher, "l")
defer leecher.Close() defer leecher.Close()
leecherTorrent, _ := leecher.AddTorrent(layout.Metainfo) leecherTorrent, _ := leecher.AddTorrent(layout.Metainfo)

8
metainfo/metainfo_test.go
View File

@ -1,7 +1,6 @@
package metainfo package metainfo
import ( import (
"bytes"
"io" "io"
"io/ioutil" "io/ioutil"
"path" "path"
@ -9,6 +8,7 @@ import (
"github.com/anacrolix/missinggo" "github.com/anacrolix/missinggo"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/anacrolix/torrent/bencode" "github.com/anacrolix/torrent/bencode"
) )
@ -38,10 +38,8 @@ func testFile(t *testing.T, filename string) {
// } // }
b, err := bencode.Marshal(mi.Info) b, err := bencode.Marshal(mi.Info)
if !bytes.Equal(b, mi.Info.Bytes) { require.NoError(t, err)
t.Logf("\n%q\n%q", b[len(b)-20:], mi.Info.Bytes[len(mi.Info.Bytes)-20:]) assert.EqualValues(t, b, mi.Info.Bytes)
t.Fatal("encoded and decoded bytes don't match")
}
} }
func TestFile(t *testing.T) { func TestFile(t *testing.T) {