From c6ee03f449fa82d0fd6ba06d6bdb7c5062b38d28 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 8 Nov 2021 14:47:01 +1100 Subject: [PATCH] gofumpt --- bencode/decode.go | 5 ++-- bencode/decode_test.go | 7 +++-- bencode/encode.go | 1 - client.go | 5 ++-- client_test.go | 4 +-- cmd/torrent-create/main.go | 12 ++++---- cmd/torrent-pick/main.go | 2 +- cmd/torrent-verify/main.go | 2 +- cmd/torrent/download.go | 2 +- cmd/torrentfs/main.go | 40 +++++++++++++-------------- config.go | 4 +-- file_test.go | 1 - fs/file_handle.go | 2 +- fs/filenode.go | 4 +-- fs/torrentfs.go | 10 ++----- fs/torrentfs_test.go | 4 +-- iplist/cmd/iplist/main.go | 2 +- metainfo/hash.go | 1 + metainfo/magnet_test.go | 1 - metainfo/nodes.go | 4 +-- metainfo/urllist.go | 4 +-- mmap_span/mmap_span.go | 6 ++-- mse/cmd/mse/main.go | 2 +- mse/mse_test.go | 2 +- peerconn.go | 7 ++--- peerconn_test.go | 6 ++-- piece.go | 4 +-- request-strategy/order.go | 2 +- request-strategy/order_test.go | 3 +- requesting.go | 6 ++-- requesting_test.go | 1 - segments/segments_test.go | 6 ++-- storage/bolt-piece-completion.go | 8 ++---- storage/bolt-piece.go | 1 + storage/bolt.go | 2 +- storage/file.go | 10 +++---- storage/mmap.go | 4 +-- storage/safe-path_test.go | 6 ++-- storage/sqlite/sqlite-storage_test.go | 2 +- t.go | 1 - test/issue377_test.go | 2 +- test/transfer_test.go | 10 +++---- torrent.go | 6 ++-- tracker/http/http_test.go | 3 +- tracker/tracker.go | 4 +-- tracker_scraper.go | 2 -- webtorrent/tracker_client.go | 5 ++-- 47 files changed, 104 insertions(+), 124 deletions(-) diff --git a/bencode/decode.go b/bencode/decode.go index 768c9c7b..5f97e70a 100644 --- a/bencode/decode.go +++ b/bencode/decode.go @@ -224,7 +224,7 @@ func getDictField(dict reflect.Type, key string) (_ dictField, err error) { mapValue.Set(reflect.MakeMap(dict)) } // Assigns the value into the map. - //log.Printf("map type: %v", mapValue.Type()) + // log.Printf("map type: %v", mapValue.Type()) mapValue.SetMapIndex(reflect.ValueOf(key).Convert(dict.Key()), value) } }, @@ -345,7 +345,7 @@ func (d *Decoder) parseDict(v reflect.Value) error { continue } setValue := reflect.New(df.Type).Elem() - //log.Printf("parsing into %v", setValue.Type()) + // log.Printf("parsing into %v", setValue.Type()) ok, err = d.parseValue(setValue) if err != nil { var target *UnmarshalTypeError @@ -468,7 +468,6 @@ func (d *Decoder) readOneValue() bool { } return true - } func (d *Decoder) parseUnmarshaler(v reflect.Value) bool { diff --git a/bencode/decode_test.go b/bencode/decode_test.go index e9de91bd..60541e86 100644 --- a/bencode/decode_test.go +++ b/bencode/decode_test.go @@ -23,8 +23,10 @@ var random_decode_tests = []random_decode_test{ {"5:hello", "hello"}, {"29:unicode test проверка", "unicode test проверка"}, {"d1:ai5e1:b5:helloe", map[string]interface{}{"a": int64(5), "b": "hello"}}, - {"li5ei10ei15ei20e7:bencodee", - []interface{}{int64(5), int64(10), int64(15), int64(20), "bencode"}}, + { + "li5ei10ei15ei20e7:bencodee", + []interface{}{int64(5), int64(10), int64(15), int64(20), "bencode"}, + }, {"ldedee", []interface{}{map[string]interface{}{}, map[string]interface{}{}}}, {"le", []interface{}{}}, {"i604919719469385652980544193299329427705624352086e", func() *big.Int { @@ -135,7 +137,6 @@ func TestUnmarshalerBencode(t *testing.T) { assert_equal(t, ss[0].x, "5:hello") assert_equal(t, ss[1].x, "5:fruit") assert_equal(t, ss[2].x, "3:way") - } func TestIgnoreUnmarshalTypeError(t *testing.T) { diff --git a/bencode/encode.go b/bencode/encode.go index 8ca3f9b3..5e80cb16 100644 --- a/bencode/encode.go +++ b/bencode/encode.go @@ -101,7 +101,6 @@ func (e *Encoder) reflectMarshaler(v reflect.Value) bool { var bigIntType = reflect.TypeOf((*big.Int)(nil)).Elem() func (e *Encoder) reflectValue(v reflect.Value) { - if e.reflectMarshaler(v) { return } diff --git a/client.go b/client.go index 15d742cb..81a3f75e 100644 --- a/client.go +++ b/client.go @@ -477,7 +477,6 @@ func (cl *Client) rejectAccepted(conn net.Conn) error { } if cl.config.DisableIPv4 && len(rip) == net.IPv4len { return errors.New("ipv4 disabled") - } if cl.config.DisableIPv6 && len(rip) == net.IPv6len && rip.To4() == nil { return errors.New("ipv6 disabled") @@ -735,7 +734,7 @@ func (cl *Client) establishOutgoingConn(t *Torrent, addr PeerRemoteAddr) (c *Pee torrent.Add("initiated conn with preferred header obfuscation", 1) return } - //cl.logger.Printf("error establishing connection to %s (obfuscatedHeader=%t): %v", addr, obfuscatedHeaderFirst, err) + // cl.logger.Printf("error establishing connection to %s (obfuscatedHeader=%t): %v", addr, obfuscatedHeaderFirst, err) if cl.config.HeaderObfuscationPolicy.RequirePreferred { // We should have just tried with the preferred header obfuscation. If it was required, // there's nothing else to try. @@ -746,7 +745,7 @@ func (cl *Client) establishOutgoingConn(t *Torrent, addr PeerRemoteAddr) (c *Pee if err == nil { torrent.Add("initiated conn with fallback header obfuscation", 1) } - //cl.logger.Printf("error establishing fallback connection to %v: %v", addr, err) + // cl.logger.Printf("error establishing fallback connection to %v: %v", addr, err) return } diff --git a/client_test.go b/client_test.go index 7a04c591..86023fb6 100644 --- a/client_test.go +++ b/client_test.go @@ -648,7 +648,7 @@ func TestSetMaxEstablishedConn(t *testing.T) { // Creates a file containing its own name as data. Make a metainfo from that, adds it to the given // client, and returns a magnet link. func makeMagnet(t *testing.T, cl *Client, dir string, name string) string { - os.MkdirAll(dir, 0770) + os.MkdirAll(dir, 0o770) file, err := os.Create(filepath.Join(dir, name)) require.NoError(t, err) file.Write([]byte(name)) @@ -688,7 +688,7 @@ func testSeederLeecherPair(t *testing.T, seeder func(*ClientConfig), leecher fun cfg := TestingConfig(t) cfg.Seed = true cfg.DataDir = filepath.Join(cfg.DataDir, "server") - os.Mkdir(cfg.DataDir, 0755) + os.Mkdir(cfg.DataDir, 0o755) seeder(cfg) server, err := NewClient(cfg) require.NoError(t, err) diff --git a/cmd/torrent-create/main.go b/cmd/torrent-create/main.go index 973d4e4f..3177d6ce 100644 --- a/cmd/torrent-create/main.go +++ b/cmd/torrent-create/main.go @@ -10,13 +10,11 @@ import ( "github.com/anacrolix/torrent/metainfo" ) -var ( - builtinAnnounceList = [][]string{ - {"http://p4p.arenabg.com:1337/announce"}, - {"udp://tracker.opentrackr.org:1337/announce"}, - {"udp://tracker.openbittorrent.com:6969/announce"}, - } -) +var builtinAnnounceList = [][]string{ + {"http://p4p.arenabg.com:1337/announce"}, + {"udp://tracker.opentrackr.org:1337/announce"}, + {"udp://tracker.openbittorrent.com:6969/announce"}, +} func main() { log.SetFlags(log.Flags() | log.Lshortfile) diff --git a/cmd/torrent-pick/main.go b/cmd/torrent-pick/main.go index e68121af..8dd5a773 100644 --- a/cmd/torrent-pick/main.go +++ b/cmd/torrent-pick/main.go @@ -78,7 +78,7 @@ func dstFileName(picked string) string { func main() { log.SetFlags(log.LstdFlags | log.Lshortfile) - var rootGroup = struct { + rootGroup := struct { Client *torrent.ClientConfig `group:"Client Options"` TestPeers []string `long:"test-peer" description:"address of peer to inject to every torrent"` Pick string `long:"pick" description:"filename to pick"` diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go index 47c7f3a3..e945f12f 100644 --- a/cmd/torrent-verify/main.go +++ b/cmd/torrent-verify/main.go @@ -64,7 +64,7 @@ func verifyTorrent(info *metainfo.Info, root string) error { func main() { log.SetFlags(log.Flags() | log.Lshortfile) - var flags = struct { + flags := struct { DataDir string tagflag.StartPos TorrentFile string diff --git a/cmd/torrent/download.go b/cmd/torrent/download.go index 198c0ba5..a8b5bac4 100644 --- a/cmd/torrent/download.go +++ b/cmd/torrent/download.go @@ -256,7 +256,7 @@ func downloadErr(flags downloadFlags) error { if err != nil { return fmt.Errorf("creating client: %w", err) } - var clientClose sync.Once //In certain situations, close was being called more than once. + var clientClose sync.Once // In certain situations, close was being called more than once. defer clientClose.Do(func() { client.Close() }) go exitSignalHandlers(&stop) go func() { diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go index adce6024..b5e87e83 100644 --- a/cmd/torrentfs/main.go +++ b/cmd/torrentfs/main.go @@ -24,28 +24,26 @@ import ( "github.com/anacrolix/torrent/util/dirwatch" ) -var ( - args = struct { - MetainfoDir string `help:"torrent files in this location describe the contents of the mounted filesystem"` - DownloadDir string `help:"location to save torrent data"` - MountDir string `help:"location the torrent contents are made available"` +var args = struct { + MetainfoDir string `help:"torrent files in this location describe the contents of the mounted filesystem"` + DownloadDir string `help:"location to save torrent data"` + MountDir string `help:"location the torrent contents are made available"` - DisableTrackers bool - TestPeer *net.TCPAddr - ReadaheadBytes tagflag.Bytes - ListenAddr *net.TCPAddr - }{ - MetainfoDir: func() string { - _user, err := user.Current() - if err != nil { - panic(err) - } - return filepath.Join(_user.HomeDir, ".config/transmission/torrents") - }(), - ReadaheadBytes: 10 << 20, - ListenAddr: &net.TCPAddr{}, - } -) + DisableTrackers bool + TestPeer *net.TCPAddr + ReadaheadBytes tagflag.Bytes + ListenAddr *net.TCPAddr +}{ + MetainfoDir: func() string { + _user, err := user.Current() + if err != nil { + panic(err) + } + return filepath.Join(_user.HomeDir, ".config/transmission/torrents") + }(), + ReadaheadBytes: 10 << 20, + ListenAddr: &net.TCPAddr{}, +} func exitSignalHandlers(fs *torrentfs.TorrentFS) { c := make(chan os.Signal, 1) diff --git a/config.go b/config.go index 564149d3..5e9bd356 100644 --- a/config.go +++ b/config.go @@ -202,8 +202,8 @@ func NewDefaultClientConfig() *ClientConfig { Extensions: defaultPeerExtensionBytes(), AcceptPeerConnections: true, } - //cc.ConnTracker.SetNoMaxEntries() - //cc.ConnTracker.Timeout = func(conntrack.Entry) time.Duration { return 0 } + // cc.ConnTracker.SetNoMaxEntries() + // cc.ConnTracker.Timeout = func(conntrack.Entry) time.Duration { return 0 } return cc } diff --git a/file_test.go b/file_test.go index 3ad9aca7..e0df62b4 100644 --- a/file_test.go +++ b/file_test.go @@ -40,7 +40,6 @@ func (me testFileBytesLeft) Run(t *testing.T) { } func TestFileBytesLeft(t *testing.T) { - testFileBytesLeft{ usualPieceSize: 3, firstPieceIndex: 1, diff --git a/fs/file_handle.go b/fs/file_handle.go index 7a7265f3..4759e525 100644 --- a/fs/file_handle.go +++ b/fs/file_handle.go @@ -45,7 +45,7 @@ func (me fileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse me.fn.FS.mu.Unlock() var n int r := missinggo.ContextedReader{r, ctx} - //log.Printf("reading %v bytes at %v", len(resp.Data), req.Offset) + // log.Printf("reading %v bytes at %v", len(resp.Data), req.Offset) if true { // A user reported on that on freebsd 12.2, the system requires that reads are // completely filled. Their system only asks for 64KiB at a time. I've seen systems that diff --git a/fs/filenode.go b/fs/filenode.go index a7c807b4..8137a8cd 100644 --- a/fs/filenode.go +++ b/fs/filenode.go @@ -14,9 +14,7 @@ type fileNode struct { f *torrent.File } -var ( - _ fusefs.NodeOpener = fileNode{} -) +var _ fusefs.NodeOpener = fileNode{} func (fn fileNode) Attr(ctx context.Context, attr *fuse.Attr) error { attr.Size = uint64(fn.f.Length()) diff --git a/fs/torrentfs.go b/fs/torrentfs.go index aedab1af..2537094e 100644 --- a/fs/torrentfs.go +++ b/fs/torrentfs.go @@ -15,12 +15,10 @@ import ( ) const ( - defaultMode = 0555 + defaultMode = 0o555 ) -var ( - torrentfsReadRequests = expvar.NewInt("torrentfsReadRequests") -) +var torrentfsReadRequests = expvar.NewInt("torrentfsReadRequests") type TorrentFS struct { Client *torrent.Client @@ -55,9 +53,7 @@ type dirNode struct { node } -var ( - _ fusefs.HandleReadDirAller = dirNode{} -) +var _ fusefs.HandleReadDirAller = dirNode{} func isSubPath(parent, child string) bool { if parent == "" { diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go index 5d644a14..071be0d5 100644 --- a/fs/torrentfs_test.go +++ b/fs/torrentfs_test.go @@ -68,9 +68,9 @@ func newGreetingLayout() (tl testLayout, err error) { return } tl.Completed = filepath.Join(tl.BaseDir, "completed") - os.Mkdir(tl.Completed, 0777) + os.Mkdir(tl.Completed, 0o777) tl.MountDir = filepath.Join(tl.BaseDir, "mnt") - os.Mkdir(tl.MountDir, 0777) + os.Mkdir(tl.MountDir, 0o777) testutil.CreateDummyTorrentData(tl.Completed) tl.Metainfo = testutil.GreetingMetaInfo() return diff --git a/iplist/cmd/iplist/main.go b/iplist/cmd/iplist/main.go index d7bfbeef..7117b461 100644 --- a/iplist/cmd/iplist/main.go +++ b/iplist/cmd/iplist/main.go @@ -12,7 +12,7 @@ import ( ) func main() { - var flags = struct { + flags := struct { tagflag.StartPos Ips []net.IP }{} diff --git a/metainfo/hash.go b/metainfo/hash.go index 0e258f3d..a1f688a7 100644 --- a/metainfo/hash.go +++ b/metainfo/hash.go @@ -59,6 +59,7 @@ var ( func (h *Hash) UnmarshalText(b []byte) error { return h.FromHexString(string(b)) } + func (h Hash) MarshalText() (text []byte, err error) { return []byte(h.HexString()), nil } diff --git a/metainfo/magnet_test.go b/metainfo/magnet_test.go index 24db8fdb..24ab15b1 100644 --- a/metainfo/magnet_test.go +++ b/metainfo/magnet_test.go @@ -67,7 +67,6 @@ func TestParseMagnetURI(t *testing.T) { if err == nil { t.Errorf("Failed to detect broken Magnet URI: %v", uri) } - } func TestMagnetize(t *testing.T) { diff --git a/metainfo/nodes.go b/metainfo/nodes.go index ae7fdbb8..06c3b3f3 100644 --- a/metainfo/nodes.go +++ b/metainfo/nodes.go @@ -10,9 +10,7 @@ import ( type Node string -var ( - _ bencode.Unmarshaler = (*Node)(nil) -) +var _ bencode.Unmarshaler = (*Node)(nil) func (n *Node) UnmarshalBencode(b []byte) (err error) { var iface interface{} diff --git a/metainfo/urllist.go b/metainfo/urllist.go index 8171f198..ed7c36d2 100644 --- a/metainfo/urllist.go +++ b/metainfo/urllist.go @@ -6,9 +6,7 @@ import ( type UrlList []string -var ( - _ bencode.Unmarshaler = (*UrlList)(nil) -) +var _ bencode.Unmarshaler = (*UrlList)(nil) func (me *UrlList) UnmarshalBencode(b []byte) error { if len(b) == 0 { diff --git a/mmap_span/mmap_span.go b/mmap_span/mmap_span.go index 4195a0f0..6a6c8392 100644 --- a/mmap_span/mmap_span.go +++ b/mmap_span/mmap_span.go @@ -44,11 +44,11 @@ func (me *MMapSpan) InitIndex() { i++ return l, true }) - //log.Printf("made mmapspan index: %v", me.segmentLocater) + // log.Printf("made mmapspan index: %v", me.segmentLocater) } func (ms *MMapSpan) ReadAt(p []byte, off int64) (n int, err error) { - //log.Printf("reading %v bytes at %v", len(p), off) + // log.Printf("reading %v bytes at %v", len(p), off) ms.mu.RLock() defer ms.mu.RUnlock() n = ms.locateCopy(func(a, b []byte) (_, _ []byte) { return a, b }, p, off) @@ -65,7 +65,7 @@ func copyBytes(dst, src []byte) int { func (ms *MMapSpan) locateCopy(copyArgs func(remainingArgument, mmapped []byte) (dst, src []byte), p []byte, off int64) (n int) { ms.segmentLocater.Locate(segments.Extent{off, int64(len(p))}, func(i int, e segments.Extent) bool { mMapBytes := ms.mMaps[i][e.Start:] - //log.Printf("got segment %v: %v, copying %v, %v", i, e, len(p), len(mMapBytes)) + // log.Printf("got segment %v: %v, copying %v, %v", i, e, len(p), len(mMapBytes)) _n := copyBytes(copyArgs(p, mMapBytes)) p = p[_n:] n += _n diff --git a/mse/cmd/mse/main.go b/mse/cmd/mse/main.go index 756f07e6..25f2e339 100644 --- a/mse/cmd/mse/main.go +++ b/mse/cmd/mse/main.go @@ -20,7 +20,7 @@ func main() { } func mainErr() error { - var args = struct { + args := struct { CryptoMethod mse.CryptoMethod Dial *struct { Network string `arg:"positional"` diff --git a/mse/mse_test.go b/mse/mse_test.go index 33fd9c5e..c7e3bd57 100644 --- a/mse/mse_test.go +++ b/mse/mse_test.go @@ -260,7 +260,7 @@ func BenchmarkSkeysReceive(b *testing.B) { } fillRand(b, skeys...) initSkey := skeys[len(skeys)/2] - //c := qt.New(b) + // c := qt.New(b) b.ReportAllocs() b.ResetTimer() for i := 0; i < b.N; i += 1 { diff --git a/peerconn.go b/peerconn.go index c85135dc..4b69463a 100644 --- a/peerconn.go +++ b/peerconn.go @@ -481,7 +481,6 @@ func (cn *Peer) totalExpectingTime() (ret time.Duration) { ret += time.Since(cn.lastStartedExpectingToReceiveChunks) } return - } func (cn *PeerConn) onPeerSentCancel(r Request) { @@ -961,7 +960,7 @@ func (c *PeerConn) onReadRequest(r Request) error { value := &peerRequestState{} c.peerRequests[r] = value go c.peerRequestDataReader(r, value) - //c.tickleWriter() + // c.tickleWriter() return nil } @@ -1235,7 +1234,7 @@ func (c *PeerConn) onReadExtendedMsg(id pp.ExtensionNumber, payload []byte) (err if cb := c.callbacks.ReadExtendedHandshake; cb != nil { cb(c, &d) } - //c.logger.WithDefaultLevel(log.Debug).Printf("received extended handshake message:\n%s", spew.Sdump(d)) + // c.logger.WithDefaultLevel(log.Debug).Printf("received extended handshake message:\n%s", spew.Sdump(d)) if d.Reqq != 0 { c.PeerMaxRequests = d.Reqq } @@ -1346,7 +1345,7 @@ func (c *Peer) receiveChunk(msg *pp.Message) error { // Do we actually want this chunk? if t.haveChunk(ppReq) { - //panic(fmt.Sprintf("%+v", ppReq)) + // panic(fmt.Sprintf("%+v", ppReq)) chunksReceived.Add("wasted", 1) c.allStats(add(1, func(cs *ConnStats) *Count { return &cs.ChunksReadWasted })) return nil diff --git a/peerconn_test.go b/peerconn_test.go index 93bc7aa5..e81b6343 100644 --- a/peerconn_test.go +++ b/peerconn_test.go @@ -28,7 +28,7 @@ func TestSendBitfieldThenHave(t *testing.T) { t.Log(err) } r, w := io.Pipe() - //c.r = r + // c.r = r c.w = w c.startWriter() c.locker().Lock() @@ -155,7 +155,7 @@ func TestConnPexPeerFlags(t *testing.T) { tcpAddr = &net.TCPAddr{IP: net.IPv6loopback, Port: 4848} udpAddr = &net.UDPAddr{IP: net.IPv6loopback, Port: 4848} ) - var testcases = []struct { + testcases := []struct { conn *PeerConn f pp.PexPeerFlags }{ @@ -181,7 +181,7 @@ func TestConnPexEvent(t *testing.T) { dialTcpAddr = &net.TCPAddr{IP: net.IPv6loopback, Port: 4747} dialUdpAddr = &net.UDPAddr{IP: net.IPv6loopback, Port: 4747} ) - var testcases = []struct { + testcases := []struct { t pexEventType c *PeerConn e pexEvent diff --git a/piece.go b/piece.go index 6b70a5b5..bef5f59e 100644 --- a/piece.go +++ b/piece.go @@ -164,10 +164,10 @@ func (p *Piece) VerifyData() { if p.hashing { target++ } - //log.Printf("target: %d", target) + // log.Printf("target: %d", target) p.t.queuePieceCheck(p.index) for { - //log.Printf("got %d verifies", p.numVerifies) + // log.Printf("got %d verifies", p.numVerifies) if p.numVerifies >= target { break } diff --git a/request-strategy/order.go b/request-strategy/order.go index 7456649b..58d06b42 100644 --- a/request-strategy/order.go +++ b/request-strategy/order.go @@ -330,7 +330,7 @@ func allocatePendingChunks(p requestablePiece, peers []*requestsPeer) { sortPeersForPiece := func(req *RequestIndex) { peersForPieceSorter.req = req sort.Sort(&peersForPieceSorter) - //ensureValidSortedPeersForPieceRequests(&peersForPieceSorter) + // ensureValidSortedPeersForPieceRequests(&peersForPieceSorter) } // Chunks can be preassigned several times, if peers haven't been able to update their "actual" // with "next" request state before another request strategy run occurs. diff --git a/request-strategy/order_test.go b/request-strategy/order_test.go index ba86f0cd..ce4a4e1a 100644 --- a/request-strategy/order_test.go +++ b/request-strategy/order_test.go @@ -247,7 +247,8 @@ func TestDontStealUnnecessarily(t *testing.T) { Request: true, NumPendingChunks: 9, IterPendingChunks: chunkIterRange(9), - }}, + }, + }, Peers: []Peer{ firstStealer, stealee, diff --git a/requesting.go b/requesting.go index 01c513ae..77398643 100644 --- a/requesting.go +++ b/requesting.go @@ -116,8 +116,10 @@ func (p *peerId) GobDecode(b []byte) error { return nil } -type RequestIndex = request_strategy.RequestIndex -type chunkIndexType = request_strategy.ChunkIndex +type ( + RequestIndex = request_strategy.RequestIndex + chunkIndexType = request_strategy.ChunkIndex +) type peerRequests struct { requestIndexes []RequestIndex diff --git a/requesting_test.go b/requesting_test.go index 8599086e..dd54df5d 100644 --- a/requesting_test.go +++ b/requesting_test.go @@ -28,7 +28,6 @@ func TestLogExampleRequestMapOrdering(t *testing.T) { for k := range makeTypicalRequests() { t.Log(k) } - } func TestRequestMapOrderingPersistent(t *testing.T) { diff --git a/segments/segments_test.go b/segments/segments_test.go index 8dcff6cc..9ce9164b 100644 --- a/segments/segments_test.go +++ b/segments/segments_test.go @@ -67,7 +67,8 @@ func testLocater(t *testing.T, newLocater newLocater) { {0, 1554}, {0, 1618}, {0, 1546}, - {0, 8500}}) + {0, 8500}, + }) assertLocate(t, newLocater, []Length{1652, 1514, 1554, 1618, 1546, 129241752, 1537, 1536, 1551}, // 128737588 Extent{129236992, 16384}, @@ -76,7 +77,8 @@ func testLocater(t *testing.T, newLocater newLocater) { {129229108, 12644}, {0, 1537}, {0, 1536}, - {0, 667}}) + {0, 667}, + }) } func TestScan(t *testing.T) { diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go index 52713ea8..442f57c5 100644 --- a/storage/bolt-piece-completion.go +++ b/storage/bolt-piece-completion.go @@ -19,9 +19,7 @@ const ( boltDbIncompleteValue = "i" ) -var ( - completionBucketKey = []byte("completion") -) +var completionBucketKey = []byte("completion") type boltPieceCompletion struct { db *bbolt.DB @@ -30,9 +28,9 @@ type boltPieceCompletion struct { var _ PieceCompletion = (*boltPieceCompletion)(nil) func NewBoltPieceCompletion(dir string) (ret PieceCompletion, err error) { - os.MkdirAll(dir, 0750) + os.MkdirAll(dir, 0o750) p := filepath.Join(dir, ".torrent.bolt.db") - db, err := bbolt.Open(p, 0660, &bbolt.Options{ + db, err := bbolt.Open(p, 0o660, &bbolt.Options{ Timeout: time.Second, }) if err != nil { diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go index 12916ee5..67e03bd9 100644 --- a/storage/bolt-piece.go +++ b/storage/bolt-piece.go @@ -51,6 +51,7 @@ func (me *boltPiece) MarkComplete() error { func (me *boltPiece) MarkNotComplete() error { return me.pc().Set(me.pk(), false) } + func (me *boltPiece) ReadAt(b []byte, off int64) (n int, err error) { err = me.db.View(func(tx *bbolt.Tx) error { db := tx.Bucket(dataBucketKey) diff --git a/storage/bolt.go b/storage/bolt.go index 72644c43..945b2499 100644 --- a/storage/bolt.go +++ b/storage/bolt.go @@ -30,7 +30,7 @@ type boltTorrent struct { } func NewBoltDB(filePath string) ClientImplCloser { - db, err := bbolt.Open(filepath.Join(filePath, "bolt.db"), 0600, &bbolt.Options{ + db, err := bbolt.Open(filepath.Join(filePath, "bolt.db"), 0o600, &bbolt.Options{ Timeout: time.Second, }) expect.Nil(err) diff --git a/storage/file.go b/storage/file.go index bbfe6d66..d07dc7e9 100644 --- a/storage/file.go +++ b/storage/file.go @@ -126,7 +126,7 @@ func (fs *fileTorrentImpl) Close() error { // writes will ever occur to them (no torrent data is associated with a zero-length file). The // caller should make sure the file name provided is safe/sanitized. func CreateNativeZeroLengthFile(name string) error { - os.MkdirAll(filepath.Dir(name), 0777) + os.MkdirAll(filepath.Dir(name), 0o777) var f io.Closer f, err := os.Create(name) if err != nil { @@ -185,18 +185,18 @@ func (fst fileTorrentImplIO) ReadAt(b []byte, off int64) (n int, err error) { } func (fst fileTorrentImplIO) WriteAt(p []byte, off int64) (n int, err error) { - //log.Printf("write at %v: %v bytes", off, len(p)) + // log.Printf("write at %v: %v bytes", off, len(p)) fst.fts.segmentLocater.Locate(segments.Extent{off, int64(len(p))}, func(i int, e segments.Extent) bool { name := fst.fts.files[i].path - os.MkdirAll(filepath.Dir(name), 0777) + os.MkdirAll(filepath.Dir(name), 0o777) var f *os.File - f, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE, 0666) + f, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE, 0o666) if err != nil { return false } var n1 int n1, err = f.WriteAt(p[:e.Length], e.Start) - //log.Printf("%v %v wrote %v: %v", i, e, n1, err) + // log.Printf("%v %v wrote %v: %v", i, e, n1, err) closeErr := f.Close() n += n1 p = p[n1:] diff --git a/storage/mmap.go b/storage/mmap.go index 1b1423f7..300d8635 100644 --- a/storage/mmap.go +++ b/storage/mmap.go @@ -132,13 +132,13 @@ func mMapTorrent(md *metainfo.Info, location string) (mms *mmap_span.MMapSpan, e func mmapFile(name string, size int64) (ret mmap.MMap, err error) { dir := filepath.Dir(name) - err = os.MkdirAll(dir, 0750) + err = os.MkdirAll(dir, 0o750) if err != nil { err = fmt.Errorf("making directory %q: %s", dir, err) return } var file *os.File - file, err = os.OpenFile(name, os.O_CREATE|os.O_RDWR, 0666) + file, err = os.OpenFile(name, os.O_CREATE|os.O_RDWR, 0o666) if err != nil { return } diff --git a/storage/safe-path_test.go b/storage/safe-path_test.go index 008cf8a7..674da8fc 100644 --- a/storage/safe-path_test.go +++ b/storage/safe-path_test.go @@ -24,8 +24,10 @@ var safeFilePathTests = []struct { {input: []string{"a", filepath.FromSlash(`b/..`)}, expectErr: false}, {input: []string{"a", filepath.FromSlash(`b/../../..`)}, expectErr: true}, {input: []string{"a", filepath.FromSlash(`b/../.././..`)}, expectErr: true}, - {input: []string{ - filepath.FromSlash(`NewSuperHeroMovie-2019-English-720p.avi /../../../../../Roaming/Microsoft/Windows/Start Menu/Programs/Startup/test3.exe`)}, + { + input: []string{ + filepath.FromSlash(`NewSuperHeroMovie-2019-English-720p.avi /../../../../../Roaming/Microsoft/Windows/Start Menu/Programs/Startup/test3.exe`), + }, expectErr: true, }, } diff --git a/storage/sqlite/sqlite-storage_test.go b/storage/sqlite/sqlite-storage_test.go index 43c743e3..66293cfa 100644 --- a/storage/sqlite/sqlite-storage_test.go +++ b/storage/sqlite/sqlite-storage_test.go @@ -49,7 +49,7 @@ func BenchmarkMarkComplete(b *testing.B) { var opts NewDirectStorageOpts opts.Memory = memory opts.Capacity = capacity - //opts.GcBlobs = true + // opts.GcBlobs = true opts.BlobFlushInterval = time.Second opts.NoTriggers = noTriggers directBench := func(b *testing.B) { diff --git a/t.go b/t.go index a7f98892..580a3bc9 100644 --- a/t.go +++ b/t.go @@ -232,7 +232,6 @@ func (t *Torrent) initFiles() { }) offset += fi.Length } - } // Returns handles to the files in the torrent. This requires that the Info is diff --git a/test/issue377_test.go b/test/issue377_test.go index 01caaed6..48e5abfb 100644 --- a/test/issue377_test.go +++ b/test/issue377_test.go @@ -98,7 +98,7 @@ func testReceiveChunkStorageFailure(t *testing.T, seederFast bool) { } } // TODO: Check that PeerConns fastEnabled matches seederFast? - //select {} + // select {} } type pieceState struct { diff --git a/test/transfer_test.go b/test/transfer_test.go index a5573d72..3e3f77a7 100644 --- a/test/transfer_test.go +++ b/test/transfer_test.go @@ -68,7 +68,7 @@ func testClientTransfer(t *testing.T, ps testClientTransferParams) { defer os.RemoveAll(greetingTempDir) // Create seeder and a Torrent. cfg := torrent.TestingConfig(t) - //cfg.Debug = true + // cfg.Debug = true cfg.Seed = true // Some test instances don't like this being on, even when there's no cache involved. cfg.DropMutuallyCompletePeers = false @@ -116,7 +116,7 @@ func testClientTransfer(t *testing.T, ps testClientTransferParams) { cfg.DownloadRateLimiter = ps.LeecherDownloadRateLimiter } cfg.Seed = false - //cfg.Debug = true + // cfg.Debug = true if ps.ConfigureLeecher.Config != nil { ps.ConfigureLeecher.Config(cfg) } @@ -180,7 +180,7 @@ func testClientTransfer(t *testing.T, ps testClientTransferParams) { leecherPeerConns := leecherTorrent.PeerConns() if cfg.DropMutuallyCompletePeers { // I don't think we can assume it will be empty already, due to timing. - //assert.Empty(t, leecherPeerConns) + // assert.Empty(t, leecherPeerConns) } else { assert.NotEmpty(t, leecherPeerConns) } @@ -296,8 +296,8 @@ func testClientTransferSmallCache(t *testing.T, setReadahead bool, readahead int ConfigureLeecher: ConfigureClient{ Config: func(cfg *torrent.ClientConfig) { cfg.DropDuplicatePeerIds = true - //cfg.DisableIPv6 = true - //cfg.DisableUTP = true + // cfg.DisableIPv6 = true + // cfg.DisableUTP = true }, }, }) diff --git a/torrent.go b/torrent.go index 104ed962..c8025aae 100644 --- a/torrent.go +++ b/torrent.go @@ -209,7 +209,6 @@ func (t *Torrent) KnownSwarm() (ks []PeerInfo) { // Add active peers to the list for conn := range t.conns { - ks = append(ks, PeerInfo{ Id: conn.PeerID, Addr: conn.RemoteAddr, @@ -888,10 +887,10 @@ func (t *Torrent) hashPiece(piece pieceIndex) (ret metainfo.Hash, err error) { p.waitNoPendingWrites() storagePiece := t.pieces[piece].Storage() - //Does the backend want to do its own hashing? + // Does the backend want to do its own hashing? if i, ok := storagePiece.PieceImpl.(storage.SelfHashing); ok { var sum metainfo.Hash - //log.Printf("A piece decided to self-hash: %d", piece) + // log.Printf("A piece decided to self-hash: %d", piece) sum, err = i.SelfHash() missinggo.CopyExact(&ret, sum) return @@ -1506,7 +1505,6 @@ func (t *Torrent) startWebsocketAnnouncer(u url.URL) torrentTrackerAnnouncer { } }() return wst - } func (t *Torrent) startScrapingTracker(_url string) { diff --git a/tracker/http/http_test.go b/tracker/http/http_test.go index 878ca058..fce77c05 100644 --- a/tracker/http/http_test.go +++ b/tracker/http/http_test.go @@ -58,7 +58,8 @@ func TestSetAnnounceInfohashParamWithSpaces(t *testing.T) { someUrl := &url.URL{} ihBytes := [20]uint8{ 0x2b, 0x76, 0xa, 0xa1, 0x78, 0x93, 0x20, 0x30, 0xc8, 0x47, - 0xdc, 0xdf, 0x8e, 0xae, 0xbf, 0x56, 0xa, 0x1b, 0xd1, 0x6c} + 0xdc, 0xdf, 0x8e, 0xae, 0xbf, 0x56, 0xa, 0x1b, 0xd1, 0x6c, + } setAnnounceParams( someUrl, &udp.AnnounceRequest{ diff --git a/tracker/tracker.go b/tracker/tracker.go index edc84dcc..f058f63b 100644 --- a/tracker/tracker.go +++ b/tracker/tracker.go @@ -28,9 +28,7 @@ type Peer = trHttp.Peer type AnnounceEvent = udp.AnnounceEvent -var ( - ErrBadScheme = errors.New("unknown scheme") -) +var ErrBadScheme = errors.New("unknown scheme") type Announce struct { TrackerUrl string diff --git a/tracker_scraper.go b/tracker_scraper.go index d4bce60a..9ec29589 100644 --- a/tracker_scraper.go +++ b/tracker_scraper.go @@ -112,7 +112,6 @@ func (me *trackerScraper) trackerUrl(ip net.IP) string { // Return how long to wait before trying again. For most errors, we return 5 // minutes, a relatively quick turn around for DNS changes. func (me *trackerScraper) announce(ctx context.Context, event tracker.AnnounceEvent) (ret trackerAnnounceResult) { - defer func() { ret.Completed = time.Now() }() @@ -190,7 +189,6 @@ func (me *trackerScraper) canIgnoreInterval(notify *<-chan struct{}) bool { } func (me *trackerScraper) Run() { - defer me.announceStopped() ctx, cancel := context.WithCancel(context.Background()) diff --git a/webtorrent/tracker_client.go b/webtorrent/tracker_client.go index d75b9f9b..f4136c60 100644 --- a/webtorrent/tracker_client.go +++ b/webtorrent/tracker_client.go @@ -150,7 +150,6 @@ func (tc *TrackerClient) Close() error { } func (tc *TrackerClient) announceOffers() { - // tc.Announce grabs a lock on tc.outboundOffers. It also handles the case where outboundOffers // is nil. Take ownership of outboundOffers here. tc.mu.Lock() @@ -256,7 +255,7 @@ func (tc *TrackerClient) trackerReadLoop(tracker *websocket.Conn) error { if err != nil { return fmt.Errorf("read message error: %w", err) } - //tc.Logger.WithDefaultLevel(log.Debug).Printf("received message from tracker: %q", message) + // tc.Logger.WithDefaultLevel(log.Debug).Printf("received message from tracker: %q", message) var ar AnnounceResponse if err := json.Unmarshal(message, &ar); err != nil { @@ -337,7 +336,7 @@ func (tc *TrackerClient) handleAnswer(offerId string, answer webrtc.SessionDescr tc.Logger.WithDefaultLevel(log.Warning).Printf("could not find offer for id %+q", offerId) return } - //tc.Logger.WithDefaultLevel(log.Debug).Printf("offer %q got answer %v", offerId, answer) + // tc.Logger.WithDefaultLevel(log.Debug).Printf("offer %q got answer %v", offerId, answer) metrics.Add("outbound offers answered", 1) err := offer.setAnswer(answer, func(dc datachannel.ReadWriteCloser) { metrics.Add("outbound offers answered with datachannel", 1) -- 2.44.0