create cache restore method

Author: JereSalo

crates/vm/levm/bench/revm_comparison/src/lib.rs

@@ -91,14 +91,14 @@ pub fn run_with_levm(program: &str, runs: u64, calldata: &str) {
         vm.call_frames.last_mut().unwrap().calldata = calldata.clone();
         vm.env.gas_limit = u64::MAX - 1;
         vm.env.block_gas_limit = u64::MAX;
-        let tx_report = black_box(vm.execute().unwrap());
+        let tx_report = black_box(vm.stateless_execute().unwrap());
         assert!(tx_report.result == TxResult::Success);
     }
     let mut vm = new_vm_with_bytecode(&mut db, runs - 1).unwrap();
     vm.call_frames.last_mut().unwrap().calldata = calldata.clone();
     vm.env.gas_limit = u64::MAX - 1;
     vm.env.block_gas_limit = u64::MAX;
-    let tx_report = black_box(vm.execute().unwrap());
+    let tx_report = black_box(vm.stateless_execute().unwrap());
     assert!(tx_report.result == TxResult::Success);
 
     match tx_report.result {

crates/vm/levm/src/vm.rs

@@ -350,15 +350,7 @@ impl<'a> VM<'a> {
     }
 
     pub fn restore_state(&mut self, backup: StateBackup, call_frame: &mut CallFrame) {
-        // self.db.cache = backup.cache;
-        for (address, account_opt) in &call_frame.backup {
-            if let Some(account) = account_opt {
-                cache::insert_account(&mut self.db.cache, *address, account.clone(), &mut None);
-            } else {
-                // remove from cache
-                cache::remove_account(&mut self.db.cache, address, &mut None);
-            }
-        }
+        self.restore_cache_state(call_frame);
         self.accrued_substate = backup.substate;
         self.env.refunded_gas = backup.refunded_gas;
         self.env.transient_storage = backup.transient_storage;
@@ -415,14 +407,7 @@ impl<'a> VM<'a> {
 
         if let Err(e) = self.prepare_execution(&mut initial_call_frame) {
             // We need to do a cleanup of the cache so that it doesn't interfere with next transaction's execution
-            for (address, account_opt) in &initial_call_frame.backup {
-                if let Some(account) = account_opt {
-                    cache::insert_account(&mut self.db.cache, *address, account.clone(), &mut None);
-                } else {
-                    // remove from cache
-                    cache::remove_account(&mut self.db.cache, address, &mut None);
-                }
-            }
+            self.restore_cache_state(&initial_call_frame);
             return Err(e);
         }
 
@@ -580,4 +565,15 @@ impl<'a> VM<'a> {
 
         Ok(())
     }
+
+    fn restore_cache_state(&mut self, call_frame: &CallFrame) {
+        for (address, account_opt) in &call_frame.backup {
+            if let Some(account) = account_opt {
+                cache::insert_account(&mut self.db.cache, *address, account.clone(), &mut None);
+            } else {
+                // remove from cache
+                cache::remove_account(&mut self.db.cache, address, &mut None);
+            }
+        }
+    }
 }