ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 14:44:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update golangci-lint

Browse Source
This commit is contained in:
9seconds
2022-08-08 15:54:38 +03:00
parent 6a19ded78e
commit 36dad5a2f6
70 changed files with 227 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/circuit_breaker.go
+5 -5
View File
@@ -59,7 +59,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context,
conn.Close()
}
return nil, ctx.Err() // nolint: wrapcheck
return nil, ctx.Err() //nolint: wrapcheck
case c.stateMutexChan <- true:
defer func() {
<-c.stateMutexChan
@@ -78,7 +78,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context,
c.switchState(circuitBreakerStateOpened)
}
return conn, err // nolint: wrapcheck
return conn, err //nolint: wrapcheck
}
func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context,
@@ -96,7 +96,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context,
conn.Close()
}
return nil, ctx.Err() // nolint: wrapcheck
return nil, ctx.Err() //nolint: wrapcheck
case c.stateMutexChan <- true:
defer func() {
<-c.stateMutexChan
@@ -104,7 +104,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context,
}
if c.state != circuitBreakerStateHalfOpened {
return conn, err // nolint: wrapcheck
return conn, err //nolint: wrapcheck
}
if err == nil {
@@ -113,7 +113,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context,
c.switchState(circuitBreakerStateOpened)
}
return conn, err // nolint: wrapcheck
return conn, err //nolint: wrapcheck
}
func (c *circuitBreakerDialer) switchState(state uint32) {
network/circuit_breaker_internal_test.go
+4 -4
View File
@@ -110,10 +110,10 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() {
Port: 80,
})
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") //nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") //nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") //nolint: errcheck
suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") //nolint: errcheck
time.Sleep(500 * time.Millisecond)
network/default.go
+2 -2
View File
@@ -19,7 +19,7 @@ func (d *defaultDialer) Dial(network, address string) (essentials.Conn, error) {
func (d *defaultDialer) DialContext(ctx context.Context, network, address string) (essentials.Conn, error) {
switch network {
case "tcp", "tcp4", "tcp6": // nolint: goconst
case "tcp", "tcp4", "tcp6": //nolint: goconst
default:
return nil, fmt.Errorf("unsupported network %s", network)
}
@@ -36,7 +36,7 @@ func (d *defaultDialer) DialContext(ctx context.Context, network, address string
return nil, fmt.Errorf("cannot set socket options: %w", err)
}
return conn.(essentials.Conn), nil // nolint: forcetypeassert
return conn.(essentials.Conn), nil //nolint: forcetypeassert
}
// NewDefaultDialer build a new dialer which dials bypassing proxies
network/default_test.go
+1 -1
View File
@@ -57,7 +57,7 @@ func (suite *DefaultDialerTestSuite) TestConnectOk() {
func (suite *DefaultDialerTestSuite) TestHTTPRequest() {
httpClient := suite.MakeHTTPClient(suite.d)
resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
resp, err := httpClient.Get(suite.MakeURL("/get")) //nolint: noctx
if err == nil {
defer resp.Body.Close()
}
network/dns_resolver.go
+2 -4
View File
@@ -85,13 +85,13 @@ func (d *dnsResolver) LookupAAAA(hostname string) []string {
return ips
}
func newDNSResolver(hostname string, httpClient *http.Client) (ret *dnsResolver) {
func newDNSResolver(hostname string, httpClient *http.Client) *dnsResolver {
if net.ParseIP(hostname).To4() == nil {
// the hostname is an IPv6 address
hostname = fmt.Sprintf("[%s]", hostname)
}
ret = &dnsResolver{
return &dnsResolver{
resolver: doh.Resolver{
Host: hostname,
Class: doh.IN,
@@ -99,6 +99,4 @@ func newDNSResolver(hostname string, httpClient *http.Client) (ret *dnsResolver)
},
cache: map[string]dnsResolverCacheEntry{},
}
return
}
network/init_internal_test.go
+2 -2
View File
@@ -14,11 +14,11 @@ type DialerMock struct {
func (d *DialerMock) Dial(network, address string) (essentials.Conn, error) {
args := d.Called(network, address)
return args.Get(0).(essentials.Conn), args.Error(1) // nolint: wrapcheck, forcetypeassert
return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert
}
func (d *DialerMock) DialContext(ctx context.Context, network, address string) (essentials.Conn, error) {
args := d.Called(ctx, network, address)
return args.Get(0).(essentials.Conn), args.Error(1) // nolint: wrapcheck, forcetypeassert
return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert
}
network/init_test.go
+4 -4
View File
@@ -22,13 +22,13 @@ type DialerMock struct {
func (d *DialerMock) Dial(network, address string) (essentials.Conn, error) {
args := d.Called(network, address)
return args.Get(0).(essentials.Conn), args.Error(1) // nolint: wrapcheck, forcetypeassert
return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert
}
func (d *DialerMock) DialContext(ctx context.Context, network, address string) (essentials.Conn, error) {
args := d.Called(ctx, network, address)
return args.Get(0).(essentials.Conn), args.Error(1) // nolint: wrapcheck, forcetypeassert
return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert
}
type HTTPServerTestSuite struct {
@@ -55,7 +55,7 @@ func (suite *HTTPServerTestSuite) MakeHTTPClient(dialer network.Dialer) *http.Cl
return &http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
return dialer.DialContext(ctx, network, address) // nolint: wrapcheck
return dialer.DialContext(ctx, network, address) //nolint: wrapcheck
},
},
}
@@ -74,7 +74,7 @@ func (suite *Socks5ServerTestSuite) SetupSuite() {
},
})
go suite.socks5Server.Serve(suite.socks5Listener) // nolint: errcheck
go suite.socks5Server.Serve(suite.socks5Listener) //nolint: errcheck
}
func (suite *Socks5ServerTestSuite) TearDownSuite() {
network/load_balanced_socks5_test.go
+1 -1
View File
@@ -73,7 +73,7 @@ func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() {
}
func (suite *LoadBalancedSocks5TestSuite) TestDialOk() {
resp, err := suite.httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
resp, err := suite.httpClient.Get(suite.MakeURL("/get")) //nolint: noctx
if err == nil {
defer resp.Body.Close()
}
network/network.go
+1 -1
View File
@@ -21,7 +21,7 @@ type networkHTTPTransport struct {
func (n networkHTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) {
req.Header.Set("User-Agent", n.userAgent)
return n.next.RoundTrip(req) // nolint: wrapcheck
return n.next.RoundTrip(req) //nolint: wrapcheck
}
type network struct {
network/network_test.go
+4 -4
View File
@@ -31,7 +31,7 @@ func (suite *NetworkTestSuite) TestLocalHTTPRequest() {
client := ntw.MakeHTTPClient(nil)
resp, err := client.Get(suite.httpServer.URL + "/headers") // nolint: noctx
resp, err := client.Get(suite.httpServer.URL + "/headers") //nolint: noctx
suite.NoError(err)
defer resp.Body.Close()
@@ -42,7 +42,7 @@ func (suite *NetworkTestSuite) TestLocalHTTPRequest() {
jsonStruct := struct {
Headers struct {
UserAgent []string `json:"User-Agent"` // nolint: tagliatelle
UserAgent []string `json:"User-Agent"` //nolint: tagliatelle
} `json:"headers"`
}{}
@@ -56,7 +56,7 @@ func (suite *NetworkTestSuite) TestRealHTTPRequest() {
client := ntw.MakeHTTPClient(nil)
resp, err := client.Get("https://httpbin.org/headers") // nolint: noctx
resp, err := client.Get("https://httpbin.org/headers") //nolint: noctx
suite.NoError(err)
defer resp.Body.Close()
@@ -67,7 +67,7 @@ func (suite *NetworkTestSuite) TestRealHTTPRequest() {
jsonStruct := struct {
Headers struct {
UserAgent string `json:"User-Agent"` // nolint: tagliatelle
UserAgent string `json:"User-Agent"` //nolint: tagliatelle
} `json:"headers"`
}{}
network/proxy_dialer.go
+1 -1
View File
@@ -16,7 +16,7 @@ func newProxyDialer(baseDialer Dialer, proxyURL *url.URL) Dialer {
)
if param := params.Get("open_threshold"); param != "" {
if intNum, err := strconv.ParseUint(param, 10, 32); err == nil { // nolint: gomnd
if intNum, err := strconv.ParseUint(param, 10, 32); err == nil { //nolint: gomnd
openThreshold = uint32(intNum)
}
}
network/proxy_dialer_internal_test.go
+5 -5
View File
@@ -21,7 +21,7 @@ func (suite *ProxyDialerTestSuite) SetupSuite() {
}
func (suite *ProxyDialerTestSuite) TestSetupDefaults() {
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) // nolint: forcetypeassert
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) //nolint: forcetypeassert
suite.EqualValues(ProxyDialerOpenThreshold, d.openThreshold)
suite.EqualValues(ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
suite.EqualValues(ProxyDialerResetFailuresTimeout, d.resetFailuresTimeout)
@@ -34,7 +34,7 @@ func (suite *ProxyDialerTestSuite) TestSetupValuesAllOk() {
query.Set("half_open_timeout", "2s")
suite.u.RawQuery = query.Encode()
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) // nolint: forcetypeassert
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) //nolint: forcetypeassert
suite.EqualValues(30, d.openThreshold)
suite.EqualValues(2*time.Second, d.halfOpenTimeout)
suite.EqualValues(time.Second, d.resetFailuresTimeout)
@@ -50,7 +50,7 @@ func (suite *ProxyDialerTestSuite) TestOpenThreshold() {
query.Set("open_threshold", param)
suite.u.RawQuery = query.Encode()
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) // nolint: forcetypeassert
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) //nolint: forcetypeassert
assert.EqualValues(t, ProxyDialerOpenThreshold, d.openThreshold)
})
}
@@ -66,7 +66,7 @@ func (suite *ProxyDialerTestSuite) TestHalfOpenTimeout() {
query.Set("half_open_timeout", param)
suite.u.RawQuery = query.Encode()
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) // nolint: forcetypeassert
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) //nolint: forcetypeassert
assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
})
}
@@ -82,7 +82,7 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() {
query.Set("reset_failures_timeout", param)
suite.u.RawQuery = query.Encode()
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) // nolint: forcetypeassert
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) //nolint: forcetypeassert
assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
})
}
network/sockopts.go
+2 -2
View File
@@ -10,13 +10,13 @@ import (
//
// bufferSize setting is deprecated and ignored.
func SetClientSocketOptions(conn net.Conn, bufferSize int) error {
return setCommonSocketOptions(conn.(*net.TCPConn)) // nolint: forcetypeassert
return setCommonSocketOptions(conn.(*net.TCPConn)) //nolint: forcetypeassert
}
// SetServerSocketOptions tunes a TCP socket that represents a connection to
// remote server like Telegram or fronting domain (but not end user).
func SetServerSocketOptions(conn net.Conn, bufferSize int) error {
return setCommonSocketOptions(conn.(*net.TCPConn)) // nolint: forcetypeassert
return setCommonSocketOptions(conn.(*net.TCPConn)) //nolint: forcetypeassert
}
func setCommonSocketOptions(conn *net.TCPConn) error {
network/sockopts_unix.go
+3 -3
View File
@@ -13,15 +13,15 @@ import (
func setSocketReuseAddrPort(conn syscall.RawConn) error {
var err error
conn.Control(func(fd uintptr) { // nolint: errcheck
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
conn.Control(func(fd uintptr) { //nolint: errcheck
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1) //nolint: nosnakecase
if err != nil {
err = fmt.Errorf("cannot set SO_REUSEADDR: %w", err)
return
}
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1) //nolint: nosnakecase
if err != nil {
err = fmt.Errorf("cannot set SO_REUSEPORT: %w", err)
}
network/socks5.go
+1 -1
View File
@@ -139,7 +139,7 @@ func (s socks5Dialer) connect(conn io.ReadWriter, address string) error {
// NewSocks5Dialer build a new dialer from a given one (so, in theory you can
// chain here). Proxy parameters are passed with URI in a form of:
//
// socks5://[user:[password]]@host:port
// socks5://[user:[password]]@host:port
func NewSocks5Dialer(baseDialer Dialer, proxyURL *url.URL) (Dialer, error) {
if _, _, err := net.SplitHostPort(proxyURL.Host); err != nil {
return nil, fmt.Errorf("incorrect url %s", proxyURL.Redacted())
network/socks5_test.go
+2 -2
View File
@@ -33,7 +33,7 @@ func (suite *Socks5TestSuite) TestRequestFailed() {
dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
httpClient := suite.MakeHTTPClient(dialer)
resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
resp, err := httpClient.Get(suite.MakeURL("/get")) //nolint: noctx
if err == nil {
defer resp.Body.Close()
}
@@ -46,7 +46,7 @@ func (suite *Socks5TestSuite) TestRequestOk() {
dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
httpClient := suite.MakeHTTPClient(dialer)
resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
resp, err := httpClient.Get(suite.MakeURL("/get")) //nolint: noctx
if err == nil {
defer resp.Body.Close()
}