Address code review.

License: MIT
Signed-off-by: Kevin Atkinson <[email protected]>

Author: kevina

core/commands/cid.go

@@ -6,6 +6,8 @@ import (
 	"sort"
 	"strings"
 	"unicode"
+	
+	"github.com/ipfs/go-ipfs/core/commands/e"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	cmds "gx/ipfs/QmPXR4tNdLbp8HsZiPMjpsgqphX9Vhw2J6Jh5MKH2ovW3D/go-ipfs-cmds"
@@ -66,7 +68,7 @@ The optional format string is a printf style format string:
 		case "1":
 			opts.verConv = toCidV1
 		default:
-			return fmt.Errorf("invalid cid version: %s\n", verStr)
+			return fmt.Errorf("invalid cid version: %s", verStr)
 		}
 
 		if baseStr != "" {
@@ -82,7 +84,7 @@ The optional format string is a printf style format string:
 		return emitCids(req, resp, opts)
 	},
 	PostRun: cmds.PostRunMap{
-		cmds.CLI: streamRes(func(v interface{}, out io.Writer) nonFatalError {
+		cmds.CLI: streamResults(func(v interface{}, out io.Writer) nonFatalError {
 			r := v.(*CidFormatRes)
 			if r.ErrorMsg != "" {
 				return nonFatalError(fmt.Sprintf("%s: %s", r.CidStr, r.ErrorMsg))
@@ -230,7 +232,10 @@ var basesCmd = &cmds.Command{
 		cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, val0 interface{}) error {
 			prefixes, _ := req.Options["prefix"].(bool)
 			numeric, _ := req.Options["numeric"].(bool)
-			val := val0.([]CodeAndName)
+			val, ok := val0.([]CodeAndName)
+			if !ok {
+				return e.TypeErr(val, val0)
+			}
 			sort.Sort(multibaseSorter{val})
 			for _, v := range val {
 				code := v.Code
@@ -274,7 +279,10 @@ var codecsCmd = &cmds.Command{
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, val0 interface{}) error {
 			numeric, _ := req.Options["numeric"].(bool)
-			val := val0.([]CodeAndName)
+			val, ok := val0.([]CodeAndName)
+			if !ok {
+				return e.TypeErr(val, val0)
+			}
 			sort.Sort(codeAndNameSorter{val})
 			for _, v := range val {
 				if numeric {

core/commands/commands.go

@@ -153,10 +153,10 @@ func unwrapOutput(i interface{}) (interface{}, error) {
 
 type nonFatalError string
 
-// streamRes is a helper function to stream results, that possibly
-// contain with non-fatal, the helper function is allowed to panic on
-// internal errors
-func streamRes(procVal func(interface{}, io.Writer) nonFatalError) func(cmds.Response, cmds.ResponseEmitter) error {
+// streamResults is a helper function to stream results that possibly
+// contain non-fatal errors.  The helper function is allowed to panic
+// on internal errors.
+func streamResults(procVal func(interface{}, io.Writer) nonFatalError) func(cmds.Response, cmds.ResponseEmitter) error {
 	return func(res cmds.Response, re cmds.ResponseEmitter) (err error) {
 		defer func() {
 			if r := recover(); r != nil {

core/commands/filestore.go

@@ -72,7 +72,7 @@ The output is:
 		return res.Emit(out)
 	},
 	PostRun: cmds.PostRunMap{
-		cmds.CLI: streamRes(func(v interface{}, out io.Writer) nonFatalError {
+		cmds.CLI: streamResults(func(v interface{}, out io.Writer) nonFatalError {
 			r := v.(*filestore.ListRes)
 			if r.ErrorMsg != "" {
 				return nonFatalError(r.ErrorMsg)