ZKP tweaks

.github/workflows/rust.yml

@@ -42,26 +42,10 @@ jobs:
       run: cargo fmt --check
     # Build and run the tests
     - name: Build and run tests
-      run: cargo test --verbose --release
-    # Run our non-interactive examples and assert the complete without error
-    - name: Verify examples (amm)
-      run: cargo run --release --bin amm
-    - name: Verify examples (bigint)
-      run: cargo run --release --bin bigint
-    - name: Verify examples (chi_sq)
-      run: cargo run --release --bin chi_sq
-    - name: Verify examples (dot_prod)
-      run: cargo run --release --bin dot_prod
-    - name: Verify examples (mean_variance)
-      run: cargo run --release --bin mean_variance
-    - name: Verify examples (ordering_zkp)
-      run: cargo run --release --bin ordering_zkp
-    - name: Verify examples (pir)
-      run: cargo run --release --bin pir
-    - name: Verify examples (simple_multiply)
-      run: cargo run --release --bin simple_multiply
-    - name: Verify examples (sudoku_zkp)
-      run: cargo run --release --bin sudoku_zkp
+      run: cargo test --workspace --verbose --release
+    - name: Verify examples outside of workspace (allowlist_zkp)
+      run: cargo test --workspace --verbose
+      working-directory: ./examples/allowlist_zkp
     - name: Build sunscreen and bincode
       run: cargo build --release --package sunscreen --package bincode
     - name: Build mdBook

Cargo.toml

@@ -19,11 +19,8 @@ members = [
     "sunscreen_compiler_common",
     "sunscreen_zkp_backend",
 ]
-exclude = [
-    "mdBook",
-    "rust-playground"
-]
+exclude = ["mdBook", "rust-playground", "examples/allowlist_zkp"]
 
 [profile.release]
-split-debuginfo="packed"
-debug=true
+split-debuginfo = "packed"
+debug = true

benchmarks/bfv_zkp/src/bfv.rs

@@ -358,7 +358,7 @@ pub fn prove_public_encryption(
     encryption_data: &(Ciphertext, Noise, Poly),
     public_key: &PublicKey,
 ) -> Proof {
-    let runtime = Runtime::new_zkp(&BulletproofsBackend::new()).unwrap();
+    let runtime = Runtime::new_zkp(BulletproofsBackend::new()).unwrap();
 
     let prog = app.get_zkp_program(prove_enc).unwrap();
 
@@ -377,7 +377,7 @@ pub fn prove_public_encryption(
     let const_args = public_bfv_proof_params(&ciphertext, public_key);
 
     runtime
-        .prove(prog, const_args, vec![], private_args)
+        .prove(prog, private_args, vec![], const_args)
         .unwrap()
 }
 
@@ -387,13 +387,13 @@ pub fn verify_public_encryption(
     ciphertext: &Ciphertext,
     public_key: &PublicKey,
 ) {
-    let runtime = Runtime::new_zkp(&BulletproofsBackend::new()).unwrap();
+    let runtime = Runtime::new_zkp(BulletproofsBackend::new()).unwrap();
 
     let const_args = public_bfv_proof_params(ciphertext, public_key);
 
     let program = app.get_zkp_program(prove_enc).unwrap();
 
-    runtime.verify(program, proof, const_args, vec![]).unwrap();
+    runtime.verify(program, proof, vec![], const_args).unwrap();
 }
 
 #[test]

examples/allowlist_zkp/.gitignore

@@ -0,0 +1 @@
+/target