Remove juju/errors

This commit is contained in:
9seconds
2019-09-06 16:10:55 +03:00
parent 701f62ed4c
commit 2918ed11e5
19 changed files with 73 additions and 91 deletions
+5 -5
View File
@@ -4,10 +4,10 @@ import (
"context"
"crypto/rand"
"encoding/hex"
"fmt"
"net"
"time"
"github.com/juju/errors"
"go.uber.org/zap"
"github.com/9seconds/mtg/config"
@@ -47,12 +47,12 @@ func (w *wrapperConn) WriteTimeout(p []byte, timeout time.Duration) (int, error)
select {
case <-w.ctx.Done():
w.Close()
return 0, errors.Annotate(w.ctx.Err(), "Cannot write because context was closed")
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
if err := w.parent.SetWriteDeadline(time.Now().Add(timeout)); err != nil {
w.Close() // nolint: gosec
return 0, errors.Annotate(err, "Cannot set write deadline to the socket")
return 0, fmt.Errorf("cannot set write deadline to the socket: %w", err)
}
n, err := w.parent.Write(p)
@@ -73,12 +73,12 @@ func (w *wrapperConn) ReadTimeout(p []byte, timeout time.Duration) (int, error)
select {
case <-w.ctx.Done():
w.Close()
return 0, errors.Annotate(w.ctx.Err(), "Cannot read because context was closed")
return 0, fmt.Errorf("cannot read because context was closed: %w", w.ctx.Err())
default:
if err := w.parent.SetReadDeadline(time.Now().Add(timeout)); err != nil {
w.Close()
return 0, errors.Annotate(err, "Cannot set read deadline to the socket")
return 0, fmt.Errorf("cannot set read deadline to the socket: %w", err)
}
n, err := w.parent.Read(p)
+3 -3
View File
@@ -2,10 +2,10 @@ package wrappers
import (
"crypto/cipher"
"fmt"
"net"
"time"
"github.com/juju/errors"
"go.uber.org/zap"
)
@@ -18,7 +18,7 @@ type wrapperObfuscated2 struct {
func (w *wrapperObfuscated2) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
n, err := w.parent.ReadTimeout(p, timeout)
if err != nil {
return 0, errors.Annotate(err, "Cannot read stream ciphered data")
return 0, fmt.Errorf("cannot read stream ciphered data: %w", err)
}
w.decryptor.XORKeyStream(p, p[:n])
@@ -28,7 +28,7 @@ func (w *wrapperObfuscated2) ReadTimeout(p []byte, timeout time.Duration) (int,
func (w *wrapperObfuscated2) Read(p []byte) (int, error) {
n, err := w.parent.Read(p)
if err != nil {
return 0, errors.Annotate(err, "Cannot read stream ciphered data")
return n, err
}
w.decryptor.XORKeyStream(p, p[:n])