renamed get_storage_slot() to get_storage()

Author: PoulavBhowmick03

cmd/ef_tests/state/runner/levm_runner.rs

@@ -238,7 +238,7 @@ pub fn ensure_pre_state(evm: &VM, test: &EFTest) -> Result<(), EFTestRunnerError
         )?;
         for (k, v) in &pre_value.storage {
             let storage_slot = world_state
-                .get_storage_slot(*address, H256::from_slice(&k.to_big_endian()))
+                .get_storage(*address, H256::from_slice(&k.to_big_endian()))
                 .unwrap();
             ensure_pre_state_condition(
                 &storage_slot == v,

crates/vm/backends/levm/db.rs

@@ -48,12 +48,12 @@ impl LevmDatabase for DatabaseLogger {
         self.store.account_exists(address)
     }
 
-    fn get_storage_slot(
+    fn get_storage(
         &self,
         address: CoreAddress,
         key: CoreH256,
     ) -> Result<CoreU256, DatabaseError> {
-        let slot = self.store.get_storage_slot(address, key)?;
+        let slot = self.store.get_storage(address, key)?;
         self.storage_accessed
             .lock()
             .map_err(|_| DatabaseError::Custom("Could not lock mutex".to_string()))?
@@ -140,7 +140,7 @@ impl LevmDatabase for StoreWrapper {
         acc_info.is_some()
     }
 
-    fn get_storage_slot(
+    fn get_storage(
         &self,
         address: CoreAddress,
         key: CoreH256,
@@ -216,7 +216,7 @@ impl LevmDatabase for ExecutionDB {
         Ok(self.block_hashes.get(&block_number).cloned())
     }
 
-    fn get_storage_slot(
+    fn get_storage(
         &self,
         address: CoreAddress,
         key: CoreH256,

crates/vm/backends/levm/mod.rs

@@ -192,7 +192,7 @@ impl LEVM {
             // 2. Storage has been updated if the current value is different from the one before execution.
             let mut added_storage = HashMap::new();
             for (key, storage_slot) in &new_state_account.storage {
-                let storage_before_block = db.store.get_storage_slot(address, *key)?;
+                let storage_before_block = db.store.get_storage(address, *key)?;
                 if storage_slot.current_value != storage_before_block {
                     added_storage.insert(*key, storage_slot.current_value);
                     storage_updated = true;

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

@@ -12,7 +12,7 @@ pub mod error;
 
 pub trait Database: Send + Sync {
     fn get_account_info(&self, address: Address) -> Result<AccountInfo, DatabaseError>;
-    fn get_storage_slot(&self, address: Address, key: H256) -> Result<U256, DatabaseError>;
+    fn get_storage(&self, address: Address, key: H256) -> Result<U256, DatabaseError>;
     fn get_block_hash(&self, block_number: u64) -> Result<Option<H256>, DatabaseError>;
     fn account_exists(&self, address: Address) -> bool;
     fn get_chain_config(&self) -> ChainConfig;

crates/vm/levm/src/vm.rs

@@ -488,15 +488,15 @@ impl<'a> VM<'a> {
             Some(account) => match account.storage.get(&key) {
                 Some(storage_slot) => storage_slot.clone(),
                 None => {
-                    let value = self.db.store.get_storage_slot(address, key)?;
+                    let value = self.db.store.get_storage(address, key)?;
                     StorageSlot {
                         original_value: value,
                         current_value: value,
                     }
                 }
             },
             None => {
-                let value = self.db.store.get_storage_slot(address, key)?;
+                let value = self.db.store.get_storage(address, key)?;
                 StorageSlot {
                     original_value: value,
                     current_value: value,