protocol: VM v0.22.1 compatibility fixes

Author: djolertrk

Cargo.lock

@@ -168,7 +168,7 @@ fn compile_tx_kernel(source_dir: &Path, target_dir: &Path, build_dir: &str) -> R
 
         let masb_file_path =
             target_dir.join("kernel_library").with_extension(Library::LIBRARY_EXTENSION);
-        test_lib.write_to_file(masb_file_path).into_diagnostic()?;
+        (*test_lib).write_to_file(masb_file_path).into_diagnostic()?;
     }
 
     Ok(assembler)
@@ -284,7 +284,7 @@ fn compile_protocol_lib(
     let output_file = target_dir.join("protocol").with_extension(Library::LIBRARY_EXTENSION);
     protocol_lib.write_to_file(output_file).into_diagnostic()?;
 
-    Ok(protocol_lib)
+    Ok(Arc::unwrap_or_clone(protocol_lib))
 }
 
 // HELPER FUNCTIONS

crates/miden-protocol/build.rs

@@ -289,7 +289,7 @@ impl AccountBuilder {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::LazyLock;
+    use std::sync::{Arc, LazyLock};
 
     use assert_matches::assert_matches;
     use miden_assembly::{Assembler, Library};
@@ -312,14 +312,18 @@ mod tests {
           ";
 
     static CUSTOM_LIBRARY1: LazyLock<Library> = LazyLock::new(|| {
-        Assembler::default()
-            .assemble_library([CUSTOM_CODE1])
-            .expect("code should be valid")
+        Arc::unwrap_or_clone(
+            Assembler::default()
+                .assemble_library([CUSTOM_CODE1])
+                .expect("code should be valid"),
+        )
     });
     static CUSTOM_LIBRARY2: LazyLock<Library> = LazyLock::new(|| {
-        Assembler::default()
-            .assemble_library([CUSTOM_CODE2])
-            .expect("code should be valid")
+        Arc::unwrap_or_clone(
+            Assembler::default()
+                .assemble_library([CUSTOM_CODE2])
+                .expect("code should be valid"),
+        )
     });
 
     static CUSTOM_COMPONENT1_SLOT_NAME: LazyLock<StorageSlotName> = LazyLock::new(|| {

crates/miden-protocol/src/account/builder/mod.rs

@@ -407,6 +407,8 @@ pub(crate) fn procedures_as_elements(procedures: &[AccountProcedureRoot]) -> Vec
 #[cfg(test)]
 mod tests {
 
+    use alloc::sync::Arc;
+
     use assert_matches::assert_matches;
     use miden_assembly::Assembler;
 
@@ -446,7 +448,8 @@ mod tests {
 
     #[test]
     fn test_account_code_no_auth_component() {
-        let library = Assembler::default().assemble_library([CODE]).unwrap();
+        let library =
+            Arc::unwrap_or_clone(Assembler::default().assemble_library([CODE]).unwrap());
         let metadata = AccountComponentMetadata::new("test::no_auth", AccountType::all());
         let component = AccountComponent::new(library, vec![], metadata).unwrap();
 
@@ -484,7 +487,9 @@ mod tests {
             end
         ";
 
-        let library = Assembler::default().assemble_library([code_with_multiple_auth]).unwrap();
+        let library = Arc::unwrap_or_clone(
+            Assembler::default().assemble_library([code_with_multiple_auth]).unwrap(),
+        );
         let metadata = AccountComponentMetadata::new("test::multiple_auth", AccountType::all());
         let component = AccountComponent::new(library, vec![], metadata).unwrap();