Browse Source

Remove pkg/errors; Update Gopkg.toml, but not GRPC because it breaks.

pull/1780/head
Jae Kwon 7 years ago
parent
commit
4e02184676
4 changed files with 5 additions and 10 deletions
  1. +2
    -2
      Gopkg.lock
  2. +0
    -4
      Gopkg.toml
  3. +1
    -2
      client/grpc_client.go
  4. +2
    -2
      client/socket_client.go

+ 2
- 2
Gopkg.lock View File

@ -137,7 +137,7 @@
"db", "db",
"log" "log"
] ]
revision = "26f2ab65f82cfc6873c312e8030104c47c05f10e"
revision = "9b9a9e7f8c73f6d0ae8672438a271f32060eebcb"
[[projects]] [[projects]]
name = "golang.org/x/net" name = "golang.org/x/net"
@ -204,6 +204,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "dfad1992e9c7f0df42ab62cadb7e984f5a945904400d844ae374b76d4b07f83e"
inputs-digest = "b334fca7ad79cda7d2248f0f67cc342dd3faa6125d44ba3a6936edb7140d1ef4"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

+ 0
- 4
Gopkg.toml View File

@ -29,10 +29,6 @@
name = "github.com/gogo/protobuf" name = "github.com/gogo/protobuf"
version = "1.0.0" version = "1.0.0"
[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"
[[constraint]] [[constraint]]
name = "github.com/spf13/cobra" name = "github.com/spf13/cobra"
version = "0.0.1" version = "0.0.1"


+ 1
- 2
client/grpc_client.go View File

@ -6,7 +6,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/pkg/errors"
context "golang.org/x/net/context" context "golang.org/x/net/context"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
@ -105,7 +104,7 @@ func (cli *grpcClient) StopForError(err error) {
func (cli *grpcClient) Error() error { func (cli *grpcClient) Error() error {
cli.mtx.Lock() cli.mtx.Lock()
defer cli.mtx.Unlock() defer cli.mtx.Unlock()
return errors.Wrap(cli.err, "grpc client error")
return cli.err
} }
// Set listener for all responses // Set listener for all responses


+ 2
- 2
client/socket_client.go View File

@ -3,13 +3,13 @@ package abcicli
import ( import (
"bufio" "bufio"
"container/list" "container/list"
"errors"
"fmt" "fmt"
"net" "net"
"reflect" "reflect"
"sync" "sync"
"time" "time"
"github.com/pkg/errors"
"github.com/tendermint/abci/types" "github.com/tendermint/abci/types"
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
) )
@ -111,7 +111,7 @@ func (cli *socketClient) StopForError(err error) {
func (cli *socketClient) Error() error { func (cli *socketClient) Error() error {
cli.mtx.Lock() cli.mtx.Lock()
defer cli.mtx.Unlock() defer cli.mtx.Unlock()
return errors.Wrap(cli.err, "socket client error")
return cli.err
} }
// Set listener for all responses // Set listener for all responses


Loading…
Cancel
Save