forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge cf40142f31 into 9dbb8ef4aa

Browse source
This commit is contained in:
Oren Zakay 2017-12-22 07:52:21 +00:00 committed by GitHub
commit 8edbda8399
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
accounts/abi/event.go
View file

@ -132,6 +132,16 @@ func (e Event) singleUnpack(v interface{}, output []byte) error {
if err != nil { if err != nil {
return err return err
} }
// if we reach this part, there is only one output member from the contract event.
// for mobile, the result type is always a slice.
if reflect.Slice == value.Kind() && value.Len() >= 1 {
//check if it's not a byte slice
if reflect.TypeOf([]byte{}) != value.Type() {
value = value.Index(0).Elem()
}
}
if err := set(value, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil { if err := set(value, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
return err return err
} }

10
accounts/abi/method.go
View file

@ -162,6 +162,16 @@ func (method Method) singleUnpack(v interface{}, output []byte) error {
if err != nil { if err != nil {
return err return err
} }
// if we reach this part, there is only one output member from the contract method.
// for mobile, the result type is always a slice.
if reflect.Slice == value.Kind() && value.Len() >= 1 {
//check if it's not a byte slice
if reflect.TypeOf([]byte{}) != value.Type() {
value = value.Index(0).Elem()
}
}
if err := set(value, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil { if err := set(value, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
return err return err
} }