fix(tests): EIP-4844: Rollback EIP-7742 changes

Author: marioevz

tests/cancun/eip4844_blobs/test_blob_txs.py

@@ -20,7 +20,7 @@
 
 import pytest
 
-from ethereum_test_forks import Fork, Prague
+from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     EOA,
     AccessList,
@@ -290,24 +290,14 @@ def tx_access_list() -> List[AccessList]:
 
 
 @pytest.fixture
-def tx_error(
-    request: pytest.FixtureRequest,
-    fork: Fork,
-) -> Optional[TransactionException]:
+def tx_error() -> Optional[TransactionException]:
     """
     Default expected error produced by the block transactions (no error).
 
     Can be overloaded on test cases where the transactions are expected
     to fail.
     """
-    if not hasattr(request, "param"):
-        return None
-    if fork >= Prague and request.param in [
-        TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED,
-        TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED,
-    ]:
-        return None
-    return request.param
+    return None
 
 
 @pytest.fixture
@@ -746,10 +736,7 @@ def test_invalid_normal_gas(
     invalid_blob_combinations(),
 )
 @pytest.mark.parametrize(
-    "tx_error",
-    [TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED],
-    ids=[""],
-    indirect=True,
+    "tx_error", [TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED], ids=[""]
 )
 @pytest.mark.valid_from("Cancun")
 def test_invalid_block_blob_count(
@@ -1020,7 +1007,6 @@ def test_insufficient_balance_blob_tx_combinations(
         ),
     ],
     ids=["too_few_blobs", "too_many_blobs"],
-    indirect=["tx_error"],
 )
 @pytest.mark.valid_from("Cancun")
 def test_invalid_tx_blob_count(