cleanup

.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:

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<Item = S>> {
+pub struct ProgIterator<'ast, T, I: IntoIterator<Item = Statement<'ast, T>>> {
     pub module_map: ModuleMap,
     pub arguments: Vec<Parameter>,
     pub return_count: usize,
@@ -276,6 +274,7 @@ impl<'ast, T, I: IntoIterator<Item = Statement<'ast, T>>> ProgIterator<'ast, T,
             .map(|a| a.id)
             .collect()
     }
+
     pub fn public_inputs_values(&self, witness: &Witness<T>) -> Vec<T>
     where
         T: Field,

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);
 

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);