fix integration tests

zokrates_cli/src/bin.rs

@@ -197,8 +197,16 @@ fn cli() -> Result<(), String> {
             .takes_value(true)
             .required(false)
             .default_value(JSON_PROOF_PATH)
-        ).arg(Arg::with_name("meta-information")
+        ).arg(Arg::with_name("input")
             .short("i")
+            .long("input")
+            .help("Path of compiled code")
+            .value_name("FILE")
+            .takes_value(true)
+            .required(false)
+            .default_value(FLATTENED_CODE_DEFAULT_PATH)
+        ).arg(Arg::with_name("meta-information")
+            .short("m")
             .long("meta-information")
             .help("Path of file containing meta information for variable transformation")
             .value_name("FILE")
@@ -476,10 +484,17 @@ fn cli() -> Result<(), String> {
             let pk_path = sub_matches.value_of("provingkey").unwrap();
             let proof_path = sub_matches.value_of("proofpath").unwrap();
 
+            let program_path = Path::new(sub_matches.value_of("input").unwrap());
+            let mut program_file = File::open(&program_path)
+                .map_err(|why| format!("couldn't open {}: {}", program_path.display(), why))?;
+
+            let program: ir::Prog<FieldPrime> = deserialize_from(&mut program_file, Infinite)
+                .map_err(|why| format!("{:?}", why))?;
+
             // run libsnark
             println!(
                 "generate-proof successful: {:?}",
-                backend.generate_proof(witness, metadata, pk_path, proof_path)
+                backend.generate_proof(program, witness, metadata, pk_path, proof_path)
             );
         }
         _ => unreachable!(),

zokrates_cli/tests/integration.rs

@@ -199,11 +199,13 @@ mod integration {
                 assert_cli::Assert::command(&[
                     "../target/release/zokrates",
                     "generate-proof",
+                    "-i",
+                    flattened_path.to_str().unwrap(),
                     "-w",
                     witness_path.to_str().unwrap(),
                     "-p",
                     proving_key_path.to_str().unwrap(),
-                    "-i",
+                    "-m",
                     variable_information_path.to_str().unwrap(),
                     "--backend",
                     backend,

zokrates_core/src/proof_system/bn128/gm17.rs

@@ -83,6 +83,7 @@ impl ProofSystem for GM17 {
 
     fn generate_proof(
         &self,
+        _: ir::Prog<FieldPrime>,
         witness: ir::Witness<FieldPrime>,
         metadata: Metadata,
         pk_path: &str,

zokrates_core/src/proof_system/bn128/pghr13.rs

@@ -84,6 +84,7 @@ impl ProofSystem for PGHR13 {
 
     fn generate_proof(
         &self,
+        _: ir::Prog<FieldPrime>,
         witness: ir::Witness<FieldPrime>,
         metadata: Metadata,
         pk_path: &str,

zokrates_core/src/proof_system/mod.rs

@@ -1,4 +1,5 @@
 mod bn128;
+#[cfg(feature = "libsnark")]
 mod utils;
 
 use flat_absy::flat_variable::FlatVariable;
@@ -18,6 +19,7 @@ pub trait ProofSystem {
 
     fn generate_proof(
         &self,
+        program: ir::Prog<FieldPrime>,
         witness: ir::Witness<FieldPrime>,
         metadata: Metadata,
         pk_path: &str,