respond to comments

Author: tzakian

external-crates/move/crates/move-vm-runtime/src/native_functions.rs

@@ -163,40 +163,30 @@ impl<'b> NativeContext<'_, 'b> {
     // used in test scenarios so we have some special knowledge that makes this work. In the new VM
     // however this is _MUCH_ nicer as we don't need to pass the datastore as the VM's linkage
     // tables must have the type present.
-    pub fn type_tag_to_fully_annotated_layout(
+    pub fn type_tag_to_fully_annotated_layout_for_test_scenario_only(
         &self,
         tag: &TypeTag,
         store: &impl DataStore,
-    ) -> PartialVMResult<Option<A::MoveTypeLayout>> {
-        match self
-            .resolver
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        self.resolver
             .loader()
             .get_fully_annotated_type_layout(tag, store)
-        {
-            Ok(ty_layout) => Ok(Some(ty_layout)),
-            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => {
-                Err(e.to_partial())
-            }
-            Err(_) => Ok(None),
-        }
+            .map_err(|e| e.to_partial())
     }
 
     // TODO: This is a bit hacky right now since we need to pass the store, however this is only
     // used in test scenarios so we have some special knowledge that makes this work. In the new VM
     // however this is _MUCH_ nicer as we don't need to pass the datastore as the VM's linkage
     // tables must have the type present.
-    pub fn type_tag_to_layout(
+    pub fn type_tag_to_layout_for_test_scenario_only(
         &self,
         tag: &TypeTag,
         store: &impl DataStore,
-    ) -> PartialVMResult<Option<R::MoveTypeLayout>> {
-        match self.resolver.loader().get_type_layout(tag, store) {
-            Ok(ty_layout) => Ok(Some(ty_layout)),
-            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => {
-                Err(e.to_partial())
-            }
-            Err(_) => Ok(None),
-        }
+    ) -> PartialVMResult<R::MoveTypeLayout> {
+        self.resolver
+            .loader()
+            .get_type_layout(tag, store)
+            .map_err(|e| e.to_partial())
     }
 
     pub fn type_to_abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {

sui-execution/latest/sui-move-natives/src/test_scenario.rs

@@ -1007,13 +1007,15 @@ fn find_all_wrapped_objects<'a, 'i>(
         // associated with all of these types must be in the type/module cache in the VM -- THIS IS
         // BECAUSE WE ARE IN TEST SCENARIO ONLY AND THIS DOES NOT GENERALLY HOLD IN A
         // MULTI-TRANSACTION SETTING.
-        let Ok(Some(layout)) = context.type_tag_to_layout(&type_tag, &EmptyDataStore) else {
+        let Ok(layout) =
+            context.type_tag_to_layout_for_test_scenario_only(&type_tag, &EmptyDataStore)
+        else {
             debug_assert!(false);
             continue;
         };
 
-        let Ok(Some(annotated_layout)) =
-            context.type_tag_to_fully_annotated_layout(&type_tag, &EmptyDataStore)
+        let Ok(annotated_layout) = context
+            .type_tag_to_fully_annotated_layout_for_test_scenario_only(&type_tag, &EmptyDataStore)
         else {
             debug_assert!(false);
             continue;