cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #86 from filecoin-project/feat/errors

Browse Source 
improve errors a bit
This commit is contained in:
Łukasz Magiera 2019-07-26 13:46:35 +02:00 committed by GitHub
commit 6ca033f313
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/cmd.go
View File

@ -9,6 +9,7 @@ import (
logging "github.com/ipfs/go-log"
manet "github.com/multiformats/go-multiaddr-net"
"golang.org/x/xerrors"
"gopkg.in/urfave/cli.v2"
"github.com/filecoin-project/go-lotus/api"
@ -34,7 +35,7 @@ func GetAPI(ctx *cli.Context) (api.FullNode, error) {
ma, err := r.APIEndpoint()
if err != nil {
return nil, err
return nil, xerrors.Errorf("failed to get api endpoint: %w", err)
}
_, addr, err := manet.DialArgs(ma)
if err != nil {

7
node/repo/fsrepo.go
View File

@ -18,7 +18,6 @@ import (
"github.com/mitchellh/go-homedir"
"github.com/multiformats/go-base32"
"github.com/multiformats/go-multiaddr"
"github.com/pkg/errors"
"golang.org/x/xerrors"
"github.com/filecoin-project/go-lotus/chain/types"
@ -37,7 +36,7 @@ const (
var log = logging.Logger("repo")
var ErrRepoExists = errors.New("repo exists")
var ErrRepoExists = xerrors.New("repo exists")
// FsRepo is struct for repo, use NewFS to create
type FsRepo struct {
@ -104,8 +103,8 @@ func (fsr *FsRepo) initKeystore() error {
// APIEndpoint returns endpoint of API in this repo
func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {
p := filepath.Join(fsr.path, fsAPI)
f, err := os.Open(p)
f, err := os.Open(p)
if os.IsNotExist(err) {
return nil, ErrNoAPIEndpoint
} else if err != nil {
@ -115,7 +114,7 @@ func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {
data, err := ioutil.ReadAll(f)
if err != nil {
return nil, err
return nil, xerrors.Errorf("failed to read %q: %w", p, err)
}
strma := string(data)
strma = strings.TrimSpace(strma)