Skip to content

Commit 1db58ba

Browse files
author
Evgeniy Ivakha
committed
Removed using github.com/pkg/errors
1 parent d4225a9 commit 1db58ba

4 files changed

Lines changed: 14 additions & 15 deletions

File tree

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ before_install:
99

1010
install:
1111
- go get golang.org/x/net/websocket
12-
- go get github.com/pkg/errors
1312
- go get github.com/getblank/uuid
1413

1514
script:

client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package wango
22

33
import (
4+
"errors"
45
"strconv"
56

6-
"github.com/pkg/errors"
77
"golang.org/x/net/websocket"
88
)
99

1010
func (c *Conn) receiveWelcome() error {
1111
var data []byte
1212
err := websocket.Message.Receive(c.connection, &data)
1313
if err != nil {
14-
return errors.Wrap(err, "Can't receive welcome message")
14+
return err
1515
}
1616
msgType, msg, err := parseMessage(data)
1717
if err != nil {
18-
return errors.Wrap(err, "Parsing welcome message")
18+
return err
1919
}
2020
if msgType != msgWelcome {
2121
if typeString, ok := msgIntTypes[msgType]; ok {

parser.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package wango
22

33
import (
44
"encoding/json"
5-
6-
"github.com/pkg/errors"
5+
"errors"
6+
"fmt"
77
)
88

99
func parseMessage(_msg []byte) (int, []interface{}, error) {
1010
var msg []interface{}
1111
err := json.Unmarshal(_msg, &msg)
1212
if err != nil {
13-
return 0, nil, errors.Wrap(err, "when unmarshaling wamp message")
13+
return 0, nil, err
1414
}
1515
if len(msg) < 1 {
1616
return 0, nil, errors.New("invalid wamp message")
@@ -21,20 +21,20 @@ func parseMessage(_msg []byte) (int, []interface{}, error) {
2121
if strCallType, ok := msg[0].(string); ok {
2222
callType, ok := msgTxtTypes[strCallType]
2323
if !ok {
24-
return 0, nil, errors.Errorf("unknown call type: %s", strCallType)
24+
return 0, nil, fmt.Errorf("unknown call type: %s", strCallType)
2525
}
2626
return callType, msg, nil
2727
}
2828
return 0, nil, errors.New("unknown call type")
2929
}
3030

31-
func parseWampMessage(typ int, msg []interface{}) (*wampMsg, error) {
31+
func parseWampMessage(typ int, msg []interface{}) (*wampUnmarshaledMsg, error) {
3232
if typ == msgCall && len(msg) < 3 {
3333
return nil, errors.New("invalid wamp message")
3434
} else if len(msg) < 2 {
3535
return nil, errors.New("invalid wamp message")
3636
}
37-
message := new(wampMsg)
37+
message := new(wampUnmarshaledMsg)
3838
switch typ {
3939
case msgCall:
4040
if msg[1] == nil {

wamp.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package wango
22

33
import (
4+
"errors"
45
"io"
56
"regexp"
67
"strings"
78
"sync"
89
"time"
910

10-
"github.com/pkg/errors"
1111
"golang.org/x/net/websocket"
1212
)
1313

@@ -60,7 +60,7 @@ func Connect(url, origin string, timeout ...time.Duration) (*Wango, error) {
6060
}
6161
ws, err := websocket.Dial(url, "wamp", origin)
6262
if err != nil {
63-
return nil, errors.Wrap(err, "Can't connect to "+url)
63+
return nil, err
6464
}
6565
w := New()
6666
c := w.addConnection(ws, nil)
@@ -224,14 +224,14 @@ func (w *Wango) RegisterRPCHandler(_uri interface{}, fn func(c *Conn, uri string
224224
case string:
225225
uri := _uri.(string)
226226
if _, ok := w.rpcHandlers[uri]; ok {
227-
return errors.Wrap(errHandlerAlreadyRegistered, "when registering string rpcHandler")
227+
return errHandlerAlreadyRegistered
228228
}
229229
w.rpcHandlers[uri] = fn
230230
case *regexp.Regexp:
231231
rgx := _uri.(*regexp.Regexp)
232232
for k := range w.rpcRgxHandlers {
233233
if k.String() == rgx.String() {
234-
return errors.Wrap(errHandlerAlreadyRegistered, "when registering rgx rpcHandler")
234+
return errHandlerAlreadyRegistered
235235
}
236236
}
237237
w.rpcRgxHandlers[rgx] = fn
@@ -248,7 +248,7 @@ func (w *Wango) RegisterRPCHandler(_uri interface{}, fn func(c *Conn, uri string
248248
// then to connection will send data from second argument.
249249
func (w *Wango) RegisterSubHandler(uri string, fnSub func(c *Conn, uri string, args ...interface{}) (interface{}, error), fnUnsub func(c *Conn, uri string, args ...interface{}) (interface{}, error), fnPub func(uri string, event interface{}, extra interface{}) (bool, interface{})) error {
250250
if _, ok := w.subHandlers[uri]; ok {
251-
return errors.Wrap(errHandlerAlreadyRegistered, "when registering subHandler")
251+
return errHandlerAlreadyRegistered
252252
}
253253

254254
w.subHandlers[uri] = subHandler{

0 commit comments

Comments
 (0)