fix lint errors

bittorrent/bittorrent.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+
 	"github.com/sot-tech/mochi/pkg/log"
 )
 

cmd/mochi/main.go

@@ -9,6 +9,8 @@ import (
 	"syscall"
 
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+
 	"github.com/sot-tech/mochi/frontend/http"
 	"github.com/sot-tech/mochi/frontend/udp"
 	"github.com/sot-tech/mochi/middleware"
@@ -17,7 +19,6 @@ import (
 	_ "github.com/sot-tech/mochi/pkg/randseed"
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
-	"github.com/spf13/cobra"
 )
 
 var e2eCmd *cobra.Command

frontend/http/parser.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"errors"
 	"net"
 	"net/http"
 
@@ -91,7 +92,7 @@ func ParseAnnounce(r *http.Request, opts ParseOptions) (*bittorrent.AnnounceRequ
 
 	// Determine the number of peers the client wants in the response.
 	numwant, err := qp.Uint("numwant", 32)
-	if err != nil && err != bittorrent.ErrKeyNotFound {
+	if err != nil && !errors.Is(err, bittorrent.ErrKeyNotFound) {
 		return nil, bittorrent.ClientError("failed to parse parameter: numwant")
 	}
 	// If there were no errors, the user actually provided the numwant.

frontend/http/writer.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/anacrolix/torrent/bencode"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/pkg/log"
 )
@@ -65,7 +66,6 @@ func WriteAnnounceResponse(w http.ResponseWriter, resp *bittorrent.AnnounceRespo
 		if len(IPv6CompactDict) > 0 {
 			bdict["peers6"] = IPv6CompactDict
 		}
-
 	} else {
 		// Add the peers to the dictionary.
 		peers := make([]map[string]any, 0, len(resp.IPv4Peers)+len(resp.IPv6Peers))

frontend/udp/frontend.go

@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"math/rand"
 	"net"
@@ -186,7 +187,8 @@ func (t *Frontend) serve() error {
 		n, addr, err := t.socket.ReadFromUDP(*buffer)
 		if err != nil {
 			pool.Put(buffer)
-			if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+			var netErr net.Error
+			if errors.As(err, &netErr) && netErr.Timeout() {
 				// A temporary failure is not fatal; just pretend it never happened.
 				continue
 			}

middleware/clientapproval/clientapproval.go

@@ -7,10 +7,11 @@ import (
 	"errors"
 	"fmt"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name is the name by which this middleware is registered with Conf.

middleware/clientapproval/clientapproval_test.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sot-tech/mochi/bittorrent"
 )
 
 var cases = []struct {

middleware/jwt/jwt.go

@@ -21,12 +21,13 @@ import (
 	"github.com/SermoDigital/jose/jws"
 	"github.com/SermoDigital/jose/jwt"
 	"github.com/mendsley/gojwk"
+	"gopkg.in/yaml.v3"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/pkg/log"
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name is the name by which this middleware is registered with Conf.

middleware/middleware.go

@@ -6,8 +6,9 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/sot-tech/mochi/storage"
 	"gopkg.in/yaml.v3"
+
+	"github.com/sot-tech/mochi/storage"
 )
 
 var (

middleware/pkg/random/xorshift_test.go

@@ -4,8 +4,9 @@ import (
 	"math/rand"
 	"testing"
 
-	_ "github.com/sot-tech/mochi/pkg/randseed"
 	"github.com/stretchr/testify/require"
+
+	_ "github.com/sot-tech/mochi/pkg/randseed"
 )
 
 func TestIntn(t *testing.T) {

middleware/torrentapproval/container/directory/directory.go

@@ -10,13 +10,14 @@ import (
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/torrent/util/dirwatch"
 	"github.com/minio/sha256-simd"
+	"gopkg.in/yaml.v3"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container/list"
 	"github.com/sot-tech/mochi/pkg/log"
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name of this container for registry

middleware/torrentapproval/container/list/list.go

@@ -5,11 +5,12 @@ package list
 import (
 	"fmt"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container"
 	"github.com/sot-tech/mochi/pkg/log"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name of this container for registry.

middleware/torrentapproval/torrentapproval.go

@@ -9,13 +9,15 @@ import (
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container"
+	"gopkg.in/yaml.v3"
+
 	// import directory watcher to enable appropriate support
 	_ "github.com/sot-tech/mochi/middleware/torrentapproval/container/directory"
+
 	// import static list to enable appropriate support
 	_ "github.com/sot-tech/mochi/middleware/torrentapproval/container/list"
 	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name is the name by which this middleware is registered with Conf.

middleware/torrentapproval/torrentapproval_test.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/sot-tech/mochi/bittorrent"
-	"github.com/sot-tech/mochi/storage/memory"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
+
+	"github.com/sot-tech/mochi/bittorrent"
+	"github.com/sot-tech/mochi/storage/memory"
 )
 
 var cases = []struct {

middleware/varinterval/varinterval.go

@@ -7,11 +7,12 @@ import (
 	"sync"
 	"time"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/middleware/pkg/random"
 	"github.com/sot-tech/mochi/storage"
-	"gopkg.in/yaml.v3"
 )
 
 // Name is the name by which this middleware is registered with Conf.

middleware/varinterval/varinterval_test.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sot-tech/mochi/bittorrent"
 )
 
 var configTests = []struct {

storage/redis/storage_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis"
+
 	s "github.com/sot-tech/mochi/storage"
 	"github.com/sot-tech/mochi/storage/test"
 )

storage/test/storage_test_base.go

@@ -3,9 +3,10 @@ package test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/storage"
-	"github.com/stretchr/testify/require"
 )
 
 // PeerEqualityFunc is the boolean function to use to check two Peers for