cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

jsonrpc: Panic less in client

Browse Source
This commit is contained in:
Łukasz Magiera 2019-07-23 00:56:48 +02:00
parent 527ab7100a
commit 17c76abdb2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jsonrpc/client.go
View File

@ -59,11 +59,11 @@ type ClientCloser func()
func NewClient(addr string, namespace string, handler interface{}) (ClientCloser, error) { func NewClient(addr string, namespace string, handler interface{}) (ClientCloser, error) {
htyp := reflect.TypeOf(handler) htyp := reflect.TypeOf(handler)
if htyp.Kind() != reflect.Ptr { if htyp.Kind() != reflect.Ptr {
panic("expected handler to be a pointer") return nil, xerrors.New("expected handler to be a pointer")
} }
typ := htyp.Elem() typ := htyp.Elem()
if typ.Kind() != reflect.Struct { if typ.Kind() != reflect.Struct {
panic("handler should be a struct") return nil, xerrors.New("handler should be a struct")
} }
val := reflect.ValueOf(handler) val := reflect.ValueOf(handler)
@ -85,7 +85,7 @@ func NewClient(addr string, namespace string, handler interface{}) (ClientCloser
f := typ.Field(i) f := typ.Field(i)
ftyp := f.Type ftyp := f.Type
if ftyp.Kind() != reflect.Func { if ftyp.Kind() != reflect.Func {
panic("handler field not a func") return nil, xerrors.New("handler field not a func")
} }
valOut, errOut, nout := processFuncOut(ftyp) valOut, errOut, nout := processFuncOut(ftyp)