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

internal/era: simplify clauses

Browse source
This commit is contained in:
Martin Holst Swende 2023-05-29 16:59:38 +02:00 committed by lightclient
parent 235d413c2f
commit 1000755740
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
internal/era/era.go
View file

@ -53,6 +53,7 @@ func Filename(network string, epoch int, root common.Hash) string {
}
// ReadDir reads all the era1 files in a directory for a given network.
// Format: <network>-<epoch>-<hexroot>.era1
func ReadDir(dir, network string) ([]string, error) {
entries, err := os.ReadDir(dir)
if err != nil {
@ -63,14 +64,15 @@ func ReadDir(dir, network string) ([]string, error) {
eras []string
)
for _, entry := range entries {
if path.Ext(entry.Name()) == ".era1" {
n := strings.Split(entry.Name(), "-")
if len(n) != 3 {
if path.Ext(entry.Name()) != ".era1" {
continue
}
parts := strings.Split(entry.Name(), "-")
if len(parts) != 3 || parts[0] != network {
// invalid era1 filename, skip
continue
}
if n[0] == network {
if epoch, err := strconv.ParseUint(n[1], 10, 64); err != nil {
if epoch, err := strconv.ParseUint(parts[1], 10, 64); err != nil {
return nil, fmt.Errorf("malformed era1 filename: %s", entry.Name())
} else if epoch != next {
return nil, fmt.Errorf("missing epoch %d", next)
@ -78,8 +80,6 @@ func ReadDir(dir, network string) ([]string, error) {
next += 1
eras = append(eras, entry.Name())
}
}
}
return eras, nil
}