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

accounts/abi: removed comments

Browse source
This commit is contained in:
Marius van der Wijden 2020-05-07 19:00:11 +02:00
parent 532286efee
commit 7131ed54a9
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
accounts/abi/argument.go
View file

@ -101,14 +101,7 @@ func (arguments Arguments) Unpack(v interface{}, data []byte) error {
if arguments.isTuple() { if arguments.isTuple() {
return arguments.unpackTuple(v, marshalledValues) return arguments.unpackTuple(v, marshalledValues)
} }
/*
var result interface{}
fmt.Println(marshalledValues...)
for i, args := range arguments.NonIndexed() {
args.set(result, marshalledValues[i])
}
v = result
return nil*/
return arguments.unpackAtomic(v, marshalledValues[0]) return arguments.unpackAtomic(v, marshalledValues[0])
} }
@ -147,22 +140,18 @@ func (arguments Arguments) unpackAtomic(v interface{}, marshalledValues interfac
// unpackTuple unpacks ( hexdata -> go ) a batch of values. // unpackTuple unpacks ( hexdata -> go ) a batch of values.
func (arguments Arguments) unpackTuple(v interface{}, marshalledValues []interface{}) error { func (arguments Arguments) unpackTuple(v interface{}, marshalledValues []interface{}) error {
var ( value := reflect.ValueOf(v).Elem()
value = reflect.ValueOf(v).Elem()
typ = value.Type()
kind = value.Kind()
nonIndexedArgs = arguments.NonIndexed()
)
switch kind { switch value.Kind() {
case reflect.Struct: case reflect.Struct:
var abi2struct map[string]string nonIndexedArgs := arguments.NonIndexed()
argNames := make([]string, len(nonIndexedArgs)) argNames := make([]string, len(nonIndexedArgs))
for i, arg := range nonIndexedArgs { for i, arg := range nonIndexedArgs {
argNames[i] = arg.Name argNames[i] = arg.Name
} }
var err error var err error
if abi2struct, err = mapArgNamesToStructFields(argNames, value); err != nil { abi2struct, err := mapArgNamesToStructFields(argNames, value)
if err != nil {
return err return err
} }
for i, arg := range nonIndexedArgs { for i, arg := range nonIndexedArgs {
@ -185,7 +174,7 @@ func (arguments Arguments) unpackTuple(v interface{}, marshalledValues []interfa
} }
} }
default: default:
return fmt.Errorf("abi:[2] cannot unmarshal tuple in to %v", typ) return fmt.Errorf("abi:[2] cannot unmarshal tuple in to %v", value.Type())
} }
return nil return nil
} }