accounts/abi: add ErrorById #27277
accounts/abi: add ErrorById #27277
Conversation
accounts/abi/abi.go
Outdated
| return nil, fmt.Errorf("data too short (%d bytes) for abi error lookup", len(sigdata)) | ||
| } | ||
| for _, errABI := range abi.Errors { | ||
| if bytes.Equal(errABI.ID, sigdata[:4]) { |
There was a problem hiding this comment.
I wonder why you changed the ID field to []byte. Might be better to:
- change the type of the
sigdataparameter to[4]byte - do the check like
bytes.Equal(errABI.ID[:4], sigdata[:])
There was a problem hiding this comment.
I implement it in the same way as MethodById did. I'll modify it if [4]byte is better.
There was a problem hiding this comment.
In my opinion, []byte is better because I can use ErrorData as an input to find abi.Error.
|
Thanks all |
|
Please apply the requested changes! |
|
Done please review the changes |
accounts/abi/error.go
Outdated
| @@ -38,7 +37,7 @@ type Error struct { | |||
|
|
|||
| // ID returns the canonical representation of the error's signature used by the | |||
| // abi definition to identify event names and types. | |||
| ID common.Hash | |||
| ID [4]byte | |||
There was a problem hiding this comment.
You don't need to change the ID to make the function ErrorByID work.
There was a problem hiding this comment.
I changed ID back to common.Hash.
accounts/abi/abi.go
Outdated
| @@ -222,6 +222,17 @@ func (abi *ABI) EventByID(topic common.Hash) (*Event, error) { | |||
| return nil, fmt.Errorf("no event with id: %#x", topic.Hex()) | |||
| } | |||
|
|
|||
| // ErrorById looks up an error by the 4-byte id, | |||
| // returns nil if none found. | |||
| func (abi *ABI) ErrorById(sigdata [4]byte) (*Error, error) { | |||
There was a problem hiding this comment.
Please rename this method to ErrorByID
|
Please review the changes again. |
accounts/abi/abi_test.go
Outdated
| } | ||
| for name, m := range abi.Errors { | ||
| a := fmt.Sprintf("%v", &m) | ||
| id := *(*[4]byte)(m.ID[:4]) |
There was a problem hiding this comment.
I think you should do something like this:
var id [4]byte
copy(id[:], m.ID[:4])
Thanks for submitting this!
There was a problem hiding this comment.
Done! Thanks for review
Adds `ErrorById` lookup
This reverts commit c6b8a40.
This reverts commit c6b8a40.
Changes
common.Hashto[]bytein Error struct