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

accounts/abi: fix singleUnpack for mobile

Browse source 
until now calling a contract function with a single result failed
this commit fixes #15387 #14832
This commit is contained in:
Oren Zakay 2017-10-30 14:53:27 +02:00
parent dd8a62683e
commit f31713c1df
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
accounts/abi/event.go
View file

@ -130,7 +130,18 @@ func (e Event) singleUnpack(v interface{}, output []byte) error {
if err != nil { if err != nil {
return err return err
} }
if err := set(value, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
// if we reach this part, there is only one output member from the contract event.
// for mobile, the result type is always a slice.
var firstValue reflect.Value
if reflect.Slice == value.Kind() {
// take the first element
firstValue = value.Index(0).Elem()
} else {
firstValue = value
}
if err := set(firstValue, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
return err return err
} }
return nil return nil

13
accounts/abi/method.go
View file

@ -150,7 +150,18 @@ func (method Method) singleUnpack(v interface{}, output []byte) error {
if err != nil { if err != nil {
return err return err
} }
if err := set(value, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
// if we reach this part, there is only one output member from the contract method.
// for mobile, the result type is always a slice.
var firstValue reflect.Value
if reflect.Slice == value.Kind() {
// take the first element
firstValue = value.Index(0).Elem()
} else {
firstValue = value
}
if err := set(firstValue, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
return err return err
} }
return nil return nil