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: Fix method overwritten by same name methods.

Browse source
This commit is contained in:
sf 2018-06-28 20:51:29 +08:00 committed by Guillaume Ballet
parent f7cdea2bdc
commit 52a6ec8d40
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
accounts/abi/abi.go
View file

@ -21,6 +21,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"strconv"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
) )
@ -128,6 +129,7 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
abi.Methods = make(map[string]Method) abi.Methods = make(map[string]Method)
abi.Events = make(map[string]Event) abi.Events = make(map[string]Event)
functionCnt, eventCnt := 0, 0
for _, field := range fields { for _, field := range fields {
switch field.Type { switch field.Type {
case "constructor": case "constructor":
@ -142,12 +144,16 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
Inputs: field.Inputs, Inputs: field.Inputs,
Outputs: field.Outputs, Outputs: field.Outputs,
} }
abi.Methods[field.Name+strconv.Itoa(functionCnt)] = abi.Methods[field.Name]
functionCnt++
case "event": case "event":
abi.Events[field.Name] = Event{ abi.Events[field.Name] = Event{
Name: field.Name, Name: field.Name,
Anonymous: field.Anonymous, Anonymous: field.Anonymous,
Inputs: field.Inputs, Inputs: field.Inputs,
} }
abi.Events[field.Name+strconv.Itoa(eventCnt)] = abi.Events[field.Name]
eventCnt++
} }
} }