Skip to content

Commit

Permalink
Changes from comments on pr ethereum#2097
Browse files Browse the repository at this point in the history
  • Loading branch information
fselmo committed Apr 20, 2023
1 parent c7bc4cf commit fc27ebb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion eth/vm/forks/shanghai/computation.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from eth.vm.forks.paris.computation import ParisMessageComputation


class ShanghaiComputation(ParisMessageComputation):
class ShanghaiMessageComputation(ParisMessageComputation):
"""
A class for all execution *message* computations in the ``Shanghai`` hard fork
"""
Expand Down
4 changes: 2 additions & 2 deletions eth/vm/forks/shanghai/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
TransactionExecutorAPI,
WithdrawalAPI,
)
from .computation import ShanghaiComputation
from .computation import ShanghaiMessageComputation
from ..paris import ParisState
from ..paris.state import ParisTransactionExecutor

Expand All @@ -14,7 +14,7 @@ class ShanghaiTransactionExecutor(ParisTransactionExecutor):


class ShanghaiState(ParisState):
message_computation_class = ShanghaiComputation
message_computation_class = ShanghaiMessageComputation
transaction_executor_class: Type[TransactionExecutorAPI] = ShanghaiTransactionExecutor # noqa: E501

def apply_withdrawal(self, withdrawal: WithdrawalAPI) -> None:
Expand Down
4 changes: 2 additions & 2 deletions tests/core/opcodes/test_opcodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
POS_MAINNET_VMS,
)
from eth.vm.forks.shanghai.computation import (
ShanghaiComputation,
ShanghaiMessageComputation,
)
from eth_utils import (
decode_hex,
Expand Down Expand Up @@ -1599,7 +1599,7 @@ def test_selfdestruct_does_not_issue_deprecation_warning_pre_shanghai(vm_class):


def test_selfdestruct_issues_deprecation_warning_for_shanghai():
available_vm_opcodes = ShanghaiComputation.opcodes
available_vm_opcodes = ShanghaiMessageComputation.opcodes

vm_opcodes_without_selfdestruct = {
k: available_vm_opcodes[k] for k in available_vm_opcodes.keys()
Expand Down

0 comments on commit fc27ebb

Please sign in to comment.