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

improve errors a bit

Browse Source
This commit is contained in:
whyrusleeping 2019-07-25 20:26:29 -07:00
parent 6bc21a124f
commit 2facece1f6
2 changed files with 4 additions and 3 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" logging "github.com/ipfs/go-log"
manet "github.com/multiformats/go-multiaddr-net" manet "github.com/multiformats/go-multiaddr-net"
"github.com/pkg/errors"
"gopkg.in/urfave/cli.v2" "gopkg.in/urfave/cli.v2"
"github.com/filecoin-project/go-lotus/api" "github.com/filecoin-project/go-lotus/api"
@ -33,7 +34,7 @@ func GetAPI(ctx *cli.Context) (api.FullNode, error) {
ma, err := r.APIEndpoint() ma, err := r.APIEndpoint()
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to get api endpoint")
} }
_, addr, err := manet.DialArgs(ma) _, addr, err := manet.DialArgs(ma)
if err != nil { if err != nil {

4
node/repo/fsrepo.go
View File

@ -104,8 +104,8 @@ func (fsr *FsRepo) initKeystore() error {
// APIEndpoint returns endpoint of API in this repo // APIEndpoint returns endpoint of API in this repo
func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) { func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {
p := filepath.Join(fsr.path, fsAPI) p := filepath.Join(fsr.path, fsAPI)
f, err := os.Open(p)
f, err := os.Open(p)
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, ErrNoAPIEndpoint return nil, ErrNoAPIEndpoint
} else if err != nil { } else if err != nil {
@ -115,7 +115,7 @@ func (fsr *FsRepo) APIEndpoint() (multiaddr.Multiaddr, error) {
data, err := ioutil.ReadAll(f) data, err := ioutil.ReadAll(f)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to read %q", p)
} }
strma := string(data) strma := string(data)
strma = strings.TrimSpace(strma) strma = strings.TrimSpace(strma)