Upgrade golangci-lint for 1.42

This commit is contained in:
9seconds
2021-08-30 11:46:32 +03:00
parent 7718f62477
commit 3e0880f6b4
29 changed files with 90 additions and 89 deletions
+1 -1
View File
@@ -136,7 +136,7 @@ func (w *wrapperMtprotoFrame) Write(p conntypes.Packet) error {
}
func (w *wrapperMtprotoFrame) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperMtprotoFrame) Conn() net.Conn {
+1 -1
View File
@@ -104,7 +104,7 @@ func (w *wrapperClientAbridged) Write(packet conntypes.Packet, acks *conntypes.C
}
func (w *wrapperClientAbridged) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperClientAbridged) Conn() net.Conn {
+1 -1
View File
@@ -63,7 +63,7 @@ func (w *wrapperClientIntermediate) Write(packet conntypes.Packet, acks *conntyp
}
func (w *wrapperClientIntermediate) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperClientIntermediate) Conn() net.Conn {
+1 -1
View File
@@ -46,7 +46,7 @@ func (w *wrapperProxy) Write(packet conntypes.Packet, acks *conntypes.Connection
buf.Grow(len(packet))
buf.Write(packet)
return w.proxy.Write(buf.Bytes())
return w.proxy.Write(buf.Bytes()) // nolint: wrapcheck
}
func (w *wrapperProxy) Read(acks *conntypes.ConnectionAcks) (conntypes.Packet, error) {
+1 -1
View File
@@ -36,7 +36,7 @@ func (w *wrapperPing) Write(p []byte) (int, error) {
}
func (w *wrapperPing) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func NewPing(ctx context.Context, parent io.ReadWriteCloser, channelPing chan<- struct{}) io.ReadWriteCloser {
+3 -3
View File
@@ -26,7 +26,7 @@ func (w *wrapperBlockCipher) Write(p []byte) (int, error) {
return 0, err
}
return w.parent.Write(encrypted)
return w.parent.Write(encrypted) // nolint: wrapcheck
}
func (w *wrapperBlockCipher) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
@@ -35,7 +35,7 @@ func (w *wrapperBlockCipher) WriteTimeout(p []byte, timeout time.Duration) (int,
return 0, err
}
return w.parent.WriteTimeout(encrypted, timeout)
return w.parent.WriteTimeout(encrypted, timeout) // nolint: wrapcheck
}
func (w *wrapperBlockCipher) encrypt(p []byte) ([]byte, error) {
@@ -50,7 +50,7 @@ func (w *wrapperBlockCipher) encrypt(p []byte) ([]byte, error) {
}
func (w *wrapperBlockCipher) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperBlockCipher) Conn() net.Conn {
+1 -1
View File
@@ -33,7 +33,7 @@ func (b *bufferedReader) ReadTimeout(p []byte, _ time.Duration) (int, error) {
func (b *bufferedReader) flush(p []byte) (int, error) {
if b.buf.Len() > len(p) {
return b.buf.Read(p)
return b.buf.Read(p) // nolint: wrapcheck
}
sizeToReturn := b.buf.Len()
+1 -1
View File
@@ -70,7 +70,7 @@ func (w *wrapperConn) Read(p []byte) (int, error) {
func (w *wrapperConn) Close() error {
w.logger.Debugw("Close connection")
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperConn) Conn() net.Conn {
+5 -5
View File
@@ -23,7 +23,7 @@ func (w *wrapperCtx) WriteTimeout(p []byte, timeout time.Duration) (int, error)
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.WriteTimeout(p, timeout)
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
}
}
@@ -34,7 +34,7 @@ func (w *wrapperCtx) Write(p []byte) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.Write(p)
return w.parent.Write(p) // nolint: wrapcheck
}
}
@@ -45,7 +45,7 @@ func (w *wrapperCtx) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.ReadTimeout(p, timeout)
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
}
}
@@ -56,14 +56,14 @@ func (w *wrapperCtx) Read(p []byte) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.Read(p)
return w.parent.Read(p) // nolint: wrapcheck
}
}
func (w *wrapperCtx) Close() error {
w.cancel()
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperCtx) Conn() net.Conn {
+3 -3
View File
@@ -20,7 +20,7 @@ type wrapperFakeTLS struct {
func (w *wrapperFakeTLS) Write(p []byte) (int, error) {
return w.write(p, func(b []byte) (int, error) {
return w.parent.Write(b)
return w.parent.Write(b) // nolint: wrapcheck
})
}
@@ -30,7 +30,7 @@ func (w *wrapperFakeTLS) WriteTimeout(p []byte, timeout time.Duration) (int, err
return w.write(p, func(b []byte) (int, error) {
elapsed := time.Since(startTime)
if elapsed > timeout {
return w.parent.WriteTimeout(b, timeout-elapsed)
return w.parent.WriteTimeout(b, timeout-elapsed) // nolint: wrapcheck
}
return 0, errors.New("timeout")
@@ -73,7 +73,7 @@ func (w *wrapperFakeTLS) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperFakeTLS) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func NewFakeTLS(socket conntypes.StreamReadWriteCloser) conntypes.StreamReadWriteCloser {
+3 -3
View File
@@ -48,7 +48,7 @@ func (w *wrapperObfuscated2) WriteTimeout(p []byte, timeout time.Duration) (int,
w.encryptor.XORKeyStream(buf, buf)
return w.parent.WriteTimeout(buf, timeout)
return w.parent.WriteTimeout(buf, timeout) // nolint: wrapcheck
}
func (w *wrapperObfuscated2) Write(p []byte) (int, error) {
@@ -60,7 +60,7 @@ func (w *wrapperObfuscated2) Write(p []byte) (int, error) {
w.encryptor.XORKeyStream(buf, buf)
return w.parent.Write(buf)
return w.parent.Write(buf) // nolint: wrapcheck
}
func (w *wrapperObfuscated2) Conn() net.Conn {
@@ -80,7 +80,7 @@ func (w *wrapperObfuscated2) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperObfuscated2) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func NewObfuscated2(socket conntypes.StreamReadWriteCloser,
+5 -5
View File
@@ -24,25 +24,25 @@ type wrapperRewind struct {
}
func (w *wrapperRewind) Write(p []byte) (int, error) {
return w.parent.Write(p)
return w.parent.Write(p) // nolint: wrapcheck
}
func (w *wrapperRewind) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout)
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
}
func (w *wrapperRewind) Read(p []byte) (int, error) {
w.mutex.Lock()
defer w.mutex.Unlock()
return w.activeReader.Read(p)
return w.activeReader.Read(p) // nolint: wrapcheck
}
func (w *wrapperRewind) ReadTimeout(p []byte, _ time.Duration) (int, error) {
w.mutex.Lock()
defer w.mutex.Unlock()
return w.activeReader.Read(p)
return w.activeReader.Read(p) // nolint: wrapcheck
}
func (w *wrapperRewind) Conn() net.Conn {
@@ -64,7 +64,7 @@ func (w *wrapperRewind) RemoteAddr() *net.TCPAddr {
func (w *wrapperRewind) Close() error {
w.buf.Reset()
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperRewind) Rewind() {
+4 -4
View File
@@ -17,19 +17,19 @@ type wrapperTelegramStats struct {
}
func (w *wrapperTelegramStats) Write(p []byte) (int, error) {
return w.parent.Write(p)
return w.parent.Write(p) // nolint: wrapcheck
}
func (w *wrapperTelegramStats) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout)
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
}
func (w *wrapperTelegramStats) Read(p []byte) (int, error) {
return w.parent.Read(p)
return w.parent.Read(p) // nolint: wrapcheck
}
func (w *wrapperTelegramStats) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.ReadTimeout(p, timeout)
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
}
func (w *wrapperTelegramStats) Conn() net.Conn {
+1 -1
View File
@@ -58,7 +58,7 @@ func (w *wrapperTrafficStats) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperTrafficStats) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func NewTrafficStats(parent conntypes.StreamReadWriteCloser) conntypes.StreamReadWriteCloser {
+5 -5
View File
@@ -18,23 +18,23 @@ type wrapperTimeout struct {
}
func (w *wrapperTimeout) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout)
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
}
func (w *wrapperTimeout) Write(p []byte) (int, error) {
return w.parent.WriteTimeout(p, timeoutWrite)
return w.parent.WriteTimeout(p, timeoutWrite) // nolint: wrapcheck
}
func (w *wrapperTimeout) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.ReadTimeout(p, timeout)
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
}
func (w *wrapperTimeout) Read(p []byte) (int, error) {
return w.parent.ReadTimeout(p, timeoutRead)
return w.parent.ReadTimeout(p, timeoutRead) // nolint: wrapcheck
}
func (w *wrapperTimeout) Close() error {
return w.parent.Close()
return w.parent.Close() // nolint: wrapcheck
}
func (w *wrapperTimeout) Conn() net.Conn {