Skip to content

Commit c3a8bb7

Browse files
committed
rename: build -> build_block_access_list
1 parent aff3af5 commit c3a8bb7

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

src/ethereum/amsterdam/block_access_lists/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
add_storage_read,
1111
add_storage_write,
1212
add_touched_account,
13-
build,
13+
build_block_access_list,
1414
)
1515
from .rlp_utils import (
1616
compute_block_access_list_hash,
@@ -37,7 +37,7 @@
3737
"add_storage_read",
3838
"add_storage_write",
3939
"add_touched_account",
40-
"build",
40+
"build_block_access_list",
4141
"compute_block_access_list_hash",
4242
"set_transaction_index",
4343
"rlp_encode_block_access_list",

src/ethereum/amsterdam/block_access_lists/builder.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,9 @@ def add_touched_account(
344344
ensure_account(builder, address)
345345

346346

347-
def build(builder: BlockAccessListBuilder) -> BlockAccessList:
347+
def build_block_access_list(
348+
builder: BlockAccessListBuilder
349+
) -> BlockAccessList:
348350
"""
349351
Build the final [`BlockAccessList`] from accumulated changes.
350352

src/ethereum/amsterdam/block_access_lists/rlp_utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,12 @@ def validate_block_access_list_against_execution(
216216
# 4. If Block Access List builder provided, validate against it
217217
# by comparing hashes
218218
if block_access_list_builder is not None:
219-
from .builder import build
219+
from .builder import build_block_access_list
220220

221221
# Build a Block Access List from the builder
222-
expected_block_access_list = build(block_access_list_builder)
222+
expected_block_access_list = build_block_access_list(
223+
block_access_list_builder
224+
)
223225

224226
# Compare hashes
225227
if compute_block_access_list_hash(

src/ethereum/amsterdam/fork.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
)
3131

3232
from . import vm
33-
from .block_access_lists.builder import build
33+
from .block_access_lists.builder import build_block_access_list
3434
from .block_access_lists.rlp_utils import compute_block_access_list_hash
3535
from .block_access_lists.tracker import (
3636
set_transaction_index,
@@ -797,7 +797,7 @@ def apply_body(
797797
block_env=block_env,
798798
block_output=block_output,
799799
)
800-
block_output.block_access_list = build(
800+
block_output.block_access_list = build_block_access_list(
801801
block_env.state.change_tracker.block_access_list_builder
802802
)
803803

src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def signing_hash_155(self) -> Any:
127127
@property
128128
def build(self) -> Any:
129129
"""build function of the fork"""
130-
return self._module("block_access_lists").build
130+
return self._module("block_access_lists").build_block_access_list
131131

132132
@property
133133
def compute_block_access_list_hash(self) -> Any:

tests/amsterdam/test_bal_implementation.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
add_storage_read,
2424
add_storage_write,
2525
add_touched_account,
26-
build,
26+
build_block_access_list,
2727
)
2828
from ethereum.amsterdam.block_access_lists.tracker import (
2929
capture_pre_state,
@@ -160,7 +160,7 @@ def test_bal_builder_build_complete(self) -> None:
160160
add_touched_account(builder, address2)
161161

162162
# Build BAL
163-
block_access_list = build(builder)
163+
block_access_list = build_block_access_list(builder)
164164

165165
assert isinstance(block_access_list, BlockAccessList)
166166
assert len(block_access_list.account_changes) == 2
@@ -364,7 +364,7 @@ def test_system_contract_indices(self) -> None:
364364
Bytes32(b"\x02" * 32),
365365
)
366366

367-
block_access_list = build(builder)
367+
block_access_list = build_block_access_list(builder)
368368

369369
for account in block_access_list.account_changes:
370370
if account.address in [beacon_roots_addr, history_addr]:
@@ -384,7 +384,7 @@ def test_transaction_indices(self) -> None:
384384
builder, address, BlockAccessIndex(tx_num), U256(0)
385385
)
386386

387-
block_access_list = build(builder)
387+
block_access_list = build_block_access_list(builder)
388388

389389
assert len(block_access_list.account_changes) == 3
390390
for i, account in enumerate(block_access_list.account_changes):
@@ -407,7 +407,7 @@ def test_post_execution_index(self) -> None:
407407
U256(0),
408408
)
409409

410-
block_access_list = build(builder)
410+
block_access_list = build_block_access_list(builder)
411411

412412
for account in block_access_list.account_changes:
413413
if account.address == withdrawal_addr:
@@ -434,7 +434,7 @@ def test_mixed_indices_ordering(self) -> None:
434434
)
435435
add_balance_change(builder, address, BlockAccessIndex(0), U256(0))
436436

437-
block_access_list = build(builder)
437+
block_access_list = build_block_access_list(builder)
438438

439439
assert len(block_access_list.account_changes) == 1
440440
account = block_access_list.account_changes[0]
@@ -475,7 +475,7 @@ def test_rlp_encode_simple_bal(self) -> None:
475475

476476
add_balance_change(builder, address, BlockAccessIndex(1), U256(0))
477477

478-
block_access_list = build(builder)
478+
block_access_list = build_block_access_list(builder)
479479
encoded = rlp_encode_block_access_list(block_access_list)
480480

481481
# Should produce valid RLP bytes
@@ -499,7 +499,7 @@ def test_bal_hash_computation(self) -> None:
499499
Bytes32(b"\x03" * 32),
500500
)
501501

502-
block_access_list = build(builder)
502+
block_access_list = build_block_access_list(builder)
503503
hash_val = compute_block_access_list_hash(block_access_list)
504504

505505
# Should produce a 32-byte hash
@@ -535,7 +535,7 @@ def test_rlp_encode_complex_bal(self) -> None:
535535
builder, address, BlockAccessIndex(2), Bytes(b"\x60\x80")
536536
)
537537

538-
block_access_list = build(builder)
538+
block_access_list = build_block_access_list(builder)
539539
encoded = rlp_encode_block_access_list(block_access_list)
540540

541541
# Should produce valid RLP bytes
@@ -549,7 +549,7 @@ class TestEdgeCases:
549549
def test_empty_bal(self) -> None:
550550
"""Test building an empty BAL."""
551551
builder = BlockAccessListBuilder()
552-
block_access_list = build(builder)
552+
block_access_list = build_block_access_list(builder)
553553

554554
assert isinstance(block_access_list, BlockAccessList)
555555
assert len(block_access_list.account_changes) == 0
@@ -571,7 +571,7 @@ def test_multiple_changes_same_slot(self) -> None:
571571
builder, address, slot, BlockAccessIndex(2), Bytes32(b"\x02" * 32)
572572
)
573573

574-
block_access_list = build(builder)
574+
block_access_list = build_block_access_list(builder)
575575

576576
assert len(block_access_list.account_changes) == 1
577577
account = block_access_list.account_changes[0]
@@ -604,7 +604,7 @@ def test_address_sorting(self) -> None:
604604
for addr in addresses:
605605
add_touched_account(builder, addr)
606606

607-
block_access_list = build(builder)
607+
block_access_list = build_block_access_list(builder)
608608

609609
# Should be sorted lexicographically
610610
sorted_addresses = sorted(addresses)

0 commit comments

Comments
 (0)