forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/vm: rebase

Browse source
This commit is contained in:
Marius van der Wijden 2024-09-04 15:50:39 +02:00
parent 5d8df7b5a1
commit 6549a87202
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/vm/eips.go
View file

@ -846,7 +846,6 @@ func opRetf(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
return nil, errStopToken return nil, errStopToken
} }
return nil, nil return nil, nil
>>>>>>> 3532f16eb7 (core/vm: add eof container)
} }
func opJumpf(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { func opJumpf(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {

2
core/vm/validate_test.go
View file

@ -250,7 +250,7 @@ func TestValidateCode(t *testing.T) {
Data: make([]byte, 0), Data: make([]byte, 0),
ContainerSections: make([]*Container, 0), ContainerSections: make([]*Container, 0),
} }
_, err := validateCode(test.code, test.section, container, &pragueEOFInstructionSet, true) _, err := validateCode(test.code, test.section, container, &pragueEOFInstructionSet, false)
if !errors.Is(err, test.err) { if !errors.Is(err, test.err) {
t.Errorf("test %d (%s): unexpected error (want: %v, got: %v)", i, common.Bytes2Hex(test.code), test.err, err) t.Errorf("test %d (%s): unexpected error (want: %v, got: %v)", i, common.Bytes2Hex(test.code), test.err, err)
} }