From 71ffe6e6ddea1dcddcc4224e37e8372b4a539d20 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Fri, 6 Sep 2024 13:53:12 +0200
Subject: [PATCH] cmd/eofdump: simplify tests

---
 cmd/eofdump/eofparser.go  |  5 +++++
 cmd/eofdump/parse_test.go | 20 ++++----------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/cmd/eofdump/eofparser.go b/cmd/eofdump/eofparser.go
index af0e389ae8..483a730b08 100644
--- a/cmd/eofdump/eofparser.go
+++ b/cmd/eofdump/eofparser.go
@@ -211,6 +211,11 @@ func parseAndValidate(s string, isInitCode bool) (*vm.Container, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to decode data: %w", err)
 	}
+	return parse(b, isInitCode)
+}
+
+func parse(b []byte, isInitCode bool) (*vm.Container, error) {
+
 	var c vm.Container
 	if err := c.UnmarshalBinary(b, isInitCode); err != nil {
 		return nil, err
diff --git a/cmd/eofdump/parse_test.go b/cmd/eofdump/parse_test.go
index 6f19bb9775..7256d7ab4c 100644
--- a/cmd/eofdump/parse_test.go
+++ b/cmd/eofdump/parse_test.go
@@ -104,7 +104,10 @@ func testEofParse(t *testing.T, isInitCode bool, wantFile string) {
 			if err != nil {
 				panic(err) // rotten corpus
 			}
-			have := parse(b, isInitCode)
+			have := "OK"
+			if _, err := parse(b, isInitCode); err != nil {
+				have = fmt.Sprintf("ERR: %v", err)
+			}
 			if false { // Change this to generate the want-output
 				fmt.Printf("%v\n", have)
 			} else {
@@ -126,18 +129,3 @@ func testEofParse(t *testing.T, isInitCode bool, wantFile string) {
 		corpus.Close()
 	}
 }
-
-func parse(data []byte, isInitCode bool) string {
-	var (
-		jt  = vm.NewPragueEOFInstructionSetForTesting()
-		c   vm.Container
-		err = c.UnmarshalBinary(data, isInitCode)
-	)
-	if err == nil {
-		if err = c.ValidateCode(&jt, isInitCode); err == nil {
-			return "OK"
-		}
-		return fmt.Sprintf("ERR: %v", err)
-	}
-	return fmt.Sprintf("ERR: %v", err)
-}