accounts/abi: add support for unpacking returned bytesN arrays (#15242)

This commit is contained in:
bas-vk
2018-12-22 11:26:49 +01:00
committed by Guillaume Ballet
parent 5e4fd8e7db
commit 7df52e324c
2 changed files with 64 additions and 0 deletions

View File

@ -77,6 +77,8 @@ func set(dst, src reflect.Value, output Argument) error {
switch {
case dstType.AssignableTo(srcType):
dst.Set(src)
case dstType.Kind() == reflect.Slice && srcType.Kind() == reflect.Slice:
return setSlice(dst, src, output)
case dstType.Kind() == reflect.Interface:
dst.Set(src)
case dstType.Kind() == reflect.Ptr:
@ -87,6 +89,19 @@ func set(dst, src reflect.Value, output Argument) error {
return nil
}
// setSlice attempts to assign src to dst when slices are not assignable by default
// e.g. src: [][]byte -> dst: [][15]byte
func setSlice(dst, src reflect.Value, output Argument) error {
slice := reflect.MakeSlice(dst.Type(), src.Len(), src.Len())
for i := 0; i < src.Len(); i++ {
v := src.Index(i)
reflect.Copy(slice.Index(i), v)
}
dst.Set(slice)
return nil
}
// requireAssignable assures that `dest` is a pointer and it's not an interface.
func requireAssignable(dst, src reflect.Value) error {
if dst.Kind() != reflect.Ptr && dst.Kind() != reflect.Interface {