diff --git a/tests/testdata b/tests/testdata index 27721a7413..a380655e5f 160000 --- a/tests/testdata +++ b/tests/testdata @@ -1 +1 @@ -Subproject commit 27721a74131ccb6e2fa99b8a76740849d3d13fc7 +Subproject commit a380655e5ffab1a5ea0f4d860224bdb19013f06a diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 5663805605..fcd9cf018e 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,6 +20,7 @@ package tests import ( + "errors" "testing" "github.com/ethereum/go-ethereum/params" @@ -50,7 +51,7 @@ func TestTransaction(t *testing.T) { txt.skipLoad("^ttValue/TransactionWithHighValueOverflow.json") txt.walk(t, transactionTestDir, func(t *testing.T, name string, test *TransactionTest) { cfg := params.MainnetChainConfig - if err := txt.checkFailure(t, test.Run(cfg)); err != nil { + if err := txt.checkFailure(t, test.Run(cfg)); err != nil && !errors.Is(err, UnsupportedForkError{Name: "Merge"}) { t.Errorf("in 'transaction_test.go', test '%s' failed with error: '%v'", name, err) } })