Make fields clonable

Author: JulianGCalderon

vm/src/types/instance_definitions/builtins_instance_def.rs

@@ -13,7 +13,7 @@ pub(crate) const BUILTIN_INSTANCES_PER_COMPONENT: u32 = 1;
 
 use serde::Serialize;
 
-#[derive(Serialize, Debug, PartialEq)]
+#[derive(Clone, Serialize, Debug, PartialEq)]
 pub(crate) struct BuiltinsInstanceDef {
     pub(crate) output: bool,
     pub(crate) pedersen: Option<PedersenInstanceDef>,

vm/src/types/instance_definitions/diluted_pool_instance_def.rs

@@ -1,6 +1,6 @@
 use serde::Serialize;
 
-#[derive(Serialize, Debug, PartialEq)]
+#[derive(Clone, Serialize, Debug, PartialEq)]
 pub(crate) struct DilutedPoolInstanceDef {
     pub(crate) units_per_step: u32, // 2 ^ log_units_per_step (for cairo_lang comparison)
     pub(crate) fractional_units_per_step: bool, // true when log_units_per_step is negative

vm/src/types/instance_definitions/range_check_instance_def.rs

@@ -3,7 +3,7 @@ use serde::Serialize;
 use super::LowRatio;
 pub(crate) const CELLS_PER_RANGE_CHECK: u32 = 1;
 
-#[derive(Serialize, Debug, PartialEq)]
+#[derive(Clone, Serialize, Debug, PartialEq)]
 pub(crate) struct RangeCheckInstanceDef {
     pub(crate) ratio: Option<LowRatio>,
 }

vm/src/types/layout.rs

@@ -13,7 +13,7 @@ pub(crate) const DEFAULT_CPU_COMPONENT_STEP: u32 = 1;
 
 use serde::{Deserialize, Deserializer, Serialize};
 
-#[derive(Serialize, Debug)]
+#[derive(Clone, Serialize, Debug)]
 pub struct CairoLayout {
     pub(crate) name: LayoutName,
     pub(crate) cpu_component_step: u32,

vm/src/vm/runners/builtin_runner/range_check.rs

@@ -3,6 +3,7 @@ use crate::{
     stdlib::{
         cmp::{max, min},
         prelude::*,
+        rc::Rc,
     },
     types::{builtin_name::BuiltinName, instance_definitions::LowRatio},
 };
@@ -106,7 +107,7 @@ impl<const N_PARTS: u64> RangeCheckBuiltinRunner<N_PARTS> {
     }
 
     pub fn add_validation_rule(&self, memory: &mut Memory) {
-        let rule = ValidationRule(Box::new(
+        let rule = ValidationRule(Rc::new(
             |memory: &Memory, address: Relocatable| -> Result<Vec<Relocatable>, MemoryError> {
                 let num = memory
                     .get_integer(address)

vm/src/vm/runners/builtin_runner/signature.rs

@@ -96,7 +96,7 @@ impl SignatureBuiltinRunner {
     pub fn add_validation_rule(&self, memory: &mut Memory) {
         let cells_per_instance = CELLS_PER_SIGNATURE;
         let signatures = Rc::clone(&self.signatures);
-        let rule: ValidationRule = ValidationRule(Box::new(
+        let rule: ValidationRule = ValidationRule(Rc::new(
             move |memory: &Memory, addr: Relocatable| -> Result<Vec<Relocatable>, MemoryError> {
                 let cell_index = addr.offset % cells_per_instance as usize;
 

vm/src/vm/vm_memory/memory.rs

@@ -1,4 +1,4 @@
-use crate::stdlib::{borrow::Cow, collections::HashMap, fmt, prelude::*};
+use crate::stdlib::{borrow::Cow, collections::HashMap, fmt, prelude::*, rc::Rc};
 
 use crate::types::errors::math_errors::MathError;
 use crate::vm::runners::cairo_pie::CairoPieMemory;
@@ -12,9 +12,10 @@ use bitvec::prelude as bv;
 use core::cmp::Ordering;
 use num_traits::ToPrimitive;
 
+#[derive(Clone)]
 pub struct ValidationRule(
     #[allow(clippy::type_complexity)]
-    pub  Box<dyn Fn(&Memory, Relocatable) -> Result<Vec<Relocatable>, MemoryError>>,
+    pub  Rc<dyn Fn(&Memory, Relocatable) -> Result<Vec<Relocatable>, MemoryError>>,
 );
 
 /// [`MemoryCell`] represents an optimized storage layout for the VM memory.
@@ -106,6 +107,7 @@ impl From<MemoryCell> for MaybeRelocatable {
     }
 }
 
+#[derive(Clone)]
 pub struct AddressSet(Vec<bv::BitVec>);
 
 impl AddressSet {
@@ -156,6 +158,7 @@ impl AddressSet {
     }
 }
 
+#[derive(Clone)]
 pub struct Memory {
     pub(crate) data: Vec<Vec<MemoryCell>>,
     /// Temporary segments are used when it's necessary to write data, but we

vm/src/vm/vm_memory/memory_segments.rs

@@ -20,6 +20,7 @@ use crate::{
 
 use super::memory::MemoryCell;
 
+#[derive(Clone)]
 pub struct MemorySegmentManager {
     pub segment_sizes: HashMap<usize, usize>,
     pub segment_used_sizes: Option<Vec<usize>>,