fix gocritic issues

This commit is contained in:
Anton Kaliaev 2019-08-02 11:08:26 +04:00
parent 1904e777f7
commit a11fd8c67b
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
2 changed files with 8 additions and 6 deletions

View File

@ -241,12 +241,13 @@ func makeHTTPDialer(remoteAddr string) (string, string, func(string, string) (ne
parts := strings.SplitN(remoteAddr, "://", 2)
var protocol, address string
if len(parts) == 1 {
switch len(parts) {
case 1:
// default to tcp if nothing specified
protocol, address = protoTCP, remoteAddr
} else if len(parts) == 2 {
case 2:
protocol, address = parts[0], parts[1]
} else {
default:
// return a invalid message
msg := fmt.Sprintf("Invalid addr: %s", remoteAddr)
return clientProtocol, msg, func(_ string, _ string) (net.Conn, error) {

View File

@ -107,13 +107,14 @@ func jsonStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Val
func nonJSONStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error, bool) {
if rt.Kind() == reflect.Ptr {
rv_, err, ok := nonJSONStringToArg(cdc, rt.Elem(), arg)
if err != nil {
switch {
case err != nil:
return reflect.Value{}, err, false
} else if ok {
case ok:
rv := reflect.New(rt.Elem())
rv.Elem().Set(rv_)
return rv, nil, true
} else {
default:
return reflect.Value{}, nil, false
}
} else {