Errorf -> fmt.Errorf

This commit is contained in:
Jae Kwon
2015-04-15 21:49:14 -07:00
parent 58bcad3ea3
commit df1d46d04d
7 changed files with 20 additions and 25 deletions
+7 -8
View File
@@ -2,11 +2,10 @@ package rpc
import (
"encoding/hex"
"fmt"
"net/http"
"regexp"
"strconv"
. "github.com/tendermint/tendermint/common"
)
var (
@@ -44,7 +43,7 @@ func GetParamInt64(r *http.Request, param string) (int64, error) {
s := GetParam(r, param)
i, err := strconv.ParseInt(s, 10, 64)
if err != nil {
return 0, Errorf(param, err.Error())
return 0, fmt.Errorf(param, err.Error())
}
return i, nil
}
@@ -53,7 +52,7 @@ func GetParamInt32(r *http.Request, param string) (int32, error) {
s := GetParam(r, param)
i, err := strconv.ParseInt(s, 10, 32)
if err != nil {
return 0, Errorf(param, err.Error())
return 0, fmt.Errorf(param, err.Error())
}
return int32(i), nil
}
@@ -62,7 +61,7 @@ func GetParamUint64(r *http.Request, param string) (uint64, error) {
s := GetParam(r, param)
i, err := strconv.ParseUint(s, 10, 64)
if err != nil {
return 0, Errorf(param, err.Error())
return 0, fmt.Errorf(param, err.Error())
}
return i, nil
}
@@ -71,7 +70,7 @@ func GetParamUint(r *http.Request, param string) (uint, error) {
s := GetParam(r, param)
i, err := strconv.ParseUint(s, 10, 64)
if err != nil {
return 0, Errorf(param, err.Error())
return 0, fmt.Errorf(param, err.Error())
}
return uint(i), nil
}
@@ -79,7 +78,7 @@ func GetParamUint(r *http.Request, param string) (uint, error) {
func GetParamRegexp(r *http.Request, param string, re *regexp.Regexp) (string, error) {
s := GetParam(r, param)
if !re.MatchString(s) {
return "", Errorf(param, "Did not match regular expression %v", re.String())
return "", fmt.Errorf(param, "Did not match regular expression %v", re.String())
}
return s, nil
}
@@ -88,7 +87,7 @@ func GetParamFloat64(r *http.Request, param string) (float64, error) {
s := GetParam(r, param)
f, err := strconv.ParseFloat(s, 64)
if err != nil {
return 0, Errorf(param, err.Error())
return 0, fmt.Errorf(param, err.Error())
}
return f, nil
}