Fixing failing tests

Author: SDartayet

cmd/ef_tests/state_v2/src/modules/result_check.rs

@@ -272,7 +272,7 @@ pub fn check_accounts_state(
                                 H256::from(k.to_big_endian()),
                                 LevmStorageSlot {
                                     current_value: *v,
-                                    previous_value: *v,
+                                    previous_value: None,
                                 },
                             )
                         })

crates/vm/levm/runner/src/main.rs

@@ -246,7 +246,7 @@ fn compare_initial_and_current_accounts(
             }
 
             for (slot, value) in &acc.storage {
-                let prev_value = value.previous_value;
+                let prev_value = value.previous_value.unwrap_or(U256::default());
                 let current_value = value.current_value;
                 if prev_value != current_value {
                     info!(

crates/vm/levm/src/account.rs

@@ -25,7 +25,7 @@ pub struct LevmAccount {
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct LevmStorageSlot {
     pub current_value: U256,
-    pub previous_value: U256,
+    pub previous_value: Option<U256>,
 }
 
 impl From<AccountInfo> for LevmAccount {
@@ -48,7 +48,7 @@ impl From<GenesisAccount> for LevmAccount {
                     H256::from(key.to_big_endian()),
                     LevmStorageSlot {
                         current_value: value,
-                        previous_value: value,
+                        previous_value: None,
                     },
                 )
             })

crates/vm/levm/src/db/gen_db.rs

@@ -132,7 +132,7 @@ impl GeneralizedDatabase {
             Some(account) => {
                 let storage_value = LevmStorageSlot {
                     current_value: value,
-                    previous_value: value,
+                    previous_value: None,
                 };
                 account.storage.insert(key, storage_value);
             }
@@ -377,7 +377,13 @@ impl<'a> VM<'a> {
         address: Address,
         key: H256,
     ) -> Result<U256, InternalError> {
-        Ok(self.get_storage_slot(address, key)?.current_value)
+        let mut storage_slot = self.get_storage_slot(address, key)?;
+        if let Some(original_value) = storage_slot.previous_value {
+            return Ok(original_value);
+        }
+        let current_value = storage_slot.current_value;
+        storage_slot.previous_value = Some(current_value);
+        Ok(current_value)
     }
 
     /// Accesses to an account's storage slot and returns the value in it.
@@ -431,7 +437,7 @@ impl<'a> VM<'a> {
 
         let storage_slot = LevmStorageSlot {
             current_value,
-            previous_value: current_value,
+            previous_value: None,
         };
 
         let account = self.get_account_mut(address)?;
@@ -452,7 +458,6 @@ impl<'a> VM<'a> {
 
         let mut storage_slot = self.get_storage_slot(address, key)?;
         storage_slot.current_value = new_value;
-        storage_slot.previous_value = current_value;
 
         Ok(())
     }

crates/vm/levm/src/utils.rs

@@ -185,7 +185,7 @@ pub fn restore_cache_state(
         for (key, value) in storage {
             let storage_value = LevmStorageSlot {
                 current_value: value,
-                previous_value: value,
+                previous_value: None,
             };
             account.storage.insert(key, storage_value);
         }
@@ -683,7 +683,7 @@ pub fn account_to_levm_account(account: Account) -> (LevmAccount, Bytes) {
                 .map(|(key, value)| {
                     let storage_value = LevmStorageSlot {
                         current_value: value,
-                        previous_value: value,
+                        previous_value: None,
                     };
                     (key, storage_value)
                 })