Skip to content

fix(tests): resolve transition fork blob methods in EIP-4844 conftest #2602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spencer-tb merged 2 commits into from
Mar 31, 2026
Merged

fix(tests): resolve transition fork blob methods in EIP-4844 conftest #2602

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc427f
fix(tests): resolve transition fork blob methods in EIP-4844 conftest
danceratopz Mar 31, 2026
44e1688
ci: trigger CI
danceratopz Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/cancun/eip4844_blobs/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@ def block_base_fee_per_gas() -> int:
@pytest.fixture
def target_blobs_per_block(fork: Fork) -> int:
"""Return default number of blobs to be included in the block."""
return fork.target_blobs_per_block()
return fork.transitions_to().target_blobs_per_block()


@pytest.fixture
def max_blobs_per_block(fork: Fork) -> int:
"""Return default number of blobs to be included in the block."""
return fork.max_blobs_per_block()
return fork.transitions_to().max_blobs_per_block()


@pytest.fixture
def max_blobs_per_tx(fork: Fork) -> int:
"""Return max number of blobs per transaction."""
return fork.max_blobs_per_tx()
return fork.transitions_to().max_blobs_per_tx()


@pytest.fixture
def blob_gas_per_blob(fork: Fork) -> int:
"""Return default blob gas cost per blob."""
return fork.blob_gas_per_blob()
return fork.transitions_to().blob_gas_per_blob()


@pytest.fixture(autouse=True)
Expand Down Expand Up @@ -97,7 +97,7 @@ def excess_blob_gas(
"""
if parent_excess_blobs is None or parent_blobs is None:
return None
return fork.excess_blob_gas_calculator()(
return fork.transitions_to().excess_blob_gas_calculator()(
parent_excess_blobs=parent_excess_blobs,
parent_blob_count=parent_blobs,
parent_base_fee_per_gas=block_base_fee_per_gas,
Expand All @@ -119,7 +119,7 @@ def correct_excess_blob_gas(
"""
if parent_excess_blobs is None or parent_blobs is None:
return 0
return fork.excess_blob_gas_calculator()(
return fork.transitions_to().excess_blob_gas_calculator()(
parent_excess_blobs=parent_excess_blobs,
parent_blob_count=parent_blobs,
parent_base_fee_per_gas=block_base_fee_per_gas,
Expand All @@ -132,7 +132,7 @@ def block_fee_per_blob_gas(
correct_excess_blob_gas: int,
) -> int:
"""Calculate the blob gas price for the current block."""
get_blob_gas_price = fork.blob_gas_price_calculator()
get_blob_gas_price = fork.transitions_to().blob_gas_price_calculator()
return get_blob_gas_price(excess_blob_gas=correct_excess_blob_gas)


Expand All @@ -145,7 +145,7 @@ def blob_gas_price(
if excess_blob_gas is None:
return None

get_blob_gas_price = fork.blob_gas_price_calculator()
get_blob_gas_price = fork.transitions_to().blob_gas_price_calculator()
return get_blob_gas_price(
excess_blob_gas=excess_blob_gas,
)
Expand Down