diff --git a/src/storage_proofs.rs b/src/storage_proofs.rs index 54c4a0c..816fdca 100644 --- a/src/storage_proofs.rs +++ b/src/storage_proofs.rs @@ -13,7 +13,7 @@ use ruint::aliases::U256; use rmpv; use rmpv::decode::read_value; -type CircomBuilderParams = CircomBuilder>; +type Params256Ty = ark_ec::bn::Bn; const EXT_ID_U256_LE: i8 = 50; const EXT_ID_U256_BE: i8 = 51; @@ -108,7 +108,7 @@ impl StorageProofs { pub fn proof_build_inputs( &mut self, mut inputs: &[u8] - ) -> Result>, String> { + ) -> Result, String> { let values: rmpv::Value = read_value(&mut inputs).map_err(|e| e.to_string())?; let args: &Vec<(rmpv::Value, rmpv::Value)> = match values.as_map() { @@ -116,7 +116,7 @@ impl StorageProofs { None => return Err("args must be a map of string to arrays".to_string()), }; - let mut builder: CircomBuilderParams = self.builder.clone(); + let mut builder: CircomBuilder = self.builder.clone(); for (key, val) in args { let name = match key.as_str() { Some(n) => n, @@ -156,15 +156,15 @@ impl StorageProofs { } } - let circuit: CircomCircuit> = builder.build() + let circuit: CircomCircuit = builder.build() .map_err(|e| e.to_string())?; Ok(circuit) } - pub fn proof_run( + pub fn prove_run( &mut self, - circuit: CircomCircuit>, + circuit: CircomCircuit, proof_bytes: &mut Vec, public_inputs_bytes: &mut Vec, ) -> Result<(), String> {