From 01bebeb22e6dbceaf03dd30770265de61fb9426f Mon Sep 17 00:00:00 2001
From: Marcello Ardizzone <marcello.ardizzone@custodigit.com>
Date: Tue, 12 Jul 2022 11:55:47 +0200
Subject: [PATCH] new: dev: pos-398 remove merge error check on state tests

---
 tests/state_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/state_test.go b/tests/state_test.go
index 05deca788e..e338ed9cc3 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -22,7 +22,6 @@ package tests
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"fmt"
 	"math/big"
 	"os"
@@ -149,8 +148,7 @@ func TestState(t *testing.T) {
 					withTrace(t, test.gasLimit(subtest), func(vmconfig vm.Config) error {
 						snaps, statedb, err := test.Run(subtest, vmconfig, true)
 						if snaps != nil && statedb != nil {
-							if _, err := snaps.Journal(statedb.IntermediateRoot(false)); err != nil &&
-								!errors.Is(err, UnsupportedForkError{Name: "Merge"}) {
+							if _, err := snaps.Journal(statedb.IntermediateRoot(false)); err != nil {
 								t.Errorf("in 'rlp_test.go', test '%s' failed with error: '%v'", name, err)
 								return err
 							}