Skip to content
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

chore(blockifier): rename execution_tast_output feild 'writes' to state_diff' #3871

Merged
merged 1 commit into from
Feb 2, 2025
Merged

chore(blockifier): rename execution_tast_output feild 'writes' to state_diff' #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions crates/blockifier/src/concurrency/worker_logic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ const EXECUTION_OUTPUTS_UNWRAP_ERROR: &str = "Execution task outputs should not
#[derive(Debug)]
pub struct ExecutionTaskOutput {
pub reads: StateMaps,
// TODO(Yoni): rename to state_diff.
pub writes: StateMaps,
pub state_diff: StateMaps,
pub contract_classes: ContractClassMapping,
pub result: TransactionExecutionResult<TransactionExecutionInfo>,
}
Expand Down Expand Up @@ -131,20 +130,20 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
let execution_output_inner = match execution_result {
Ok(_) => {
let tx_reads_writes = transactional_state.cache.take();
let writes = tx_reads_writes.to_state_diff().state_maps;
let state_diff = tx_reads_writes.to_state_diff().state_maps;
let contract_classes = transactional_state.class_hash_to_class.take();
tx_versioned_state.apply_writes(&writes, &contract_classes);
tx_versioned_state.apply_writes(&state_diff, &contract_classes);
ExecutionTaskOutput {
reads: tx_reads_writes.initial_reads,
writes,
state_diff,
contract_classes,
result: execution_result,
}
}
Err(_) => ExecutionTaskOutput {
reads: transactional_state.cache.take().initial_reads,
// Failed transaction - ignore the writes.
writes: StateMaps::default(),
state_diff: StateMaps::default(),
contract_classes: HashMap::default(),
result: execution_result,
},
Expand All @@ -163,7 +162,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
let aborted = !reads_valid && self.scheduler.try_validation_abort(tx_index);
if aborted {
tx_versioned_state
.delete_writes(&execution_output.writes, &execution_output.contract_classes);
.delete_writes(&execution_output.state_diff, &execution_output.contract_classes);
self.scheduler.finish_abort(tx_index)
} else {
Task::AskForTask
Expand Down Expand Up @@ -194,7 +193,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
if !reads_valid {
// Revalidate failed: re-execute the transaction.
tx_versioned_state.delete_writes(
&execution_output_ref.writes,
&execution_output_ref.state_diff,
&execution_output_ref.contract_classes,
);
// Release the execution output lock as it is acquired in execution (avoid dead-lock).
Expand All @@ -214,9 +213,10 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {

// Execution is final.
let mut execution_output = lock_mutex_in_array(&self.execution_outputs, tx_index);
let writes = &execution_output.as_ref().expect(EXECUTION_OUTPUTS_UNWRAP_ERROR).writes;
let state_diff =
&execution_output.as_ref().expect(EXECUTION_OUTPUTS_UNWRAP_ERROR).state_diff;
// TODO(Yoni): get rid of this clone.
let mut tx_state_changes_keys = writes.clone().into_keys();
let mut tx_state_changes_keys = state_diff.clone().into_keys();
let tx_result =
&mut execution_output.as_mut().expect(EXECUTION_OUTPUTS_UNWRAP_ERROR).result;

Expand Down
6 changes: 3 additions & 3 deletions crates/blockifier/src/concurrency/worker_logic_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ fn test_worker_execute(default_all_resource_bounds: ValidResourceBounds) {
..Default::default()
};

assert_eq!(execution_output.writes, writes.diff(&reads));
assert_eq!(execution_output.state_diff, writes.diff(&reads));
assert_eq!(execution_output.reads, reads);

// Failed execution.
Expand All @@ -402,7 +402,7 @@ fn test_worker_execute(default_all_resource_bounds: ValidResourceBounds) {
..Default::default()
};
assert_eq!(execution_output.reads, reads);
assert_eq!(execution_output.writes, StateMaps::default());
assert_eq!(execution_output.state_diff, StateMaps::default());

// Reverted execution.
let tx_index = 2;
Expand All @@ -415,7 +415,7 @@ fn test_worker_execute(default_all_resource_bounds: ValidResourceBounds) {
let execution_output = worker_executor.execution_outputs[tx_index].lock().unwrap();
let execution_output = execution_output.as_ref().unwrap();
assert!(execution_output.result.as_ref().unwrap().is_reverted());
assert_ne!(execution_output.writes, StateMaps::default());
assert_ne!(execution_output.state_diff, StateMaps::default());

// Validate status change.
for tx_index in 0..3 {
Expand Down
Loading