Remove CairoRunError::CairoPieValidation error

Author: Pedro Fontana

vm/src/cairo_run.rs

@@ -13,7 +13,6 @@ use crate::{
 
 use crate::Felt252;
 use bincode::enc::write::Writer;
-
 use thiserror_no_std::Error;
 
 #[cfg(feature = "arbitrary")]
@@ -126,7 +125,8 @@ pub fn cairo_run_pie(
     {
         return Err(RunnerError::PieNStepsVsRunResourcesNStepsMismatch.into());
     }
-    pie.run_validity_checks()?;
+    pie.run_validity_checks()
+        .map_err(|cairo_pie_err| CairoRunError::Runner(cairo_pie_err.into()))?;
     let secure_run = cairo_run_config.secure_run.unwrap_or(true);
 
     let allow_missing_builtins = cairo_run_config.allow_missing_builtins.unwrap_or_default();
@@ -170,7 +170,8 @@ pub fn cairo_run_pie(
         // Check that the Cairo PIE produced by this run is compatible with the Cairo PIE received
         cairo_runner
             .get_cairo_pie(&vm)?
-            .check_pie_compatibility(pie)?;
+            .check_pie_compatibility(pie)
+            .map_err(|cairo_pie_err| CairoRunError::Runner(cairo_pie_err.into()))?;
     }
     cairo_runner.relocate(&mut vm, cairo_run_config.relocate_mem)?;
 

vm/src/vm/errors/cairo_run_errors.rs

@@ -1,6 +1,5 @@
 use thiserror_no_std::Error;
 
-use super::cairo_pie_errors::CairoPieValidationError;
 use super::memory_errors::MemoryError;
 use super::vm_exception::VmException;
 use crate::types::errors::program_errors::ProgramError;
@@ -22,6 +21,4 @@ pub enum CairoRunError {
     MemoryError(#[from] MemoryError),
     #[error(transparent)]
     VmException(#[from] VmException),
-    #[error("Cairo Pie validation failed: {0}")]
-    CairoPieValidation(#[from] CairoPieValidationError),
 }

vm/src/vm/errors/runner_errors.rs

@@ -6,6 +6,7 @@ use crate::types::builtin_name::BuiltinName;
 use crate::types::layout_name::LayoutName;
 use thiserror_no_std::Error;
 
+use super::cairo_pie_errors::CairoPieValidationError;
 use super::{memory_errors::MemoryError, trace_errors::TraceError};
 use crate::types::{errors::math_errors::MathError, relocatable::Relocatable};
 use crate::Felt252;
@@ -132,6 +133,8 @@ pub enum RunnerError {
     CairoPieProofMode,
     #[error("{0}: Invalid additional data")]
     InvalidAdditionalData(BuiltinName),
+    #[error("Cairo Pie validation failed: {0}")]
+    CairoPieValidation(#[from] CairoPieValidationError),
 }
 
 #[cfg(test)]