Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove a buch of unwrap #47

Merged
merged 2 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ pub enum SnOsError {
Runner(CairoRunError),
#[error("SnOs Output Error: {0}")]
Output(String),
#[error(transparent)]
IO(#[from] std::io::Error),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
}

#[derive(thiserror::Error, Clone, Debug)]
Expand Down
7 changes: 5 additions & 2 deletions src/hints/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,12 @@ pub fn starknet_os_input(
ap_tracking: &ApTracking,
_constants: &HashMap<String, Felt252>,
) -> Result<(), HintError> {
let input_path = exec_scopes.get::<String>("input_path").unwrap_or(DEFAULT_INPUT_PATH.to_string());
let input_path =
std::path::PathBuf::from(exec_scopes.get::<String>("input_path").unwrap_or(DEFAULT_INPUT_PATH.to_string()));

let os_input = Box::new(StarknetOsInput::load(&input_path));
let os_input = Box::new(
StarknetOsInput::load(&input_path).map_err(|e| HintError::CustomHint(e.to_string().into_boxed_str()))?,
);
exec_scopes.assign_or_update_variable("os_input", os_input);

let initial_carried_outputs_ptr = get_ptr_from_var_name("initial_carried_outputs", vm, ids_data, ap_tracking)?;
Expand Down
18 changes: 10 additions & 8 deletions src/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ pub struct StarknetOsInput {
}

impl StarknetOsInput {
pub fn load(path: &str) -> Self {
let raw_input = fs::read_to_string(path::PathBuf::from(path)).unwrap();
serde_json::from_str(&raw_input).unwrap()
pub fn load(path: &path::Path) -> Result<Self, SnOsError> {
let raw_input = fs::read_to_string(path)?;
let input = serde_json::from_str(&raw_input)?;

Ok(input)
}
pub fn dump(&self, path: &str) -> Result<(), SnOsError> {
fs::File::create(path)
.unwrap()
.write_all(&serde_json::to_vec(&self).unwrap())
.map_err(|e| SnOsError::CatchAll(format!("{e}")))

pub fn dump(&self, path: &path::Path) -> Result<(), SnOsError> {
fs::File::create(path)?.write_all(&serde_json::to_vec(&self)?)?;

Ok(())
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn load_and_write_input() {
#[fixture]
#[once]
pub fn load_input(_load_and_write_input: ()) -> StarknetOsInput {
StarknetOsInput::load(DEFAULT_INPUT_PATH)
StarknetOsInput::load(std::path::Path::new(DEFAULT_INPUT_PATH)).unwrap()
}

#[fixture]
Expand Down