blockifier: refactor native class manager get runnable to be more readable

Author: ArniStarkware

crates/blockifier/src/state/global_cache.rs

@@ -52,6 +52,13 @@ impl CompiledClasses {
             }
         }
     }
+
+    #[cfg(feature = "cairo_native")]
+    /// Converts a [NativeCompiledClassV1] to a [CompiledClasses::V1].
+    /// Used when a non-native class is requested and the class is cached as a native class.
+    pub(crate) fn into_non_native_class(native: NativeCompiledClassV1) -> Self {
+        Self::V1(native.casm(), Arc::new(SierraContractClass::default()))
+    }
 }
 
 pub type RawClassCache = GlobalContractCache<CompiledClasses>;

crates/blockifier/src/state/native_class_manager.rs

@@ -119,23 +119,26 @@ impl NativeClassManager {
     /// Returns the runnable compiled class for the given class hash, if it exists in class_cache.
     pub fn get_runnable(&self, class_hash: &ClassHash) -> Option<RunnableCompiledClass> {
         let cached_class = self.class_cache.get(class_hash)?;
+        if let CompiledClasses::V1(..) = cached_class {
+            // When `wait_on_native_compilation` is active, all V1 classes should have been compiled
+            // to native synchronously. A V1 cache entry indicates a pipeline bug.
+            // TODO(Yoni): make sure `wait_on_native_compilation` cannot be set to true while
+            // `run_cairo_native` is false.
+            assert!(
+                !self.wait_on_native_compilation(),
+                "Manager did not wait on native compilation."
+            );
+        }
 
         let cached_class = match cached_class {
-            CompiledClasses::V1(_, _) => {
-                // TODO(Yoni): make sure `wait_on_native_compilation` cannot be set to true while
-                // `run_cairo_native` is false.
-                assert!(
-                    !self.wait_on_native_compilation(),
-                    "Manager did not wait on native compilation."
-                );
-                cached_class
-            }
             CompiledClasses::V1Native(CachedCairoNative::Compiled(native))
                 if !self.run_class_with_cairo_native(class_hash) =>
             {
-                CompiledClasses::V1(native.casm(), Arc::new(SierraContractClass::default()))
+                CompiledClasses::into_non_native_class(native)
+            }
+            CompiledClasses::V1Native(..) | CompiledClasses::V1(..) | CompiledClasses::V0(..) => {
+                cached_class
             }
-            _ => cached_class,
         };
 
         Some(cached_class.to_runnable())