Skip to content

Commit

Permalink
tests: only activate merge on london rules (ethereum#25239)
Browse files Browse the repository at this point in the history
  • Loading branch information
MariusVanDerWijden authored and jagdeep sidhu committed Jul 19, 2022
1 parent 65a1bc8 commit f1765de
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/state_test_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh
context := core.NewEVMBlockContext(block.Header(), nil, &t.json.Env.Coinbase)
context.GetHash = vmTestBlockHash
context.BaseFee = baseFee
if t.json.Env.Random != nil {
context.Random = nil
if config.IsLondon(new(big.Int)) && t.json.Env.Random != nil {
rnd := common.BigToHash(t.json.Env.Random)
context.Random = &rnd
context.Difficulty = big.NewInt(0)
Expand Down

0 comments on commit f1765de

Please sign in to comment.