comments: rename code storage APIs

third_party/move/move-vm/runtime/src/storage/code_storage.rs

@@ -21,12 +21,15 @@ pub fn script_hash(serialized_script: &[u8]) -> [u8; 32] {
 #[delegatable_trait]
 pub trait CodeStorage: ModuleStorage {
     /// Returns a deserialized script, either by directly deserializing it from the
-    /// provided bytes, or fetching it from the storage (if it has been cached). Note
-    /// that there are no guarantees that the returned script is verified. An error
-    /// is returned if the deserialization fails.
-    fn fetch_deserialized_script(&self, serialized_script: &[u8]) -> VMResult<Arc<CompiledScript>>;
+    /// provided bytes (and caching it), or fetching it from the cache. Note that
+    /// there are no guarantees that the returned script is verified. An error is
+    /// returned if the deserialization fails.
+    fn deserialize_and_cache_script(
+        &self,
+        serialized_script: &[u8],
+    ) -> VMResult<Arc<CompiledScript>>;
 
-    /// Returns a verified script. The script can either be cached, or deserialized and/or
-    /// verified from scratch. An error is returned if script fails to deserialize or verify.
-    fn fetch_verified_script(&self, serialized_script: &[u8]) -> VMResult<Arc<Script>>;
+    /// Returns a verified script. If not yet cached, verified from scratch and cached.
+    /// An error is returned if script fails to deserialize or verify.
+    fn verify_and_cache_script(&self, serialized_script: &[u8]) -> VMResult<Arc<Script>>;
 }

third_party/move/move-vm/runtime/src/storage/dummy.rs

@@ -90,14 +90,14 @@ impl ModuleStorage for DummyCodeStorage {
 }
 
 impl CodeStorage for DummyCodeStorage {
-    fn fetch_deserialized_script(
+    fn deserialize_and_cache_script(
         &self,
         _serialized_script: &[u8],
     ) -> VMResult<Arc<CompiledScript>> {
         unexpected_unimplemented_error!()
     }
 
-    fn fetch_verified_script(&self, _serialized_script: &[u8]) -> VMResult<Arc<Script>> {
+    fn verify_and_cache_script(&self, _serialized_script: &[u8]) -> VMResult<Arc<Script>> {
         unexpected_unimplemented_error!()
     }
 }

third_party/move/move-vm/runtime/src/storage/implementations/unreachable_code_storage.rs

@@ -86,14 +86,14 @@ impl ModuleStorage for UnreachableCodeStorage {
 }
 
 impl CodeStorage for UnreachableCodeStorage {
-    fn fetch_deserialized_script(
+    fn deserialize_and_cache_script(
         &self,
         _serialized_script: &[u8],
     ) -> VMResult<Arc<CompiledScript>> {
         unreachable_error!()
     }
 
-    fn fetch_verified_script(&self, _serialized_script: &[u8]) -> VMResult<Arc<Script>> {
+    fn verify_and_cache_script(&self, _serialized_script: &[u8]) -> VMResult<Arc<Script>> {
         unreachable_error!()
     }
 }

third_party/move/move-vm/runtime/src/storage/implementations/unsync_code_storage.rs

@@ -124,7 +124,10 @@ impl<M: ModuleStorage + WithEnvironment> UnsyncCodeStorage<M> {
 }
 
 impl<M: ModuleStorage + WithEnvironment> CodeStorage for UnsyncCodeStorage<M> {
-    fn fetch_deserialized_script(&self, serialized_script: &[u8]) -> VMResult<Arc<CompiledScript>> {
+    fn deserialize_and_cache_script(
+        &self,
+        serialized_script: &[u8],
+    ) -> VMResult<Arc<CompiledScript>> {
         use hash_map::Entry::*;
         use ScriptStorageEntry::*;
 
@@ -144,7 +147,7 @@ impl<M: ModuleStorage + WithEnvironment> CodeStorage for UnsyncCodeStorage<M> {
         })
     }
 
-    fn fetch_verified_script(&self, serialized_script: &[u8]) -> VMResult<Arc<Script>> {
+    fn verify_and_cache_script(&self, serialized_script: &[u8]) -> VMResult<Arc<Script>> {
         use hash_map::Entry::*;
         use ScriptStorageEntry::*;
 
@@ -226,14 +229,14 @@ mod test {
         let serialized_script = script(vec!["a"]);
         let hash_1 = script_hash(&serialized_script);
 
-        assert_ok!(code_storage.fetch_deserialized_script(&serialized_script));
+        assert_ok!(code_storage.deserialize_and_cache_script(&serialized_script));
         assert!(code_storage.matches(vec![hash_1], |e| matches!(e, Deserialized(..))));
         assert!(code_storage.matches(vec![], |e| matches!(e, Verified(..))));
 
         let serialized_script = script(vec!["b"]);
         let hash_2 = script_hash(&serialized_script);
 
-        assert_ok!(code_storage.fetch_deserialized_script(&serialized_script));
+        assert_ok!(code_storage.deserialize_and_cache_script(&serialized_script));
         assert!(code_storage.module_storage().does_not_have_cached_modules());
         assert!(code_storage.matches(vec![hash_1, hash_2], |e| matches!(e, Deserialized(..))));
         assert!(code_storage.matches(vec![], |e| matches!(e, Verified(..))));
@@ -254,12 +257,12 @@ mod test {
 
         let serialized_script = script(vec!["a"]);
         let hash = script_hash(&serialized_script);
-        assert_ok!(code_storage.fetch_deserialized_script(&serialized_script));
+        assert_ok!(code_storage.deserialize_and_cache_script(&serialized_script));
         assert!(code_storage.module_storage().does_not_have_cached_modules());
         assert!(code_storage.matches(vec![hash], |e| matches!(e, S::Deserialized(..))));
         assert!(code_storage.matches(vec![], |e| matches!(e, S::Verified(..))));
 
-        assert_ok!(code_storage.fetch_verified_script(&serialized_script));
+        assert_ok!(code_storage.verify_and_cache_script(&serialized_script));
 
         assert!(code_storage.matches(vec![], |e| matches!(e, S::Deserialized(..))));
         assert!(code_storage.matches(vec![hash], |e| matches!(e, S::Verified(..))));

third_party/move/move-vm/runtime/src/storage/implementations/unsync_module_storage.rs

@@ -237,7 +237,9 @@ impl<'e, B: ModuleBytesStorage> UnsyncModuleStorage<'e, B> {
 
         // Step 1: verify compiled module locally.
         let compiled_module = self.fetch_deserialized_module(address, module_name)?;
-        let size = self.fetch_module_size_in_bytes(address, module_name)?;
+        let size = self
+            .fetch_module_size_in_bytes(address, module_name)?
+            .ok_or_else(|| module_linker_error!(address, module_name))?;
         let partially_verified_module = self
             .runtime_environment
             .build_partially_verified_module(compiled_module, size)?;

third_party/move/move-vm/runtime/src/storage/loader.rs

@@ -82,7 +82,7 @@ impl LoaderV2 {
         traversal_context: &mut TraversalContext,
         serialized_script: &[u8],
     ) -> VMResult<()> {
-        let compiled_script = code_storage.fetch_deserialized_script(serialized_script)?;
+        let compiled_script = code_storage.deserialize_and_cache_script(serialized_script)?;
         let compiled_script = traversal_context.referenced_scripts.alloc(compiled_script);
 
         // TODO(Gas): Should we charge dependency gas for the script itself?
@@ -151,7 +151,7 @@ impl LoaderV2 {
     ) -> VMResult<LoadedFunction> {
         // Step 1: Load script. During the loading process, if script has not been previously
         // cached, it will be verified.
-        let script = code_storage.fetch_verified_script(serialized_script)?;
+        let script = code_storage.verify_and_cache_script(serialized_script)?;
 
         // Step 2: Load & verify types used as type arguments passed to this script. Note that
         // arguments for scripts are verified on the client side.