From d0ae0402b86f26414a013ce896f390418513534d Mon Sep 17 00:00:00 2001 From: schaeff Date: Wed, 16 Jan 2019 18:03:43 +0100 Subject: [PATCH] recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already --- zokrates_fs_resolver/src/lib.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/zokrates_fs_resolver/src/lib.rs b/zokrates_fs_resolver/src/lib.rs index dc73abfb..d24b396b 100644 --- a/zokrates_fs_resolver/src/lib.rs +++ b/zokrates_fs_resolver/src/lib.rs @@ -26,7 +26,9 @@ fn resolve_with_location( // other paths `abc/def.code` are interpreted relative to $ZOKRATES_HOME let base = match source.components().next() { Some(Component::CurDir) | Some(Component::ParentDir) => PathBuf::from(location), - _ => PathBuf::from(std::env::var(ZOKRATES_HOME).unwrap_or("".to_string())), + _ => PathBuf::from( + std::env::var(ZOKRATES_HOME).expect("$ZOKRATES_HOME is not set, please set it"), + ), }; let path = base.join(PathBuf::from(source)); @@ -223,7 +225,7 @@ mod tests { } #[test] - fn fail_if_no_std() { + fn fail_if_not_found_in_std() { std::env::set_var(ZOKRATES_HOME, ""); let result = resolve( &Some("/path/to/source".to_string()), @@ -231,4 +233,14 @@ mod tests { ); assert!(result.is_err()); } + + #[test] + #[should_panic] + fn panic_if_home_not_set() { + std::env::remove_var(ZOKRATES_HOME); + let _ = resolve( + &Some("/path/to/source".to_string()), + &"bar.code".to_string(), + ); + } }