tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eth/filters: improve error message for invalid filter topics (#17234)

Browse Source
This commit is contained in:
Ian Macalinao 2018-07-24 06:12:49 -07:00 committed by Felix Lange
parent 62467e4405
commit d96ba77113
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eth/filters/api.go
View File

@ -564,7 +564,7 @@ func (args *FilterCriteria) UnmarshalJSON(data []byte) error {
func decodeAddress(s string) (common.Address, error) { func decodeAddress(s string) (common.Address, error) {
b, err := hexutil.Decode(s) b, err := hexutil.Decode(s)
if err == nil && len(b) != common.AddressLength { if err == nil && len(b) != common.AddressLength {
err = fmt.Errorf("hex has invalid length %d after decoding", len(b)) err = fmt.Errorf("hex has invalid length %d after decoding; expected %d for address", len(b), common.AddressLength)
} }
return common.BytesToAddress(b), err return common.BytesToAddress(b), err
} }
@ -572,7 +572,7 @@ func decodeAddress(s string) (common.Address, error) {
func decodeTopic(s string) (common.Hash, error) { func decodeTopic(s string) (common.Hash, error) {
b, err := hexutil.Decode(s) b, err := hexutil.Decode(s)
if err == nil && len(b) != common.HashLength { if err == nil && len(b) != common.HashLength {
err = fmt.Errorf("hex has invalid length %d after decoding", len(b)) err = fmt.Errorf("hex has invalid length %d after decoding; expected %d for topic", len(b), common.HashLength)
} }
return common.BytesToHash(b), err return common.BytesToHash(b), err
} }