narodnik 5 лет назад
Родитель
Сommit
edb07be158
3 измененных файлов с 28 добавлено и 50 удалено
  1. 4 1
      src/bin/mint.rs
  2. 0 1
      src/lib.rs
  3. 24 48
      src/vm_serial.rs

+ 4 - 1
src/bin/mint.rs

@@ -21,7 +21,10 @@ fn main() -> Result<()> {
     println!("    Constants: {}", visor.vm.constants.len());
     println!("    Alloc: {}", visor.vm.alloc.len());
     println!("    Operations: {}", visor.vm.ops.len());
-    println!("    Constraint Instructions: {}", visor.vm.constraints.len());
+    println!(
+        "    Constraint Instructions: {}",
+        visor.vm.constraints.len()
+    );
 
     visor.vm.setup();
 

+ 0 - 1
src/lib.rs

@@ -72,4 +72,3 @@ impl ZKSupervisor {
         // takes proof and public values
     }
 }
-

+ 24 - 48
src/vm_serial.rs

@@ -21,12 +21,9 @@ impl Decodable for ZKSupervisor {
             name: Decodable::decode(&mut d)?,
             vm: ZKVirtualMachine {
                 constants: Decodable::decode(&mut d)?,
-                alloc: 
-                    Decodable::decode(&mut d)?,
-                ops: 
-                    Decodable::decode(&mut d)?,
-                constraints: 
-                    Decodable::decode(&mut d)?,
+                alloc: Decodable::decode(&mut d)?,
+                ops: Decodable::decode(&mut d)?,
+                constraints: Decodable::decode(&mut d)?,
 
                 aux: Vec::new(),
                 params: None,
@@ -155,57 +152,36 @@ impl Decodable for ConstraintInstruction {
     fn decode<D: io::Read>(mut d: D) -> Result<Self> {
         let constraint_type = ReadExt::read_u8(&mut d)?;
         match constraint_type {
-            0 =>
-                Ok(Self::Lc0Add(Decodable::decode(&mut d)?)),
-            1 =>
-                Ok(Self::Lc1Add(Decodable::decode(&mut d)?)),
-            2 =>
-                Ok(Self::Lc2Add(Decodable::decode(&mut d)?)),
-            3 =>
-                Ok(Self::Lc0Sub(Decodable::decode(&mut d)?)),
-            4 =>
-                Ok(Self::Lc1Sub(Decodable::decode(&mut d)?)),
-            5 =>
-                Ok(Self::Lc2Sub(Decodable::decode(&mut d)?)),
-            6 =>
-                Ok(Self::Lc0AddOne),
-            7 =>
-                Ok(Self::Lc1AddOne),
-            8 =>
-                Ok(Self::Lc2AddOne),
-            9 =>
-                Ok(Self::Lc0SubOne),
-            10 =>
-                Ok(Self::Lc1SubOne),
-            11 =>
-                Ok(Self::Lc2SubOne),
-            12 =>
-                Ok(Self::Lc0AddCoeff(
+            0 => Ok(Self::Lc0Add(Decodable::decode(&mut d)?)),
+            1 => Ok(Self::Lc1Add(Decodable::decode(&mut d)?)),
+            2 => Ok(Self::Lc2Add(Decodable::decode(&mut d)?)),
+            3 => Ok(Self::Lc0Sub(Decodable::decode(&mut d)?)),
+            4 => Ok(Self::Lc1Sub(Decodable::decode(&mut d)?)),
+            5 => Ok(Self::Lc2Sub(Decodable::decode(&mut d)?)),
+            6 => Ok(Self::Lc0AddOne),
+            7 => Ok(Self::Lc1AddOne),
+            8 => Ok(Self::Lc2AddOne),
+            9 => Ok(Self::Lc0SubOne),
+            10 => Ok(Self::Lc1SubOne),
+            11 => Ok(Self::Lc2SubOne),
+            12 => Ok(Self::Lc0AddCoeff(
                 Decodable::decode(&mut d)?,
                 Decodable::decode(&mut d)?,
             )),
-            13 =>
-                Ok(Self::Lc1AddCoeff(
+            13 => Ok(Self::Lc1AddCoeff(
                 Decodable::decode(&mut d)?,
                 Decodable::decode(&mut d)?,
             )),
-            14 =>
-                Ok(Self::Lc2AddCoeff(
+            14 => Ok(Self::Lc2AddCoeff(
                 Decodable::decode(&mut d)?,
                 Decodable::decode(&mut d)?,
             )),
-            15 =>
-                Ok(Self::Lc0AddOneCoeff(Decodable::decode(&mut d)?)),
-            16 =>
-                Ok(Self::Lc1AddOneCoeff(Decodable::decode(&mut d)?)),
-            17 =>
-                Ok(Self::Lc2AddOneCoeff(Decodable::decode(&mut d)?)),
-            18 =>
-                Ok(Self::Enforce),
-            19 =>
-                Ok(Self::LcCoeffReset),
-            20 =>
-                Ok(Self::LcCoeffDouble),
+            15 => Ok(Self::Lc0AddOneCoeff(Decodable::decode(&mut d)?)),
+            16 => Ok(Self::Lc1AddOneCoeff(Decodable::decode(&mut d)?)),
+            17 => Ok(Self::Lc2AddOneCoeff(Decodable::decode(&mut d)?)),
+            18 => Ok(Self::Enforce),
+            19 => Ok(Self::LcCoeffReset),
+            20 => Ok(Self::LcCoeffDouble),
             _ => Err(Error::BadConstraintType),
         }
     }