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: method/eventName -> overloadedMethodName

Browse source
This commit is contained in:
Marius van der Wijden 2020-04-17 11:30:00 +02:00
parent 536f669215
commit d16edaabba
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
accounts/abi/abi.go
View file

@ -141,7 +141,7 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
case "constructor": case "constructor":
abi.Constructor = NewMethod("", "", Constructor, field.StateMutability, field.Constant, field.Payable, field.Inputs, nil) abi.Constructor = NewMethod("", "", Constructor, field.StateMutability, field.Constant, field.Payable, field.Inputs, nil)
case "function": case "function":
name := abi.methodName(field.Name) name := abi.overloadedMethodName(field.Name)
abi.Methods[name] = NewMethod(name, field.Name, Function, field.StateMutability, field.Constant, field.Payable, field.Inputs, field.Outputs) abi.Methods[name] = NewMethod(name, field.Name, Function, field.StateMutability, field.Constant, field.Payable, field.Inputs, field.Outputs)
case "fallback": case "fallback":
// New introduced function type in v0.6.0, check more detail // New introduced function type in v0.6.0, check more detail
@ -161,7 +161,7 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
} }
abi.Receive = NewMethod("", "", Receive, field.StateMutability, field.Constant, field.Payable, nil, nil) abi.Receive = NewMethod("", "", Receive, field.StateMutability, field.Constant, field.Payable, nil, nil)
case "event": case "event":
name := abi.eventName(field.Name) name := abi.overloadedEventName(field.Name)
abi.Events[name] = NewEvent(name, field.Name, field.Anonymous, field.Inputs) abi.Events[name] = NewEvent(name, field.Name, field.Anonymous, field.Inputs)
default: default:
return fmt.Errorf("abi: could not recognize type %v of field %v", field.Type, field.Name) return fmt.Errorf("abi: could not recognize type %v of field %v", field.Type, field.Name)
@ -170,12 +170,12 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
return nil return nil
} }
// methodName returns the next available name for a given function. // overloadedMethodName returns the next available name for a given function.
// Needed since solidity allows for function overload. // Needed since solidity allows for function overload.
// //
// e.g. if the abi contains Methods send, send1 // e.g. if the abi contains Methods send, send1
// methodName would return send2 for input send. // overloadedMethodName would return send2 for input send.
func (abi *ABI) methodName(rawName string) string { func (abi *ABI) overloadedMethodName(rawName string) string {
name := rawName name := rawName
_, ok := abi.Methods[name] _, ok := abi.Methods[name]
for idx := 0; ok; idx++ { for idx := 0; ok; idx++ {
@ -185,12 +185,12 @@ func (abi *ABI) methodName(rawName string) string {
return name return name
} }
// eventName returns the next available name for a given event. // overloadedEventName returns the next available name for a given event.
// Needed since solidity allows for event overload. // Needed since solidity allows for event overload.
// //
// e.g. if the abi contains events received, received1 // e.g. if the abi contains events received, received1
// eventName would return received2 for input received. // overloadedEventName would return received2 for input received.
func (abi *ABI) eventName(rawName string) string { func (abi *ABI) overloadedEventName(rawName string) string {
name := rawName name := rawName
_, ok := abi.Events[name] _, ok := abi.Events[name]
for idx := 0; ok; idx++ { for idx := 0; ok; idx++ {