Merge pull request #1098 from ipfs/rm-debugerror

remove debugerrors

Author: jbenet

assets/contact.go

@@ -1,4 +1,5 @@
 package assets
+
 var Init_doc_contact = `Come hang out in our IRC chat room if you have any questions.
 
 Contact the ipfs dev team:

assets/help.go

@@ -1,4 +1,5 @@
 package assets
+
 var Init_doc_help = `Some helpful resources for finding your way around ipfs:
 
 - quick-start: a quick show of various ipfs features.

assets/quick-start.go

@@ -1,4 +1,5 @@
 package assets
+
 var Init_doc_quick_start = `# 0.1 - Quick Start
 
 This is a set of short examples with minmal explanation. It is meant as

assets/readme.go

@@ -1,4 +1,5 @@
 package assets
+
 var Init_doc_readme = `Hello and Welcome to IPFS!
 
 ██╗██████╗ ███████╗███████╗

assets/security-notes.go

@@ -1,4 +1,5 @@
 package assets
+
 var Init_doc_security_notes = `                    IPFS Alpha Security Notes
 
 We try hard to ensure our system is safe and robust, but all software

cmd/ipfs/daemon.go

@@ -14,7 +14,6 @@ import (
 	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 	util "github.com/ipfs/go-ipfs/util"
-	"github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 const (
@@ -56,7 +55,7 @@ in the network, use 0.0.0.0 as the ip address:
 
    ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/8080
 
-Be careful if you expose the API. It is a security risk, as anyone could use control 
+Be careful if you expose the API. It is a security risk, as anyone could use control
 your node remotely. If you need to control the node remotely, make sure to protect
 the port as you would other services or database (firewall, authenticated proxy, etc).`,
 	},
@@ -98,7 +97,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 		if !util.FileExists(req.Context().ConfigRoot) {
 			err := initWithDefaults(os.Stdout, req.Context().ConfigRoot)
 			if err != nil {
-				res.SetError(debugerror.Wrap(err), cmds.ErrNormal)
+				res.SetError(err, cmds.ErrNormal)
 				return
 			}
 		}
@@ -120,7 +119,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 	// sure we are permitted to access the resources (datastore, etc.)
 	repo, err := fsrepo.Open(req.Context().ConfigRoot)
 	if err != nil {
-		res.SetError(debugerror.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
+		res.SetError(fmt.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
 		return
 	}
 

cmd/ipfs/init.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 
@@ -15,7 +16,6 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
 	u "github.com/ipfs/go-ipfs/util"
-	debugerror "github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 const nBitsForKeypairDefault = 4096
@@ -65,14 +65,14 @@ var initCmd = &cmds.Command{
 	},
 }
 
-var errRepoExists = debugerror.New(`ipfs configuration file already exists!
+var errRepoExists = errors.New(`ipfs configuration file already exists!
 Reinitializing would overwrite your keys.
 (use -f to force overwrite)
 `)
 
 func initWithDefaults(out io.Writer, repoRoot string) error {
 	err := doInit(out, repoRoot, false, nBitsForKeypairDefault)
-	return debugerror.Wrap(err)
+	return err
 }
 
 func doInit(out io.Writer, repoRoot string, force bool, nBitsForKeypair int) error {

cmd/ipfs/main.go

@@ -26,7 +26,6 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 	u "github.com/ipfs/go-ipfs/util"
-	"github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 // log is the command logger
@@ -355,7 +354,7 @@ func commandDetails(path []string, root *cmds.Command) (*cmdDetails, error) {
 		var found bool
 		cmd, found = cmd.Subcommands[cmp]
 		if !found {
-			return nil, debugerror.Errorf("subcommand %s should be in root", cmp)
+			return nil, fmt.Errorf("subcommand %s should be in root", cmp)
 		}
 
 		if cmdDetails, found := cmdDetailsMap[cmd]; found {

core/commands/add.go

@@ -18,7 +18,6 @@ import (
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	ft "github.com/ipfs/go-ipfs/unixfs"
 	u "github.com/ipfs/go-ipfs/util"
-	"github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 // Error indicating the max depth has been exceded.
@@ -106,19 +105,19 @@ remains to be implemented.
 
 				rootnd, err := addFile(n, file, outChan, progress, wrap)
 				if err != nil {
-					res.SetError(debugerror.Wrap(err), cmds.ErrNormal)
+					res.SetError(err, cmds.ErrNormal)
 					return
 				}
 
 				err = n.Pinning.Pin(context.Background(), rootnd, true)
 				if err != nil {
-					res.SetError(debugerror.Wrap(err), cmds.ErrNormal)
+					res.SetError(err, cmds.ErrNormal)
 					return
 				}
 
 				err = n.Pinning.Flush()
 				if err != nil {
-					res.SetError(debugerror.Wrap(err), cmds.ErrNormal)
+					res.SetError(err, cmds.ErrNormal)
 					return
 				}
 			}

core/commands/bootstrap.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"bytes"
+	"errors"
 	"io"
 	"sort"
 
@@ -10,7 +11,6 @@ import (
 	config "github.com/ipfs/go-ipfs/repo/config"
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 	u "github.com/ipfs/go-ipfs/util"
-	errors "github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 type BootstrapOutput struct {