Fix some lints

diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index c5804490ebc70ad26540c5d29c3eff738b0a1f2a..7e452ad6e268fd35535d323a453a5d2f40866339 100644 (file)
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -9,20 +9,16 @@ import (
        stdLog "log"
        "net/http"
        "os"
-       "time"
 
        "github.com/anacrolix/bargle"
        "github.com/anacrolix/envpprof"
        app "github.com/anacrolix/gostdapp"
-       "github.com/anacrolix/log"
        xprometheus "github.com/anacrolix/missinggo/v2/prometheus"
+       "github.com/anacrolix/torrent/bencode"
+       "github.com/anacrolix/torrent/version"
        "github.com/davecgh/go-spew/spew"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/prometheus/client_golang/prometheus/promhttp"
-       "go.opentelemetry.io/otel/sdk/trace"
-
-       "github.com/anacrolix/torrent/bencode"
-       "github.com/anacrolix/torrent/version"
 )
 
 func init() {
@@ -31,17 +27,6 @@ func init() {
        http.Handle("/metrics", promhttp.Handler())
 }
 
-func shutdownTracerProvider(ctx context.Context, tp *trace.TracerProvider) {
-       started := time.Now()
-       err := tp.Shutdown(ctx)
-       elapsed := time.Since(started)
-       logger := log.Default.Slogger()
-       logger.Debug("shutting down tracer provider", "took", elapsed)
-       if err != nil && ctx.Err() == nil {
-               log.Default.Slogger().Error("error shutting down tracer provider", "err", err)
-       }
-}
-
 func main() {
        app.RunContext(mainErr)
 }

diff --git a/fmt.go b/fmt.go
deleted file mode 100644 (file)
index 7249f50..0000000
--- a/fmt.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package torrent
-
-import (
-       "fmt"
-       "strings"
-)
-
-func formatMap[K comparable, V any](m map[K]V) string {
-       var sb strings.Builder
-       for k, v := range m {
-               fmt.Fprintf(&sb, "%v: %v\n", k, v)
-       }
-       return strings.TrimSuffix(sb.String(), "\n")
-}

diff --git a/internal/request-strategy/order.go b/internal/request-strategy/order.go
index 4384ea2c9752044808eafa6dae5ccb715bcbcf7c..e62398bd7f97c12b8374ec94166b9cf8b1e6c06d 100644 (file)
--- a/internal/request-strategy/order.go
+++ b/internal/request-strategy/order.go
@@ -13,7 +13,6 @@ type (
        RequestIndex  uint32
        ChunkIndex    = RequestIndex
        Request       = types.Request
-       pieceIndex    = types.PieceIndex
        piecePriority = types.PiecePriority
        // This can be made into a type-param later, will be great for testing.
        ChunkSpec = types.ChunkSpec

diff --git a/metainfo/info.go b/metainfo/info.go
index 6fc46dbb2b39543edd4638d90373fef2c7626aa4..d092d51ff89733675e01c005d7371d6eb9bb180b 100644 (file)
--- a/metainfo/info.go
+++ b/metainfo/info.go
@@ -190,8 +190,6 @@ func (info *Info) UpvertedV1Files() iter.Seq[FileInfo] {
                                return
                        }
                }
-               return
-
        }
 }
 

diff --git a/peerconn.go b/peerconn.go
index bbab8eb8020557d8cac5698b0b7741c52830a70a..9758cbd23d26c838e83dfe9c15bdfbff236c6cd8 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -706,7 +706,6 @@ again:
        panicif.False(c.peerRequestServerRunning)
        c.peerRequestServerRunning = false
        c.locker().Unlock()
-       return
 }
 
 // TODO: Return an error then let caller filter on conditions.

