gocritic (2/2) (#3864)

Refs #3262

rpc/lib/client/http_client.go

@@ -42,12 +42,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 {
+	case len(parts) == 1:
 		// default to tcp if nothing specified
 		protocol, address = protoTCP, remoteAddr
-	} else if len(parts) == 2 {
+	case len(parts) == 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) {

rpc/lib/server/handlers.go

@@ -339,13 +339,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 {