From a54a230a083eaf68280a3e5607be8ee7eeae8a11 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Fri, 15 Jul 2022 14:01:07 +0200 Subject: [PATCH] tests: only activate merge on london rules (#25239) --- tests/state_test_util.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/state_test_util.go b/tests/state_test_util.go index f6d8e15001..d698b7c6fd 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -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)