diff --git a/request-strategy-impls_test.go b/request-strategy-impls_test.go
index cd0f85eaad15b7729ada382e2af6233dcf98884b..e3b9ef36089361cea08d615847396aed525e0b59 100644 (file)
--- a/request-strategy-impls_test.go
+++ b/request-strategy-impls_test.go
@@ -112,7 +112,7 @@ func BenchmarkRequestStrategy(b *testing.B) {
        //b.StopTimer()
        b.ResetTimer()
        //b.ReportAllocs()
-       for _ = range iter.N(b.N) {
+       for range b.N {
                storageClient.completed = 0
                for pieceIndex := range iter.N(numPieces) {
                        tor.updatePieceCompletion(pieceIndex)

diff --git a/storage/wrappers.go b/storage/wrappers.go
index bcb9d21ec588b1fd4ac139816d81c099fe22e63d..841f5367474c844bbc4454b83086bf7ea879a36c 100644 (file)
--- a/storage/wrappers.go
+++ b/storage/wrappers.go
@@ -7,8 +7,6 @@ import (
        "os"
 
        g "github.com/anacrolix/generics"
-       "github.com/anacrolix/missinggo/v2"
-
        "github.com/anacrolix/torrent/metainfo"
 )
 
@@ -90,7 +88,6 @@ func (p Piece) WriteAt(b []byte, off int64) (n int, err error) {
        if off+int64(len(b)) > p.mip.Length() {
                panic("write overflows piece")
        }
-       b = missinggo.LimitLen(b, p.mip.Length()-off)
        return p.PieceImpl.WriteAt(b, off)
 }
 
@@ -105,7 +102,7 @@ func (p Piece) ReadAt(b []byte, off int64) (n int, err error) {
                err = io.EOF
                return
        }
-       b = missinggo.LimitLen(b, p.mip.Length()-off)
+       b = b[:min(int64(len(b)), p.mip.Length()-off)]
        if len(b) == 0 {
                return
        }

diff --git a/tests/issue-930/server.go b/tests/issue-930/server.go
index 5507f53da18c5104c6f662c759bd8d32e1419b1f..c5bedf386d1772954863cdda0a29c6a0b7f0c90d 100644 (file)
--- a/tests/issue-930/server.go
+++ b/tests/issue-930/server.go
@@ -39,7 +39,6 @@ func server() {
                index++
 
                w.Write([]byte("OK"))
-               return
        })
 
        if err := http.ListenAndServe(":8080", mux); err != nil {

diff --git a/torrent.go b/torrent.go
index b8a6c78c6fd91271c6874a69e3499f0a2e9becf2..6ba872183fe020978338d18323fea94285cfbd76 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -3651,15 +3651,6 @@ func (t *Torrent) piecesMightBePartial(beginPieceIndex, endPieceIndex int) bool
        }
 }
 
-func (t *Torrent) requestIndexIsInActiveWebseedRequest(reqIndex RequestIndex) bool {
-       for _, p := range t.webSeeds {
-               for range p.activeRequestsForIndex(reqIndex) {
-                       return true
-               }
-       }
-       return false
-}
-
 func (t *Torrent) hasActiveWebseedRequests() bool {
        for _, p := range t.webSeeds {
                for req := range p.activeRequests {

diff --git a/webseed-peer.go b/webseed-peer.go
index 77df406149275f10826456400044c0a4a89e571a..4f84a5fa2f5872bcd753322aeee3cd238f1828c6 100644 (file)
--- a/webseed-peer.go
+++ b/webseed-peer.go
@@ -5,7 +5,6 @@ import (
        "errors"
        "fmt"
        "io"
-       "iter"
        "log/slog"
        "math/rand"
        "strings"
@@ -67,11 +66,6 @@ func (me *webseedPeer) checkReceivedChunk(RequestIndex, *pp.Message, Request) (b
        return true, nil
 }
 
-func (me *webseedPeer) numRequests() int {
-       // What about unassigned requests? TODO: Don't allow those.
-       return len(me.activeRequests)
-}
-
 func (me *webseedPeer) lastWriteUploadRate() float64 {
        // We never upload to webseeds.
        return 0
@@ -111,18 +105,6 @@ func (ws *webseedPeer) onGotInfo(info *metainfo.Info) {
 // Webseeds check the next request is wanted before reading it.
 func (ws *webseedPeer) handleCancel(RequestIndex) {}
 
-func (ws *webseedPeer) activeRequestsForIndex(r RequestIndex) iter.Seq[*webseedRequest] {
-       return func(yield func(*webseedRequest) bool) {
-               for wr := range ws.activeRequests {
-                       if r >= wr.next && r < wr.end {
-                               if !yield(wr) {
-                                       return
-                               }
-                       }
-               }
-       }
-}
-
 func (ws *webseedPeer) requestIndexTorrentOffset(r RequestIndex) int64 {
        return ws.peer.t.requestIndexBegin(r)
 }
@@ -232,13 +214,6 @@ func (ws *webseedPeer) deleteActiveRequest(wr *webseedRequest) {
        ws.peer.updateExpectingChunks()
 }
 
-func (ws *webseedPeer) inactiveRequestIndex(index RequestIndex) bool {
-       for range ws.activeRequestsForIndex(index) {
-               return false
-       }
-       return true
-}
-
 func (ws *webseedPeer) connectionFlags() string {
        return "WS"
 }