From: Matt Joiner Date: Wed, 13 Aug 2025 01:56:43 +0000 (+1000) Subject: Fix some lints X-Git-Tag: v1.59.0~2^2~19 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=972a313e18d18170b2f5bd0472d0e8f3703957d3;p=btrtrc.git Fix some lints --- diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go index c5804490..7e452ad6 100644 --- 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 index 7249f507..00000000 --- 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 4384ea2c..e62398bd 100644 --- 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 6fc46dbb..d092d51f 100644 --- 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 bbab8eb8..9758cbd2 100644 --- 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 cd0f85ea..e3b9ef36 100644 --- 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 bcb9d21e..841f5367 100644 --- 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 5507f53d..c5bedf38 100644 --- 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 b8a6c78c..6ba87218 100644 --- 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 77df4061..4f84a5fa 100644 --- 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" }