github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already

Browse source
This commit is contained in:
schaeff 2019-01-16 18:03:43 +01:00
parent 5c0b5e84ad
commit d0ae0402b8
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
zokrates_fs_resolver/src/lib.rs
View file

@ -26,7 +26,9 @@ fn resolve_with_location(
// other paths `abc/def.code` are interpreted relative to $ZOKRATES_HOME // other paths `abc/def.code` are interpreted relative to $ZOKRATES_HOME
let base = match source.components().next() { let base = match source.components().next() {
Some(Component::CurDir) | Some(Component::ParentDir) => PathBuf::from(location), 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)); let path = base.join(PathBuf::from(source));
@ -223,7 +225,7 @@ mod tests {
} }
#[test] #[test]
fn fail_if_no_std() { fn fail_if_not_found_in_std() {
std::env::set_var(ZOKRATES_HOME, ""); std::env::set_var(ZOKRATES_HOME, "");
let result = resolve( let result = resolve(
&Some("/path/to/source".to_string()), &Some("/path/to/source".to_string()),
@ -231,4 +233,14 @@ mod tests {
); );
assert!(result.is_err()); 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(),
);
}
} }