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 1

rlp: using slices.IndexFunc

Browse source
This commit is contained in:
cuiweixie 2024-04-01 10:36:25 +08:00
parent a3829178af
commit 1da6a6bbbb
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rlp/encode.go
View file

@ -22,6 +22,7 @@ import (
"io" "io"
"math/big" "math/big"
"reflect" "reflect"
"slices"
"github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct"
"github.com/holiman/uint256" "github.com/holiman/uint256"
@ -351,7 +352,10 @@ func makeStructWriter(typ reflect.Type) (writer, error) {
} }
var writer writer var writer writer
firstOptionalField := firstOptionalField(fields) firstOptionalField := slices.IndexFunc(fields, func(f field) bool { return f.optional })
if firstOptionalField == -1 {
firstOptionalField = len(fields)
}
if firstOptionalField == len(fields) { if firstOptionalField == len(fields) {
// This is the writer function for structs without any optional fields. // This is the writer function for structs without any optional fields.
writer = func(val reflect.Value, w *encBuffer) error { writer = func(val reflect.Value, w *encBuffer) error {

10
rlp/typecache.go
View file

@ -159,16 +159,6 @@ func structFields(typ reflect.Type) (fields []field, err error) {
return fields, nil return fields, nil
} }
// firstOptionalField returns the index of the first field with "optional" tag.
func firstOptionalField(fields []field) int {
for i, f := range fields {
if f.optional {
return i
}
}
return len(fields)
}
type structFieldError struct { type structFieldError struct {
typ reflect.Type typ reflect.Type
field int field int