From 556888c4a971d4fd02be15f09cba7a65c5c0d930 Mon Sep 17 00:00:00 2001
From: Ali Atiia <42751398+aliatiia@users.noreply.github.com>
Date: Mon, 2 Mar 2020 12:20:27 -0500
Subject: [PATCH 1/2] core/vm: fix method doc (#20730)

typo in func name in the comment
---
 core/vm/gas.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/vm/gas.go b/core/vm/gas.go
index bd8b4f1042..3e3052faa8 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -30,7 +30,7 @@ const (
 	GasExtStep     uint64 = 20
 )
 
-// calcGas returns the actual gas cost of the call.
+// callGas returns the actual gas cost of the call.
 //
 // The cost of gas was changed during the homestead price change HF.
 // As part of EIP 150 (TangerineWhistle), the returned gas is gas - base * 63 / 64.

From 0bdb21f0cb9fe73a02b61aeedbbae5b57fc337ae Mon Sep 17 00:00:00 2001
From: meowsbits <45600330+meowsbits@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:55:27 -0500
Subject: [PATCH 2/2] tests: update tests/testdata@develop, include EIP2384
 config (#20746)

Includes difficulty tests for EIP2384 aka MuirGlacier.
---
 tests/difficulty_test.go | 3 +++
 tests/testdata           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index fde9db3ad4..4bdad0ea5d 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -73,6 +73,9 @@ func TestDifficulty(t *testing.T) {
 	dt.config("Constantinople", params.ChainConfig{
 		ConstantinopleBlock: big.NewInt(0),
 	})
+	dt.config("EIP2384", params.ChainConfig{
+		MuirGlacierBlock: big.NewInt(0),
+	})
 	dt.config("difficulty.json", mainnetChainConfig)
 
 	dt.walk(t, difficultyTestDir, func(t *testing.T, name string, test *DifficultyTest) {
diff --git a/tests/testdata b/tests/testdata
index b5eb9900ee..7497b116a0 160000
--- a/tests/testdata
+++ b/tests/testdata
@@ -1 +1 @@
-Subproject commit b5eb9900ee2147b40d3e681fe86efa4fd693959a
+Subproject commit 7497b116a019beb26215cbea4028df068dea06be