chore(tests): update max blob per tx test errors. (#1997)

Author: spencer-tb

tests/osaka/eip7594_peerdas/test_max_blob_per_tx.py

@@ -112,10 +112,12 @@ def test_valid_max_blobs_per_tx(
 @pytest.mark.valid_from("Osaka")
 @pytest.mark.exception_test
 def test_invalid_max_blobs_per_tx(
+    fork: Fork,
     state_test: StateTestFiller,
     pre: Alloc,
     env: Environment,
     tx: Transaction,
+    blob_count: int,
 ):
     """
     Test that transactions exceeding MAX_BLOBS_PER_TX are rejected.
@@ -127,41 +129,50 @@ def test_invalid_max_blobs_per_tx(
         env=env,
         pre=pre,
         tx=tx.with_error(
-            [
-                TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED,
-                TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED,
-            ]
+            TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
+            if blob_count > fork.max_blobs_per_block()
+            else TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED
         ),
         post={},
     )
 
 
 @pytest.mark.parametrize_by_fork(
     "blob_count",
-    lambda fork: [fork.max_blobs_per_tx(timestamp=FORK_TIMESTAMP) + 1],
+    lambda fork: [
+        fork.max_blobs_per_tx(timestamp=FORK_TIMESTAMP) + 1,
+        fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP) + 1,
+    ],
 )
 @pytest.mark.valid_at_transition_to("Osaka")
 @pytest.mark.exception_test
 def test_max_blobs_per_tx_fork_transition(
+    fork: Fork,
     blockchain_test: BlockchainTestFiller,
     env: Environment,
     pre: Alloc,
     tx: Transaction,
+    blob_count: int,
 ):
     """Test `MAX_BLOBS_PER_TX` limit enforcement across fork transition."""
+    expected_exception = (
+        TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
+        if blob_count > fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP)
+        else TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED
+    )
     pre_fork_block = Block(
         txs=[tx],
         timestamp=FORK_TIMESTAMP - 1,
     )
     fork_block = Block(
-        txs=[tx.with_nonce(1).with_error(TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED)],
+        txs=[tx.with_nonce(1).with_error(expected_exception)],
         timestamp=FORK_TIMESTAMP,
-        exception=[TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED],
+        exception=[expected_exception],
     )
     post_fork_block = Block(
-        txs=[tx.with_nonce(2).with_error(TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED)],
+        txs=[tx.with_nonce(2).with_error(expected_exception)],
         timestamp=FORK_TIMESTAMP + 1,
-        exception=[TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED],
+        exception=[expected_exception],
     )
     blockchain_test(
         pre=pre,