From 50a0e1acbe271553877dc46c1bdf61b03f532c38 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 27 Feb 2024 17:29:17 +1100 Subject: [PATCH] gorond --- client.go | 2 +- internal/cmd/issue-906/main.go | 1 + ltep.go | 1 + ltep_test.go | 9 +++------ peer_protocol/reserved_test.go | 3 ++- peerconn_test.go | 2 +- request-strategy/piece-request-order.go | 1 + smartban/smartban.go | 3 ++- smartban_test.go | 8 +++++--- socket.go | 2 +- storage/piece-resource.go | 2 +- storage/possum/possum-provider.go | 8 +++++--- storage/possum/possum_test.go | 4 +++- torrent-piece-request-order.go | 1 + 14 files changed, 28 insertions(+), 19 deletions(-) diff --git a/client.go b/client.go index e2f1de31..938bd5f3 100644 --- a/client.go +++ b/client.go @@ -9,7 +9,6 @@ import ( "errors" "expvar" "fmt" - "github.com/cespare/xxhash" "io" "math" "net" @@ -31,6 +30,7 @@ import ( "github.com/anacrolix/missinggo/v2/bitmap" "github.com/anacrolix/missinggo/v2/pproffd" "github.com/anacrolix/sync" + "github.com/cespare/xxhash" "github.com/davecgh/go-spew/spew" "github.com/dustin/go-humanize" gbtree "github.com/google/btree" diff --git a/internal/cmd/issue-906/main.go b/internal/cmd/issue-906/main.go index 7c3bdc17..41c8c584 100644 --- a/internal/cmd/issue-906/main.go +++ b/internal/cmd/issue-906/main.go @@ -6,6 +6,7 @@ import ( "os" _ "github.com/anacrolix/envpprof" + "github.com/anacrolix/torrent" ) diff --git a/ltep.go b/ltep.go index 747d8086..cde03784 100644 --- a/ltep.go +++ b/ltep.go @@ -5,6 +5,7 @@ import ( "slices" g "github.com/anacrolix/generics" + pp "github.com/anacrolix/torrent/peer_protocol" ) diff --git a/ltep_test.go b/ltep_test.go index c3c874ce..0a95a868 100644 --- a/ltep_test.go +++ b/ltep_test.go @@ -4,15 +4,12 @@ import ( "strconv" "testing" - pp "github.com/anacrolix/torrent/peer_protocol" - - qt "github.com/frankban/quicktest" - - "github.com/anacrolix/torrent/internal/testutil" - "github.com/anacrolix/sync" + qt "github.com/frankban/quicktest" . "github.com/anacrolix/torrent" + "github.com/anacrolix/torrent/internal/testutil" + pp "github.com/anacrolix/torrent/peer_protocol" ) const ( diff --git a/peer_protocol/reserved_test.go b/peer_protocol/reserved_test.go index 8ee3a722..53f9d86d 100644 --- a/peer_protocol/reserved_test.go +++ b/peer_protocol/reserved_test.go @@ -1,8 +1,9 @@ package peer_protocol import ( - qt "github.com/frankban/quicktest" "testing" + + qt "github.com/frankban/quicktest" ) func TestV2BitLocation(t *testing.T) { diff --git a/peerconn_test.go b/peerconn_test.go index 36327800..70f9017b 100644 --- a/peerconn_test.go +++ b/peerconn_test.go @@ -4,13 +4,13 @@ import ( "encoding/binary" "errors" "fmt" - g "github.com/anacrolix/generics" "io" "net" "net/netip" "sync" "testing" + g "github.com/anacrolix/generics" "github.com/frankban/quicktest" qt "github.com/frankban/quicktest" "github.com/stretchr/testify/require" diff --git a/request-strategy/piece-request-order.go b/request-strategy/piece-request-order.go index 54b5a6ee..0e279772 100644 --- a/request-strategy/piece-request-order.go +++ b/request-strategy/piece-request-order.go @@ -2,6 +2,7 @@ package requestStrategy import ( g "github.com/anacrolix/generics" + "github.com/anacrolix/torrent/metainfo" ) diff --git a/smartban/smartban.go b/smartban/smartban.go index ba568c98..1910d7d5 100644 --- a/smartban/smartban.go +++ b/smartban/smartban.go @@ -1,8 +1,9 @@ package smartban import ( - g "github.com/anacrolix/generics" "sync" + + g "github.com/anacrolix/generics" ) type Cache[Peer, BlockKey, Hash comparable] struct { diff --git a/smartban_test.go b/smartban_test.go index 2947f521..0f8e8d91 100644 --- a/smartban_test.go +++ b/smartban_test.go @@ -2,11 +2,13 @@ package torrent import ( "crypto/sha1" - "github.com/anacrolix/missinggo/v2/iter" - "github.com/anacrolix/torrent/smartban" - "github.com/cespare/xxhash" "net/netip" "testing" + + "github.com/anacrolix/missinggo/v2/iter" + "github.com/cespare/xxhash" + + "github.com/anacrolix/torrent/smartban" ) func benchmarkSmartBanRecordBlock[Sum comparable](b *testing.B, hash func([]byte) Sum) { diff --git a/socket.go b/socket.go index 0f45dcba..18c8b860 100644 --- a/socket.go +++ b/socket.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" - g "github.com/anacrolix/generics" "net" "os" "strconv" "syscall" + g "github.com/anacrolix/generics" "github.com/anacrolix/log" "github.com/anacrolix/missinggo/perf" "github.com/anacrolix/missinggo/v2" diff --git a/storage/piece-resource.go b/storage/piece-resource.go index a891e9d2..9e3e63e7 100644 --- a/storage/piece-resource.go +++ b/storage/piece-resource.go @@ -3,13 +3,13 @@ package storage import ( "bytes" "fmt" - "github.com/anacrolix/sync" "io" "path" "sort" "strconv" "github.com/anacrolix/missinggo/v2/resource" + "github.com/anacrolix/sync" "github.com/anacrolix/torrent/metainfo" ) diff --git a/storage/possum/possum-provider.go b/storage/possum/possum-provider.go index e67cdada..fd7810d3 100644 --- a/storage/possum/possum-provider.go +++ b/storage/possum/possum-provider.go @@ -5,13 +5,15 @@ package possumTorrentStorage import ( "cmp" "fmt" + "io" + "sort" + "strconv" + "github.com/anacrolix/log" possum "github.com/anacrolix/possum/go" possumResource "github.com/anacrolix/possum/go/resource" + "github.com/anacrolix/torrent/storage" - "io" - "sort" - "strconv" ) // Extends possum resource.Provider with an efficient implementation of torrent diff --git a/storage/possum/possum_test.go b/storage/possum/possum_test.go index 6bd350b1..1c0e8110 100644 --- a/storage/possum/possum_test.go +++ b/storage/possum/possum_test.go @@ -1,13 +1,15 @@ package possumTorrentStorage import ( + "testing" + g "github.com/anacrolix/generics" "github.com/anacrolix/log" possum "github.com/anacrolix/possum/go" possumResource "github.com/anacrolix/possum/go/resource" + "github.com/anacrolix/torrent/storage" test_storage "github.com/anacrolix/torrent/storage/test" - "testing" ) // This should be made to mirror the benchmarks for sqlite storage. diff --git a/torrent-piece-request-order.go b/torrent-piece-request-order.go index 03943ed0..b2bde8dc 100644 --- a/torrent-piece-request-order.go +++ b/torrent-piece-request-order.go @@ -2,6 +2,7 @@ package torrent import ( g "github.com/anacrolix/generics" + request_strategy "github.com/anacrolix/torrent/request-strategy" ) -- 2.44.0