forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 11:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/vm: 8024 tests should enforce explicit errors

Browse source
This commit is contained in:
jonny rhea 2026-02-07 16:18:55 -06:00
parent 7b7be249cb
commit ce35dc324d
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
core/vm/instructions_test.go
View file

@ -19,6 +19,7 @@ package vm
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"math/big" "math/big"
"os" "os"
@ -1015,7 +1016,7 @@ func TestEIP8024_Execution(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
codeHex string codeHex string
wantErr bool wantErr error
wantVals []uint64 wantVals []uint64
}{ }{
{ {
@ -1071,53 +1072,53 @@ func TestEIP8024_Execution(t *testing.T) {
{ {
name: "INVALID_SWAPN_LOW", name: "INVALID_SWAPN_LOW",
codeHex: "e75b", codeHex: "e75b",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "JUMP over INVALID_DUPN", name: "JUMP over INVALID_DUPN",
codeHex: "600456e65b", codeHex: "600456e65b",
wantErr: false, wantErr: nil,
}, },
// Additional test cases // Additional test cases
{ {
name: "INVALID_DUPN_LOW", name: "INVALID_DUPN_LOW",
codeHex: "e65b", codeHex: "e65b",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "INVALID_EXCHANGE_LOW", name: "INVALID_EXCHANGE_LOW",
codeHex: "e850", codeHex: "e850",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "INVALID_DUPN_HIGH", name: "INVALID_DUPN_HIGH",
codeHex: "e67f", codeHex: "e67f",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "INVALID_SWAPN_HIGH", name: "INVALID_SWAPN_HIGH",
codeHex: "e77f", codeHex: "e77f",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "INVALID_EXCHANGE_HIGH", name: "INVALID_EXCHANGE_HIGH",
codeHex: "e87f", codeHex: "e87f",
wantErr: true, wantErr: &ErrInvalidOpCode{},
}, },
{ {
name: "UNDERFLOW_DUPN", name: "UNDERFLOW_DUPN",
codeHex: "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5fe600", // (n=17, need 17 items, have 16) codeHex: "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5fe600", // (n=17, need 17 items, have 16)
wantErr: true, wantErr: &ErrStackUnderflow{},
}, },
{ {
name: "UNDERFLOW_SWAPN", name: "UNDERFLOW_SWAPN",
codeHex: "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5fe700", // (n=17, need 18 items, have 17) codeHex: "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5fe700", // (n=17, need 18 items, have 17)
wantErr: true, wantErr: &ErrStackUnderflow{},
}, },
{ {
name: "UNDERFLOW_EXCHANGE", name: "UNDERFLOW_EXCHANGE",
codeHex: "60016002e801", // (n,m)=(1,2), need 3 items, have 2 codeHex: "60016002e801", // (n,m)=(1,2), need 3 items, have 2
wantErr: true, wantErr: &ErrStackUnderflow{},
}, },
{ {
name: "PC_INCREMENT", name: "PC_INCREMENT",
@ -1149,6 +1150,8 @@ func TestEIP8024_Execution(t *testing.T) {
_, err = opJumpdest(&pc, evm, scope) _, err = opJumpdest(&pc, evm, scope)
case ISZERO: case ISZERO:
_, err = opIszero(&pc, evm, scope) _, err = opIszero(&pc, evm, scope)
case PUSH0:
_, err = opPush0(&pc, evm, scope)
case DUPN: case DUPN:
_, err = opDupN(&pc, evm, scope) _, err = opDupN(&pc, evm, scope)
case SWAPN: case SWAPN:
@ -1156,14 +1159,28 @@ func TestEIP8024_Execution(t *testing.T) {
case EXCHANGE: case EXCHANGE:
_, err = opExchange(&pc, evm, scope) _, err = opExchange(&pc, evm, scope)
default: default:
err = &ErrInvalidOpCode{opcode: OpCode(op)} t.Fatalf("unexpected opcode %s at pc=%d", OpCode(op), pc)
} }
pc++ pc++
} }
if tc.wantErr { if tc.wantErr != nil {
if err == nil { if err == nil {
t.Fatalf("expected error, got nil") t.Fatalf("expected error, got nil")
} }
switch tc.wantErr.(type) {
case *ErrInvalidOpCode:
var want *ErrInvalidOpCode
if !errors.As(err, &want) {
t.Fatalf("expected ErrInvalidOpCode, got %v", err)
}
case *ErrStackUnderflow:
var want *ErrStackUnderflow
if !errors.As(err, &want) {
t.Fatalf("expected ErrStackUnderflow, got %v", err)
}
default:
t.Fatalf("unsupported wantErr type %T", tc.wantErr)
}
return return
} }
if err != nil { if err != nil {