From 50c8e8c7bccf13736b7704216c0241ed0bfaaac0 Mon Sep 17 00:00:00 2001
From: Sina Mahmoodi <itz.s1na@gmail.com>
Date: Mon, 13 Nov 2023 19:35:31 +0300
Subject: [PATCH 1/2] eth/tracers/js: fix isPush for push0

---
 core/asm/asm_test.go | 18 ++++++++++++++++++
 core/vm/opcodes.go   |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/asm/asm_test.go b/core/asm/asm_test.go
index 92b26b67a5ca..87240f35ade0 100644
--- a/core/asm/asm_test.go
+++ b/core/asm/asm_test.go
@@ -55,6 +55,24 @@ func TestInstructionIteratorInvalid(t *testing.T) {
 	}
 }
 
+// Tests disassembling the instructions for PUSH0
+func TestInstructionIteratorPUSH0(t *testing.T) {
+	cnt := 0
+	script, _ := hex.DecodeString("5900")
+
+	it := NewInstructionIterator(script)
+	for it.Next() {
+		cnt++
+	}
+
+	if err := it.Error(); err != nil {
+		t.Errorf("Expected 2, but encountered error %v instead.", err)
+	}
+	if cnt != 2 {
+		t.Errorf("Expected 2, but got %v instead.", cnt)
+	}
+}
+
 // Tests disassembling the instructions for empty evm code
 func TestInstructionIteratorEmpty(t *testing.T) {
 	cnt := 0
diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
index c7a3a163bea5..2b9231fe1af2 100644
--- a/core/vm/opcodes.go
+++ b/core/vm/opcodes.go
@@ -25,7 +25,7 @@ type OpCode byte
 
 // IsPush specifies if an opcode is a PUSH opcode.
 func (op OpCode) IsPush() bool {
-	return PUSH1 <= op && op <= PUSH32
+	return PUSH0 <= op && op <= PUSH32
 }
 
 // 0x0 range - arithmetic ops.

From e75773d6c85ee44950a36f7f25732f42790f7bf8 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 13 Nov 2023 20:03:08 +0100
Subject: [PATCH 2/2] core/asm: make test tabledriven

---
 core/asm/asm_test.go | 98 +++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 66 deletions(-)

diff --git a/core/asm/asm_test.go b/core/asm/asm_test.go
index 87240f35ade0..cd7520ec6394 100644
--- a/core/asm/asm_test.go
+++ b/core/asm/asm_test.go
@@ -22,71 +22,37 @@ import (
 	"encoding/hex"
 )
 
-// Tests disassembling the instructions for valid evm code
-func TestInstructionIteratorValid(t *testing.T) {
-	cnt := 0
-	script, _ := hex.DecodeString("61000000")
-
-	it := NewInstructionIterator(script)
-	for it.Next() {
-		cnt++
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("Expected 2, but encountered error %v instead.", err)
-	}
-	if cnt != 2 {
-		t.Errorf("Expected 2, but got %v instead.", cnt)
-	}
-}
-
-// Tests disassembling the instructions for invalid evm code
-func TestInstructionIteratorInvalid(t *testing.T) {
-	cnt := 0
-	script, _ := hex.DecodeString("6100")
-
-	it := NewInstructionIterator(script)
-	for it.Next() {
-		cnt++
-	}
-
-	if it.Error() == nil {
-		t.Errorf("Expected an error, but got %v instead.", cnt)
-	}
-}
-
-// Tests disassembling the instructions for PUSH0
-func TestInstructionIteratorPUSH0(t *testing.T) {
-	cnt := 0
-	script, _ := hex.DecodeString("5900")
-
-	it := NewInstructionIterator(script)
-	for it.Next() {
-		cnt++
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("Expected 2, but encountered error %v instead.", err)
-	}
-	if cnt != 2 {
-		t.Errorf("Expected 2, but got %v instead.", cnt)
-	}
-}
-
-// Tests disassembling the instructions for empty evm code
-func TestInstructionIteratorEmpty(t *testing.T) {
-	cnt := 0
-	script, _ := hex.DecodeString("")
-
-	it := NewInstructionIterator(script)
-	for it.Next() {
-		cnt++
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("Expected 0, but encountered error %v instead.", err)
-	}
-	if cnt != 0 {
-		t.Errorf("Expected 0, but got %v instead.", cnt)
+// Tests disassembling instructions
+func TestInstructionIterator(t *testing.T) {
+	for i, tc := range []struct {
+		want    int
+		code    string
+		wantErr string
+	}{
+		{2, "61000000", ""},                             // valid code
+		{0, "6100", "incomplete push instruction at 0"}, // invalid code
+		{2, "5900", ""},                                 // push0
+		{0, "", ""},                                     // empty
+
+	} {
+		var (
+			have    int
+			code, _ = hex.DecodeString(tc.code)
+			it      = NewInstructionIterator(code)
+		)
+		for it.Next() {
+			have++
+		}
+		var haveErr = ""
+		if it.Error() != nil {
+			haveErr = it.Error().Error()
+		}
+		if haveErr != tc.wantErr {
+			t.Errorf("test %d: encountered error: %q want %q", i, haveErr, tc.wantErr)
+			continue
+		}
+		if have != tc.want {
+			t.Errorf("wrong instruction count, have %d want %d", have, tc.want)
+		}
 	}
 }