merge master resolve conflicts

OffchainLabs · Jan 15, 2025 · fd83c05 · fd83c05
2 parents 85f63af + 9d65a2f
commit fd83c05
Show file tree

Hide file tree

Showing 15 changed files with 362 additions and 130 deletions.
diff --git a/arbitrator/Cargo.lock b/arbitrator/Cargo.lock
diff --git a/arbitrator/tools/wasmer b/arbitrator/tools/wasmer
diff --git a/arbitrator/wasm-libraries/Cargo.lock b/arbitrator/wasm-libraries/Cargo.lock
diff --git a/cmd/conf/init.go b/cmd/conf/init.go
@@ -3,6 +3,7 @@ package conf
 import (
 	"fmt"
 	"runtime"
+	"slices"
 	"strings"
 	"time"
 
@@ -106,7 +107,7 @@ func (c *InitConfig) Validate() error {
 	if c.Force && c.RecreateMissingStateFrom > 0 {
 		log.Warn("force init enabled, recreate-missing-state-from will have no effect")
 	}
-	if c.Latest != "" && !isAcceptedSnapshotKind(c.Latest) {
+	if c.Latest != "" && !slices.Contains(acceptedSnapshotKinds, c.Latest) {
 		return fmt.Errorf("invalid value for latest option: \"%s\" %s", c.Latest, acceptedSnapshotKindsStr)
 	}
 	if c.Prune != "" && c.PruneThreads <= 0 {
@@ -139,12 +140,3 @@ var (
 	acceptedSnapshotKinds    = []string{"archive", "pruned", "genesis"}
 	acceptedSnapshotKindsStr = "(accepted values: \"" + strings.Join(acceptedSnapshotKinds, "\" | \"") + "\")"
 )
-
-func isAcceptedSnapshotKind(kind string) bool {
-	for _, valid := range acceptedSnapshotKinds {
-		if kind == valid {
-			return true
-		}
-	}
-	return false
-}