adapt after rebasing the branch to main latest changes

Author: arnaucube

src/backends/plonky2/mainpod/mod.rs

@@ -13,10 +13,8 @@ pub use statement::*;
 
 use crate::{
     backends::plonky2::{
-        basetypes::{Proof, ProofWithPublicInputs, VerifierOnlyCircuitData, D, DEFAULT_VD_TREE},
-        circuits::mainpod::{
-            CustomPredicateVerification, MainPodVerifyInput, MainPodVerifyTarget, NUM_PUBLIC_INPUTS,
-        },
+        basetypes::{Proof, ProofWithPublicInputs, VerifierOnlyCircuitData, D},
+        circuits::mainpod::{CustomPredicateVerification, MainPodVerifyInput, MainPodVerifyTarget},
         deserialize_proof,
         emptypod::EmptyPod,
         error::{Error, Result},

src/backends/plonky2/mock/mainpod.rs

@@ -19,8 +19,7 @@ use crate::{
     },
     middleware::{
         self, hash_str, AnchoredKey, DynError, Hash, MainPodInputs, NativePredicate, Params, Pod,
-        PodId, PodProver, PodType, Predicate, RecursivePod, StatementArg, VDSet, VDTree, KEY_TYPE,
-        SELF,
+        PodId, PodProver, PodType, Predicate, RecursivePod, StatementArg, VDSet, KEY_TYPE, SELF,
     },
 };
 

src/frontend/serialization.rs

@@ -112,7 +112,7 @@ mod tests {
         middleware::{
             self,
             containers::{Array, Dictionary, Set},
-            Params, RawValue, TypedValue, DEFAULT_VD_SET, DEFAULT_VD_TREE,
+            Params, RawValue, TypedValue, DEFAULT_VD_SET,
         },
     };
 

src/lang/processor.rs

@@ -659,17 +659,22 @@ fn process_literal_value(lit_val_pair: &Pair<Rule>) -> Result<Value, ProcessorEr
                 .into_inner()
                 .map(|elem_pair| process_literal_value(&elem_pair))
                 .collect();
-            let middleware_array = middleware::containers::Array::new(elements?)
-                .map_err(|e| ProcessorError::Internal(format!("Failed to create Array: {}", e)))?;
+            let middleware_array =
+                middleware::containers::Array::new(crate::constants::MAX_DEPTH, elements?)
+                    .map_err(|e| {
+                        ProcessorError::Internal(format!("Failed to create Array: {}", e))
+                    })?;
             Ok(Value::from(middleware_array))
         }
         Rule::literal_set => {
             let elements: Result<HashSet<Value>, ProcessorError> = inner_lit
                 .into_inner()
                 .map(|elem_pair| process_literal_value(&elem_pair))
                 .collect();
-            let middleware_set = middleware::containers::Set::new(elements?)
-                .map_err(|e| ProcessorError::Internal(format!("Failed to create Set: {}", e)))?;
+            let middleware_set =
+                middleware::containers::Set::new(crate::constants::MAX_DEPTH, elements?).map_err(
+                    |e| ProcessorError::Internal(format!("Failed to create Set: {}", e)),
+                )?;
             Ok(Value::from(middleware_set))
         }
         Rule::literal_dict => {
@@ -684,9 +689,11 @@ fn process_literal_value(lit_val_pair: &Pair<Rule>) -> Result<Value, ProcessorEr
                     Ok((Key::new(key_str), val))
                 })
                 .collect();
-            let middleware_dict = middleware::containers::Dictionary::new(pairs?).map_err(|e| {
-                ProcessorError::Internal(format!("Failed to create Dictionary: {}", e))
-            })?;
+            let middleware_dict =
+                middleware::containers::Dictionary::new(crate::constants::MAX_DEPTH, pairs?)
+                    .map_err(|e| {
+                        ProcessorError::Internal(format!("Failed to create Dictionary: {}", e))
+                    })?;
             Ok(Value::from(middleware_dict))
         }
         _ => unreachable!("Unexpected rule: {:?}", inner_lit.as_rule()),