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

signer/core/apitypes: use slices.Contains (#29474)

Browse Source
This commit is contained in:
Aaron Chen 2024-04-08 18:58:37 +08:00 committed by GitHub
parent 0dc09da7db
commit cfc7d06cc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log/handler.go
View File

@ -118,7 +118,7 @@ func JSONHandler(wr io.Writer) slog.Handler {
return JSONHandlerWithLevel(wr, levelMaxVerbosity)
}
// JSONHandler returns a handler which prints records in JSON format that are less than or equal to
// JSONHandlerWithLevel returns a handler which prints records in JSON format that are less than or equal to
// the specified verbosity level.
func JSONHandlerWithLevel(wr io.Writer, level slog.Level) slog.Handler {
return slog.NewJSONHandler(wr, &slog.HandlerOptions{

13
signer/core/apitypes/types.go
View File

@ -25,6 +25,7 @@ import (
"math/big"
"reflect"
"regexp"
"slices"
"sort"
"strconv"
"strings"
@ -386,16 +387,8 @@ func (typedData *TypedData) HashStruct(primaryType string, data TypedDataMessage
// Dependencies returns an array of custom types ordered by their hierarchical reference tree
func (typedData *TypedData) Dependencies(primaryType string, found []string) []string {
primaryType = strings.TrimSuffix(primaryType, "[]")
includes := func(arr []string, str string) bool {
for _, obj := range arr {
if obj == str {
return true
}
}
return false
}
if includes(found, primaryType) {
if slices.Contains(found, primaryType) {
return found
}
if typedData.Types[primaryType] == nil {
@ -404,7 +397,7 @@ func (typedData *TypedData) Dependencies(primaryType string, found []string) []s
found = append(found, primaryType)
for _, field := range typedData.Types[primaryType] {
for _, dep := range typedData.Dependencies(field.Type, found) {
if !includes(found, dep) {
if !slices.Contains(found, dep) {
found = append(found, dep)
}
}