diff --git a/Gopkg.toml b/Gopkg.toml index 552388d..16a6ef2 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -30,8 +30,8 @@ version = "1.1.0" [[constraint]] - branch = "master" name = "github.com/go-errors/errors" + version = "1.0.0" [[constraint]] branch = "master" diff --git a/errors/Gopkg.lock b/errors/Gopkg.lock deleted file mode 100644 index 07b0186..0000000 --- a/errors/Gopkg.lock +++ /dev/null @@ -1,15 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "github.com/go-errors/errors" - packages = ["."] - revision = "3afebba5a48dbc89b574d890b6b34d9ee10b4785" - version = "v1.0.0" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "cdb8112723180cdbe98df0e74827b04930f26759f6c08fe39066835774c18175" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/errors/Gopkg.toml b/errors/Gopkg.toml deleted file mode 100644 index 5dc9c30..0000000 --- a/errors/Gopkg.toml +++ /dev/null @@ -1,3 +0,0 @@ -[[constraint]] - name = "github.com/go-errors/errors" - version = "1.0.0" diff --git a/lbrycrd/client.go b/lbrycrd/client.go index 4564810..a46e57c 100644 --- a/lbrycrd/client.go +++ b/lbrycrd/client.go @@ -1,16 +1,16 @@ package lbrycrd import ( - e "errors" "net/url" "os" "strconv" + "github.com/lbryio/lbry.go/errors" + "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" - "github.com/go-errors/errors" "github.com/go-ini/ini" ) @@ -42,11 +42,11 @@ func New(lbrycrdURL string) (*Client, error) { u, err := url.Parse(lbrycrdURL) if err != nil { - return nil, errors.Wrap(err, 0) + return nil, errors.Err(err) } if u.User == nil { - return nil, errors.New("no userinfo") + return nil, errors.Err("no userinfo") } password, _ := u.User.Password() @@ -61,13 +61,13 @@ func New(lbrycrdURL string) (*Client, error) { // Notice the notification parameter is nil since notifications are not supported in HTTP POST mode. client, err := btcrpcclient.New(connCfg, nil) if err != nil { - return nil, errors.Wrap(err, 0) + return nil, errors.Err(err) } // make sure lbrycrd is running and responsive _, err = client.GetInfo() if err != nil { - return nil, errors.Wrap(err, 0) + return nil, errors.Err(err) } return &Client{client}, nil @@ -81,26 +81,26 @@ func NewWithDefaultURL() (*Client, error) { return New(url) } -var errInsufficientFunds = e.New("insufficient funds") +var errInsufficientFunds = errors.Base("insufficient funds") // SimpleSend is a convenience function to send credits to an address (0 min confirmations) func (c *Client) SimpleSend(toAddress string, amount float64) (*chainhash.Hash, error) { decodedAddress, err := btcutil.DecodeAddress(toAddress, &MainNetParams) if err != nil { - return nil, errors.Wrap(err, 0) + return nil, errors.Err(err) } lbcAmount, err := btcutil.NewAmount(amount) if err != nil { - return nil, errors.Wrap(err, 0) + return nil, errors.Err(err) } hash, err := c.Client.SendFromMinConf("", decodedAddress, lbcAmount, 0) if err != nil { if err.Error() == "-6: Insufficient funds" { - err = errors.Wrap(errInsufficientFunds, 0) + err = errors.Err(errInsufficientFunds) } - return nil, err + return nil, errors.Err(err) } return hash, nil } @@ -131,22 +131,22 @@ func (c *Client) SimpleSend(toAddress string, amount float64) (*chainhash.Hash, func getLbrycrdURLFromConfFile() (string, error) { if os.Getenv("HOME") == "" { - return "", errors.New("no $HOME var found") + return "", errors.Err("no $HOME var found") } defaultConfFile := os.Getenv("HOME") + "/.lbrycrd/lbrycrd.conf" if _, err := os.Stat(defaultConfFile); os.IsNotExist(err) { - return "", errors.New("default lbrycrd conf file not found") + return "", errors.Err("default lbrycrd conf file not found") } cfg, err := ini.Load(defaultConfFile) if err != nil { - return "", errors.Wrap(err, 0) + return "", errors.Err(err) } section, err := cfg.GetSection("") if err != nil { - return "", errors.Wrap(err, 0) + return "", errors.Err(err) } username := section.Key("rpcuser").String()