Quellcode durchsuchen

finished migration to new API for mint as well

narodnik vor 5 Jahren
Ursprung
Commit
c3cfc3e4dc
2 geänderte Dateien mit 7 neuen und 13 gelöschten Zeilen
  1. 0 1
      run_mint.sh
  2. 7 12
      src/bin/mint.rs

+ 0 - 1
run_mint.sh

@@ -1,6 +1,5 @@
 #!/bin/bash -x
 python scripts/preprocess.py proofs/mint2.psm > /tmp/mint2.psm || exit $?
-#python scripts/preprocess.py proofs/jubjub.psm > /tmp/mint2.psm || exit $?
 python scripts/compile.py --supervisor /tmp/mint2.psm --output mint.zcd || exit $?
 cargo run --release --bin mint
 

+ 7 - 12
src/bin/mint.rs

@@ -56,7 +56,7 @@ fn main() -> Result<()> {
         visor.vm.constraints.len()
     );
 
-    visor.vm.setup();
+    visor.setup();
 
     // We use the ExtendedPoint in calculations because it's faster
     let public_point = jubjub::ExtendedPoint::from(jubjub::SubgroupPoint::random(&mut OsRng));
@@ -84,19 +84,14 @@ fn main() -> Result<()> {
         )?;
     }
 
-    visor.vm.initialize(&visor.params.into_iter().collect());
+    let proof = visor.prove()?;
 
-    let proof = visor.vm.prove();
-
-    let public = visor.vm.public();
-
-    assert_eq!(public.len(), 2);
-    // 0x66ced46f14e5616d12b993f60a6e66558d6b6afe4c321ed212e0b9cfbd81061a
-    // 0x4731570fdd57cf280eadc8946fa00df81112502e44e497e794ab9a221f1bcca
-    println!("u = {:?}", public[0]);
-    println!("v = {:?}", public[1]);
+    assert_eq!(proof.public.len(), 2);
+    for (name, value) in &proof.public {
+        println!("Public {} = {:?}", name, value);
+    }
 
-    assert!(visor.vm.verify(&proof, &public));
+    assert!(visor.verify(&proof));
 
     Ok(())
 }