chore: cargo fmt

noir-lang · May 19, 2024 · c99826f · c99826f
1 parent 94fa251
commit c99826f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 32 deletions.
diff --git a/acvm-repo/acvm_js/src/execute.rs b/acvm-repo/acvm_js/src/execute.rs
@@ -47,12 +47,9 @@ pub async fn execute_circuit(
 ) -> Result<JsWitnessMap, Error> {
     console_error_panic_hook::set_once();
 
-    let mut witness_stack = execute_program_with_native_type_return(
-        program,
-        initial_witness,
-        &foreign_call_handler,
-    )
-    .await?;
+    let mut witness_stack =
+        execute_program_with_native_type_return(program, initial_witness, &foreign_call_handler)
+            .await?;
     let witness_map =
         witness_stack.pop().expect("Should have at least one witness on the stack").witness;
     Ok(witness_map.into())
@@ -111,12 +108,9 @@ pub async fn execute_circuit_with_black_box_solver(
 ) -> Result<JsWitnessMap, Error> {
     console_error_panic_hook::set_once();
 
-    let mut witness_stack = execute_program_with_native_type_return(
-        program,
-        initial_witness,
-        &foreign_call_handler,
-    )
-    .await?;
+    let mut witness_stack =
+        execute_program_with_native_type_return(program, initial_witness, &foreign_call_handler)
+            .await?;
     let witness_map =
         witness_stack.pop().expect("Should have at least one witness on the stack").witness;
     Ok(witness_map.into())
@@ -143,12 +137,9 @@ pub async fn execute_program_with_black_box_solver(
     initial_witness: JsWitnessMap,
     foreign_call_executor: &ForeignCallHandler,
 ) -> Result<JsWitnessStack, Error> {
-    let witness_stack = execute_program_with_native_type_return(
-        program,
-        initial_witness,
-        foreign_call_executor,
-    )
-    .await?;
+    let witness_stack =
+        execute_program_with_native_type_return(program, initial_witness, foreign_call_executor)
+            .await?;
 
     Ok(witness_stack.into())
 }
@@ -164,12 +155,8 @@ async fn execute_program_with_native_type_return(
         None,
         None))?;
 
-    execute_program_with_native_program_and_return(
-        &program,
-        initial_witness,
-        foreign_call_executor,
-    )
-    .await
+    execute_program_with_native_program_and_return(&program, initial_witness, foreign_call_executor)
+        .await
 }
 
 async fn execute_program_with_native_program_and_return(

diff --git a/acvm-repo/bn254_blackbox_solver/src/lib.rs b/acvm-repo/bn254_blackbox_solver/src/lib.rs
@@ -15,7 +15,6 @@ use ark_ec::AffineRepr;
 pub use embedded_curve_ops::{embedded_curve_add, multi_scalar_mul};
 pub use poseidon2::poseidon2_permutation;
 
-
 #[derive(Default)]
 pub struct Bn254BlackBoxSolver;
 
@@ -30,8 +29,13 @@ impl BlackBoxFunctionSolver for Bn254BlackBoxSolver {
         let sig_s: [u8; 32] = signature[0..32].try_into().unwrap();
         let sig_e: [u8; 32] = signature[32..64].try_into().unwrap();
 
-        Ok(schnorr::verify_signature(public_key_x.into_repr(),
-        public_key_y.into_repr(), sig_s, sig_e, message))
+        Ok(schnorr::verify_signature(
+            public_key_x.into_repr(),
+            public_key_y.into_repr(),
+            sig_s,
+            sig_e,
+            message,
+        ))
     }
 
     fn pedersen_commitment(

diff --git a/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs b/acvm-repo/bn254_blackbox_solver/src/schnorr/mod.rs
@@ -3,7 +3,7 @@ use ark_ec::{
     short_weierstrass::{Affine, SWCurveConfig},
     AffineRepr, CurveConfig, CurveGroup,
 };
-use ark_ff::{PrimeField, Zero, BigInteger};
+use ark_ff::{BigInteger, PrimeField, Zero};
 use grumpkin::{Fq, GrumpkinParameters};
 
 pub(crate) fn verify_signature(
@@ -15,13 +15,18 @@ pub(crate) fn verify_signature(
 ) -> bool {
     let pub_key = Affine::<GrumpkinParameters>::new_unchecked(pub_key_x, pub_key_y);
 
-    // TODO: Check for correct subgroup isn't done in Barretenberg, is it necessary? 
-    if !pub_key.is_on_curve() || !pub_key.is_in_correct_subgroup_assuming_on_curve() || pub_key.is_zero() {
+    // TODO: Check for correct subgroup isn't done in Barretenberg, is it necessary?
+    if !pub_key.is_on_curve()
+        || !pub_key.is_in_correct_subgroup_assuming_on_curve()
+        || pub_key.is_zero()
+    {
         return false;
     }
 
-    let sig_s = <GrumpkinParameters as CurveConfig>::ScalarField::from_be_bytes_mod_order(&sig_s_bytes);
-    let sig_e = <GrumpkinParameters as CurveConfig>::ScalarField::from_be_bytes_mod_order(&sig_e_bytes);
+    let sig_s =
+        <GrumpkinParameters as CurveConfig>::ScalarField::from_be_bytes_mod_order(&sig_s_bytes);
+    let sig_e =
+        <GrumpkinParameters as CurveConfig>::ScalarField::from_be_bytes_mod_order(&sig_e_bytes);
 
     if sig_s.is_zero() || sig_e.is_zero() {
         return false;