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

Update golanci-lint

Browse Source
This commit is contained in:
9seconds
2021-04-09 14:35:04 +03:00
parent 81bca75c25
commit 585ebfeb50
32 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cli/access.go
+1 -1
View File
@@ -102,7 +102,7 @@ func (c *Access) Execute(cli *CLI) error {
func (c *Access) getIP(protocol string) net.IP {
client := c.Network.MakeHTTPClient(func(ctx context.Context, network, address string) (net.Conn, error) {
return c.Network.DialContext(ctx, protocol, address)
return c.Network.DialContext(ctx, protocol, address) // nolint: wrapcheck
})
req, err := http.NewRequest(http.MethodGet, "https://ifconfig.co", nil) // nolint: noctx
internal/cli/base.go
+3 -3
View File
@@ -62,14 +62,14 @@ func (b *base) makeNetwork(conf *config.Config, version string) (mtglib.Network,
switch len(proxyURLs) {
case 0:
return network.NewNetwork(baseDialer, userAgent, dohIP, httpTimeout)
return network.NewNetwork(baseDialer, userAgent, dohIP, httpTimeout) // nolint: wrapcheck
case 1:
socksDialer, err := network.NewSocks5Dialer(baseDialer, proxyURLs[0])
if err != nil {
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout) // nolint: wrapcheck
}
socksDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, proxyURLs)
@@ -77,5 +77,5 @@ func (b *base) makeNetwork(conf *config.Config, version string) (mtglib.Network,
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout) // nolint: wrapcheck
}
internal/testlib/mtglib_network_mock.go
+2 -2
View File
@@ -15,13 +15,13 @@ type MtglibNetworkMock struct {
func (m *MtglibNetworkMock) Dial(network, address string) (net.Conn, error) {
args := m.Called(network, address)
return args.Get(0).(net.Conn), args.Error(1)
return args.Get(0).(net.Conn), args.Error(1) // nolint: wrapcheck
}
func (m *MtglibNetworkMock) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
args := m.Called(ctx, network, address)
return args.Get(0).(net.Conn), args.Error(1)
return args.Get(0).(net.Conn), args.Error(1) // nolint: wrapcheck
}
func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context,
internal/testlib/net_conn_mock.go
+4 -4
View File
@@ -24,7 +24,7 @@ func (n *NetConnMock) Write(b []byte) (int, error) {
}
func (n *NetConnMock) Close() error {
return n.Called().Error(0)
return n.Called().Error(0) // nolint: wrapcheck
}
func (n *NetConnMock) LocalAddr() net.Addr {
@@ -36,13 +36,13 @@ func (n *NetConnMock) RemoteAddr() net.Addr {
}
func (n *NetConnMock) SetDeadline(t time.Time) error {
return n.Called(t).Error(0)
return n.Called(t).Error(0) // nolint: wrapcheck
}
func (n *NetConnMock) SetReadDeadline(t time.Time) error {
return n.Called(t).Error(0)
return n.Called(t).Error(0) // nolint: wrapcheck
}
func (n *NetConnMock) SetWriteDeadline(t time.Time) error {
return n.Called(t).Error(0)
return n.Called(t).Error(0) // nolint: wrapcheck
}