diff --git a/.circleci/config.yml b/.circleci/config.yml index c45c1507..08cdc0a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,6 +22,7 @@ jobs: - restore-sccache-cache - run: name: Build + no_output_timeout: "30m" command: RUSTFLAGS="-D warnings" ./build.sh - save-sccache-cache test: diff --git a/zokrates_ast/src/ir/mod.rs b/zokrates_ast/src/ir/mod.rs index 279e231f..46c99b13 100644 --- a/zokrates_ast/src/ir/mod.rs +++ b/zokrates_ast/src/ir/mod.rs @@ -208,10 +208,8 @@ impl<'ast, T: Field> fmt::Display for Statement<'ast, T> { } } -pub type ProgIterator<'ast, T, I> = GProgIterator<'ast, T, Statement<'ast, T>, I>; - #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] -pub struct GProgIterator<'ast, T, S, I: IntoIterator> { +pub struct ProgIterator<'ast, T, I: IntoIterator>> { pub module_map: ModuleMap, pub arguments: Vec, pub return_count: usize, @@ -276,6 +274,7 @@ impl<'ast, T, I: IntoIterator>> ProgIterator<'ast, T, .map(|a| a.id) .collect() } + pub fn public_inputs_values(&self, witness: &Witness) -> Vec where T: Field, diff --git a/zokrates_cli/src/ops/nova/prove.rs b/zokrates_cli/src/ops/nova/prove.rs index 48647873..6ffc6cb1 100644 --- a/zokrates_cli/src/ops/nova/prove.rs +++ b/zokrates_cli/src/ops/nova/prove.rs @@ -74,7 +74,7 @@ pub fn exec(sub_matches: &ArgMatches) -> Result<(), String> { // read compiled program let path = Path::new(sub_matches.value_of("input").unwrap()); let file = - File::open(path).map_err(|why| format!("Could not open `{}`: {}", path.display(), why))?; + File::open(path).map_err(|why| format!("Could not open {}: {}", path.display(), why))?; let mut reader = BufReader::new(file); diff --git a/zokrates_cli/src/ops/nova/setup.rs b/zokrates_cli/src/ops/nova/setup.rs index 87f10897..9381f1bc 100644 --- a/zokrates_cli/src/ops/nova/setup.rs +++ b/zokrates_cli/src/ops/nova/setup.rs @@ -35,7 +35,7 @@ pub fn exec(sub_matches: &ArgMatches) -> Result<(), String> { // read compiled program let path = Path::new(sub_matches.value_of("input").unwrap()); let file = - File::open(path).map_err(|why| format!("Could not open `{}`: {}", path.display(), why))?; + File::open(path).map_err(|why| format!("Could not open {}: {}", path.display(), why))?; let mut reader = BufReader::new(file);