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: refactor to pass tests

Browse source
This commit is contained in:
Oren Zakay 2017-11-12 09:59:35 +02:00
parent f31713c1df
commit cf40142f31
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
accounts/abi/event.go
View file

@ -133,15 +133,14 @@ func (e Event) singleUnpack(v interface{}, output []byte) error {
// 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 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(firstValue, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
if err := set(value, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
return err
}
return nil

13
accounts/abi/method.go
View file

@ -153,15 +153,14 @@ func (method Method) singleUnpack(v interface{}, output []byte) error {
// 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 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(firstValue, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
if err := set(value, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
return err
}
return nil