Skip to content
Draft
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Remove finish_batch
As it was not related to this pr
MarcosNicolau committed Aug 28, 2024
commit b0365ca0d0a3552733cca12c419db54d481f7191
32 changes: 2 additions & 30 deletions core/lib/multivm/src/versions/era_vm/vm.rs
Original file line number Diff line number Diff line change
@@ -33,11 +33,8 @@ use super::{
logs::IntoSystemLog,
snapshot::VmSnapshot,
tracers::{
dispatcher::TracerDispatcher,
manager::VmTracerManager,
pubdata_tracer::PubdataTracer,
refunds_tracer::{Refunds, RefundsTracer},
traits::VmTracer,
dispatcher::TracerDispatcher, manager::VmTracerManager, pubdata_tracer::PubdataTracer,
refunds_tracer::RefundsTracer, traits::VmTracer,
},
transaction::ParallelTransaction,
};
@@ -47,7 +44,6 @@ use crate::{
tracer::{TracerExecutionStatus, TracerExecutionStopReason},
Halt, TxRevertReason, VmFactory, VmInterface, VmInterfaceHistoryEnabled, VmRevertReason,
},
vm_1_4_1::FinishedL1Batch,
vm_latest::{
constants::{
get_result_success_first_slot, get_vm_hook_position, get_vm_hook_start_position_latest,
@@ -701,30 +697,6 @@ impl<S: ReadStorage + 'static> VmInterface for Vm<S> {
fn gas_remaining(&self) -> u32 {
self.inner.execution.current_frame().unwrap().gas_left.0
}

fn finish_batch(&mut self) -> FinishedL1Batch {
let result = self.execute(VmExecutionMode::Batch);
let execution_state = self.get_current_execution_state();
let bootloader_memory = self.get_bootloader_memory();

FinishedL1Batch {
block_tip_execution_result: result,
final_execution_state: execution_state,
final_bootloader_memory: Some(bootloader_memory),
pubdata_input: Some(
self.bootloader_state
.get_pubdata_information()
.clone()
.build_pubdata(false),
),
state_diffs: Some(
self.bootloader_state
.get_pubdata_information()
.state_diffs
.to_vec(),
),
}
}
}

impl<S: ReadStorage + 'static> VmInterfaceHistoryEnabled for Vm<S> {