tests: only activate merge on london rules (#25239)

ethereum · Jul 15, 2022 · a54a230 · a54a230
1 parent 1657e43
commit a54a230
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)