diff options
Diffstat (limited to 'accounts/abi/method.go')
| -rw-r--r-- | accounts/abi/method.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 66e8751f3..ee79b51cb 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -101,7 +101,11 @@ func (method Method) tupleUnpack(v interface{}, output []byte) error { var ( value = valueOf.Elem() typ = value.Type() + kind = value.Kind() ) + if err := requireUnpackKind(value, typ, kind, method.Outputs, false); err != nil { + return err + } j := 0 for i := 0; i < len(method.Outputs); i++ { @@ -117,7 +121,7 @@ func (method Method) tupleUnpack(v interface{}, output []byte) error { } reflectValue := reflect.ValueOf(marshalledValue) - switch value.Kind() { + switch kind { case reflect.Struct: for j := 0; j < typ.NumField(); j++ { field := typ.Field(j) @@ -129,19 +133,13 @@ func (method Method) tupleUnpack(v interface{}, output []byte) error { } } case reflect.Slice, reflect.Array: - if value.Len() < i { - return fmt.Errorf("abi: insufficient number of arguments for unpack, want %d, got %d", len(method.Outputs), value.Len()) - } v := value.Index(i) - if v.Kind() != reflect.Ptr && v.Kind() != reflect.Interface { - return fmt.Errorf("abi: cannot unmarshal %v in to %v", v.Type(), reflectValue.Type()) + if err := requireAssignable(v, reflectValue); err != nil { + return err } - reflectValue := reflect.ValueOf(marshalledValue) if err := set(v.Elem(), reflectValue, method.Outputs[i]); err != nil { return err } - default: - return fmt.Errorf("abi: cannot unmarshal tuple in to %v", typ) } } return nil |