Skip to content

Commit

Permalink
add transaction task to EVMMethods
Browse files Browse the repository at this point in the history
- minor refactoring (renaming) of debug_trace tasks
- add trace_transaction task to EVMMethods
  • Loading branch information
erwin-wee committed Jan 11, 2024
1 parent 8bd5fbe commit e5f1862
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
8 changes: 4 additions & 4 deletions chainbench/profile/evm/debug_trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ def debug_trace_transaction_task(self):
self.make_call(
name="debug_trace_transaction",
method="debug_traceTransaction",
params=self._trace_transaction_params_factory(get_rng()),
params=self._debug_trace_transaction_params_factory(get_rng()),
),

@task(41)
def debug_trace_call_task(self):
self.make_call(
name="debug_trace_call",
method="debug_traceCall",
params=self._trace_call_params_factory(get_rng()),
params=self._debug_trace_call_params_factory(get_rng()),
),

@task(36)
def debug_trace_block_by_number_task(self):
self.make_call(
name="debug_trace_block_by_number",
method="debug_traceBlockByNumber",
params=self._trace_block_by_number_params_factory(),
params=self._debug_trace_block_by_number_params_factory(),
),

@task(1)
def debug_trace_block_by_hash_task(self):
self.make_call(
name="debug_trace_block_by_hash",
method="debug_traceBlockByHash",
params=self._trace_block_by_hash_params_factory(get_rng()),
params=self._debug_trace_block_by_hash_params_factory(get_rng()),
),
6 changes: 3 additions & 3 deletions chainbench/profile/evm/heavy.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def debug_trace_transaction_task(self):
self.make_call(
name="debug_trace_transaction",
method="debug_traceTransaction",
params=self._trace_transaction_params_factory(get_rng()),
params=self._debug_trace_transaction_params_factory(get_rng()),
),

@task
Expand Down Expand Up @@ -121,15 +121,15 @@ def debug_trace_block_by_number_task(self):
self.make_call(
name="debug_trace_block_by_number",
method="debug_traceBlockByNumber",
params=self._trace_block_by_number_params_factory(),
params=self._debug_trace_block_by_number_params_factory(),
)

@task
def debug_trace_block_by_hash_task(self):
self.make_call(
name="debug_trace_block_by_hash",
method="debug_traceBlockByHash",
params=self._trace_block_by_hash_params_factory(get_rng()),
params=self._debug_trace_block_by_hash_params_factory(get_rng()),
)

@task
Expand Down
Empty file.
22 changes: 14 additions & 8 deletions chainbench/user/evm.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def _get_balance_params_factory(self, rng: RNG) -> list[Account | str]:
"latest",
]

def _trace_call_params_factory(self, rng: RNG) -> list[dict | BlockNumber]:
def _debug_trace_call_params_factory(self, rng: RNG) -> list[dict | BlockNumber]:
tx_data = self.test_data.get_random_tx(rng)
tx_param = {
"to": tx_data["to"],
Expand All @@ -67,13 +67,13 @@ def _trace_call_params_factory(self, rng: RNG) -> list[dict | BlockNumber]:
{"tracer": "callTracer", "timeout": self._default_trace_timeout},
]

def _trace_block_by_number_params_factory(self) -> list[str | dict]:
def _debug_trace_block_by_number_params_factory(self) -> list[str | dict]:
return [
"latest",
{"tracer": "callTracer", "timeout": self._default_trace_timeout},
]

def _trace_block_by_hash_params_factory(self, rng: RNG) -> list[BlockHash | dict]:
def _debug_trace_block_by_hash_params_factory(self, rng: RNG) -> list[BlockHash | dict]:
return [
self.test_data.get_random_block_hash(rng),
{"tracer": "callTracer", "timeout": self._default_trace_timeout},
Expand All @@ -92,7 +92,7 @@ def _trace_replay_transaction_params_factory(self, rng: RNG) -> list[TxHash | li
["vmTrace", "trace", "stateDiff"],
]

def _trace_transaction_params_factory(self, rng: RNG) -> list[TxHash | dict]:
def _debug_trace_transaction_params_factory(self, rng: RNG) -> list[TxHash | dict]:
return [
self.test_data.get_random_tx_hash(rng),
{"tracer": "callTracer", "timeout": self._default_trace_timeout},
Expand Down Expand Up @@ -295,25 +295,25 @@ def eth_syncing_task(self) -> None:
def debug_trace_block_by_hash_task(self) -> None:
self.make_call(
method="debug_traceBlockByHash",
params=self._trace_block_by_hash_params_factory(self.rng.get_rng()),
params=self._debug_trace_block_by_hash_params_factory(self.rng.get_rng()),
)

def debug_trace_block_by_number_task(self) -> None:
self.make_call(
method="debug_traceBlockByNumber",
params=self._trace_block_by_number_params_factory(),
params=self._debug_trace_block_by_number_params_factory(),
)

def debug_trace_call_task(self) -> None:
self.make_call(
method="debug_traceCall",
params=self._trace_call_params_factory(self.rng.get_rng()),
params=self._debug_trace_call_params_factory(self.rng.get_rng()),
)

def debug_trace_transaction_task(self) -> None:
self.make_call(
method="debug_traceTransaction",
params=self._trace_transaction_params_factory(self.rng.get_rng()),
params=self._debug_trace_transaction_params_factory(self.rng.get_rng()),
)

def net_listening_task(self) -> None:
Expand Down Expand Up @@ -349,6 +349,12 @@ def trace_replay_transaction_task(self) -> None:
params=self._trace_replay_transaction_params_factory(self.rng.get_rng()),
)

def trace_transaction_task(self) -> None:
self.make_call(
method="trace_transaction",
params=[self.test_data.get_random_tx_hash(self.rng.get_rng())],
)

def web3_client_version_task(self) -> None:
self.make_call(
method="web3_clientVersion",
Expand Down

0 comments on commit e5f1862

Please sign in to comment.