Skip to content

Commit

Permalink
Made error type for gas calculation contain inner error.
Browse files Browse the repository at this point in the history
commit-id:4dc3b5b4
  • Loading branch information
orizi committed Oct 20, 2024
1 parent a1a76db commit 225228e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/cairo-lang-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.8.4" }
cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.8.4" }
cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.8.4" }
cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "~2.8.4" }
cairo-lang-sierra-gas = { path = "../cairo-lang-sierra-gas", version = "~2.8.4" }
cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.8.4" }
cairo-lang-sierra-to-casm = { path = "../cairo-lang-sierra-to-casm", version = "~2.8.4" }
cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.8.4" }
Expand Down
8 changes: 5 additions & 3 deletions crates/cairo-lang-runner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use cairo_lang_sierra::ids::{ConcreteTypeId, GenericTypeId};
use cairo_lang_sierra::program::{Function, GenStatement, GenericArg, StatementIdx};
use cairo_lang_sierra::program_registry::{ProgramRegistry, ProgramRegistryError};
use cairo_lang_sierra_ap_change::ApChangeError;
use cairo_lang_sierra_gas::CostError;
use cairo_lang_sierra_to_casm::compiler::{CairoProgram, CompilationError, SierraToCasmConfig};
use cairo_lang_sierra_to_casm::metadata::{
Metadata, MetadataComputationConfig, MetadataError, calc_metadata, calc_metadata_ap_change_only,
Expand Down Expand Up @@ -62,9 +63,10 @@ pub enum RunnerError {
#[error("GasBuiltin is required while `available_gas` value is provided.")]
GasBuiltinRequired,
#[error(
"Failed calculating gas usage, it is likely a call for `gas::withdraw_gas` is missing."
"Failed calculating gas usage, it is likely a call for `gas::withdraw_gas` is missing. \
Inner error: {0}"
)]
FailedGasCalculation,
FailedGasCalculation(#[from] CostError),
#[error("Function with suffix `{suffix}` to run not found.")]
MissingFunction { suffix: String },
#[error("Function param {param_index} only partially contains argument {arg_index}.")]
Expand Down Expand Up @@ -881,6 +883,6 @@ fn create_metadata(
}
.map_err(|err| match err {
MetadataError::ApChangeError(err) => RunnerError::ApChangeError(err),
MetadataError::CostError(_) => RunnerError::FailedGasCalculation,
MetadataError::CostError(err) => RunnerError::FailedGasCalculation(err),
})
}

0 comments on commit 225228e

Please sign in to comment.