From 100075574075436a2b1219ac12c52698a71d6e5a Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 29 May 2023 16:59:38 +0200
Subject: [PATCH] internal/era: simplify clauses

---
 internal/era/era.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/era/era.go b/internal/era/era.go
index 9859fb76ef..477f9eeb71 100644
--- a/internal/era/era.go
+++ b/internal/era/era.go
@@ -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,22 +64,21 @@ 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 {
-				// invalid era1 filename, skip
-				continue
-			}
-			if n[0] == network {
-				if epoch, err := strconv.ParseUint(n[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)
-				}
-				next += 1
-				eras = append(eras, entry.Name())
-			}
+		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 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)
+		}
+		next += 1
+		eras = append(eras, entry.Name())
 	}
 	return eras, nil
 }