cargo fmt

QED-it · Mar 28, 2024 · 62fe607 · 62fe607
1 parent c496f0f
commit 62fe607
Show file tree

Hide file tree

Showing 14 changed files with 199 additions and 199 deletions.
diff --git a/halo2_gadgets_optimized/src/ecc.rs b/halo2_gadgets_optimized/src/ecc.rs
@@ -14,7 +14,7 @@ pub mod chip;
 
 /// The set of circuit instructions required to use the ECC gadgets.
 pub trait EccInstructions<C: CurveAffine>:
-Chip<C::Base> + UtilitiesInstructions<C::Base> + Clone + Debug + Eq
+    Chip<C::Base> + UtilitiesInstructions<C::Base> + Clone + Debug + Eq
 {
     /// Variable representing a scalar used in variable-base scalar mul.
     ///
@@ -380,7 +380,7 @@ impl<C: CurveAffine, EccChip: EccInstructions<C>> NonIdentityPoint<C, EccChip> {
 }
 
 impl<C: CurveAffine, EccChip: EccInstructions<C> + Clone + Debug + Eq>
-From<NonIdentityPoint<C, EccChip>> for Point<C, EccChip>
+    From<NonIdentityPoint<C, EccChip>> for Point<C, EccChip>
 {
     fn from(non_id_point: NonIdentityPoint<C, EccChip>) -> Self {
         Self {
@@ -866,7 +866,7 @@ pub(crate) mod tests {
                     layouter.namespace(|| "identity"),
                     Value::known(pallas::Affine::identity()),
                 )
-                    .expect_err("Trying to witness the identity should return an error");
+                .expect_err("Trying to witness the identity should return an error");
             }
 
             // Test witness non-identity point
@@ -972,4 +972,4 @@ pub(crate) mod tests {
             .render(13, &circuit, &root)
             .unwrap();
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/ecc/chip.rs b/halo2_gadgets_optimized/src/ecc/chip.rs
@@ -245,7 +245,7 @@ impl<FixedPoints: super::FixedPoints<pallas::Affine>> Chip<pallas::Base> for Ecc
 }
 
 impl<Fixed: super::FixedPoints<pallas::Affine>> UtilitiesInstructions<pallas::Base>
-for EccChip<Fixed>
+    for EccChip<Fixed>
 {
     type Var = AssignedCell<pallas::Base, pallas::Base>;
 }
@@ -360,7 +360,7 @@ pub struct EccScalarFixedShort {
     /// The circuit-assigned running sum constraining this signed short scalar, or `None`
     /// if the scalar has not been used yet.
     running_sum:
-    Option<ArrayVec<AssignedCell<pallas::Base, pallas::Base>, { NUM_WINDOWS_SHORT + 1 }>>,
+        Option<ArrayVec<AssignedCell<pallas::Base, pallas::Base>, { NUM_WINDOWS_SHORT + 1 }>>,
 }
 
 /// A base field element used for fixed-base scalar multiplication.
@@ -408,12 +408,12 @@ pub enum ScalarVar {
 }
 
 impl<Fixed: FixedPoints<pallas::Affine>> EccInstructions<pallas::Affine> for EccChip<Fixed>
-    where
-        <Fixed as FixedPoints<pallas::Affine>>::Base:
+where
+    <Fixed as FixedPoints<pallas::Affine>>::Base:
         FixedPoint<pallas::Affine, FixedScalarKind = BaseFieldElem>,
-        <Fixed as FixedPoints<pallas::Affine>>::FullScalar:
+    <Fixed as FixedPoints<pallas::Affine>>::FullScalar:
         FixedPoint<pallas::Affine, FixedScalarKind = FullScalar>,
-        <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
+    <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
         FixedPoint<pallas::Affine, FixedScalarKind = ShortScalar>,
 {
     type ScalarFixed = EccScalarFixed;
@@ -625,13 +625,13 @@ impl<Fixed: FixedPoints<pallas::Affine>> EccInstructions<pallas::Affine> for Ecc
 }
 
 impl<Fixed: FixedPoints<pallas::Affine>> BaseFitsInScalarInstructions<pallas::Affine>
-for EccChip<Fixed>
-    where
-        <Fixed as FixedPoints<pallas::Affine>>::Base:
+    for EccChip<Fixed>
+where
+    <Fixed as FixedPoints<pallas::Affine>>::Base:
         FixedPoint<pallas::Affine, FixedScalarKind = BaseFieldElem>,
-        <Fixed as FixedPoints<pallas::Affine>>::FullScalar:
+    <Fixed as FixedPoints<pallas::Affine>>::FullScalar:
         FixedPoint<pallas::Affine, FixedScalarKind = FullScalar>,
-        <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
+    <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
         FixedPoint<pallas::Affine, FixedScalarKind = ShortScalar>,
 {
     fn scalar_var_from_base(
@@ -641,4 +641,4 @@ for EccChip<Fixed>
     ) -> Result<Self::ScalarVar, Error> {
         Ok(ScalarVar::BaseFieldElem(base.clone()))
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/ecc/chip/mul_fixed/short.rs b/halo2_gadgets_optimized/src/ecc/chip/mul_fixed/short.rs
@@ -111,8 +111,8 @@ impl<Fixed: FixedPoints<pallas::Affine>> Config<Fixed> {
         scalar: &EccScalarFixedShort,
         base: &<Fixed as FixedPoints<pallas::Affine>>::ShortScalar,
     ) -> Result<(EccPoint, EccScalarFixedShort), Error>
-        where
-            <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
+    where
+        <Fixed as FixedPoints<pallas::Affine>>::ShortScalar:
             super::super::FixedPoint<pallas::Affine>,
     {
         let (scalar, acc, mul_b) = layouter.assign_region(
@@ -944,4 +944,4 @@ pub mod tests {
             ])
         );
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/ecc/chip/witness_point.rs b/halo2_gadgets_optimized/src/ecc/chip/witness_point.rs
@@ -206,6 +206,6 @@ pub mod tests {
             layouter.namespace(|| "witness identity"),
             Value::known(pallas::Affine::identity()),
         )
-            .expect_err("witnessing 𝒪 should return an error");
+        .expect_err("witnessing 𝒪 should return an error");
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/sinsemilla.rs b/halo2_gadgets_optimized/src/sinsemilla.rs
@@ -113,17 +113,17 @@ pub trait SinsemillaInstructions<C: CurveAffine, const K: usize, const MAX_WORDS
 /// [`MessagePiece`]: SinsemillaInstructions::MessagePiece
 #[derive(Clone, Debug)]
 pub struct Message<C: CurveAffine, SinsemillaChip, const K: usize, const MAX_WORDS: usize>
-    where
-        SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
+where
+    SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
 {
     chip: SinsemillaChip,
     inner: SinsemillaChip::Message,
 }
 
 impl<C: CurveAffine, SinsemillaChip, const K: usize, const MAX_WORDS: usize>
-Message<C, SinsemillaChip, K, MAX_WORDS>
-    where
-        SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
+    Message<C, SinsemillaChip, K, MAX_WORDS>
+where
+    SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
 {
     #![allow(dead_code)]
     fn from_bitstring(
@@ -177,16 +177,16 @@ Message<C, SinsemillaChip, K, MAX_WORDS>
 /// A message piece with a bitlength of some multiple of `K`.
 #[derive(Copy, Clone, Debug)]
 pub struct MessagePiece<C: CurveAffine, SinsemillaChip, const K: usize, const MAX_WORDS: usize>
-    where
-        SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
+where
+    SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
 {
     inner: SinsemillaChip::MessagePiece,
 }
 
 impl<C: CurveAffine, SinsemillaChip, const K: usize, const MAX_WORDS: usize>
-MessagePiece<C, SinsemillaChip, K, MAX_WORDS>
-    where
-        SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
+    MessagePiece<C, SinsemillaChip, K, MAX_WORDS>
+where
+    SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
 {
     /// Returns the inner MessagePiece contained in this gadget.
     pub fn inner(&self) -> SinsemillaChip::MessagePiece {
@@ -195,9 +195,9 @@ MessagePiece<C, SinsemillaChip, K, MAX_WORDS>
 }
 
 impl<C: CurveAffine, SinsemillaChip, const K: usize, const MAX_WORDS: usize>
-MessagePiece<C, SinsemillaChip, K, MAX_WORDS>
-    where
-        SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
+    MessagePiece<C, SinsemillaChip, K, MAX_WORDS>
+where
+    SinsemillaChip: SinsemillaInstructions<C, K, MAX_WORDS> + Clone + Debug + Eq,
 {
     #![allow(dead_code)]
     fn from_bitstring(
@@ -375,7 +375,7 @@ HashDomain<C, SinsemillaChip, EccChip, K, MAX_WORDS>
 
 /// Trait allowing circuit's Sinsemilla CommitDomains to be enumerated.
 pub trait CommitDomains<C: CurveAffine, F: FixedPoints<C>, H: HashDomains<C>>:
-Clone + Debug
+    Clone + Debug
 {
     /// Returns the fixed point corresponding to the R constant used for
     /// randomization in this CommitDomain.
@@ -846,4 +846,4 @@ pub(crate) mod tests {
             .render(11, &circuit, &root)
             .unwrap();
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/sinsemilla/chip.rs b/halo2_gadgets_optimized/src/sinsemilla/chip.rs
@@ -31,10 +31,10 @@ mod hash_to_point;
 /// Configuration for the Sinsemilla hash chip
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub struct SinsemillaConfig<Hash, Commit, F>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        F: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, F, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    F: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, F, Hash>,
 {
     /// Binary selector used in lookup argument and in the body of the Sinsemilla hash.
     q_sinsemilla1: Selector,
@@ -63,10 +63,10 @@ pub struct SinsemillaConfig<Hash, Commit, F>
 }
 
 impl<Hash, Commit, F> SinsemillaConfig<Hash, Commit, F>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        F: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, F, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    F: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, F, Hash>,
 {
     /// Returns an array of all advice columns in this config, in arbitrary order.
     pub(super) fn advices(&self) -> [Column<Advice>; 5] {
@@ -97,19 +97,19 @@ impl<Hash, Commit, F> SinsemillaConfig<Hash, Commit, F>
 /// [Chip description](https://zcash.github.io/halo2/design/gadgets/sinsemilla.html#plonk--halo-2-constraints).
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub struct SinsemillaChip<Hash, Commit, Fixed>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        Fixed: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    Fixed: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
 {
     config: SinsemillaConfig<Hash, Commit, Fixed>,
 }
 
 impl<Hash, Commit, Fixed> Chip<pallas::Base> for SinsemillaChip<Hash, Commit, Fixed>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        Fixed: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    Fixed: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
 {
     type Config = SinsemillaConfig<Hash, Commit, Fixed>;
     type Loaded = ();
@@ -124,10 +124,10 @@ impl<Hash, Commit, Fixed> Chip<pallas::Base> for SinsemillaChip<Hash, Commit, Fi
 }
 
 impl<Hash, Commit, F> SinsemillaChip<Hash, Commit, F>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        F: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, F, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    F: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, F, Hash>,
 {
     /// Reconstructs this chip from the given config.
     pub fn construct(config: <Self as Chip<pallas::Base>>::Config) -> Self {
@@ -266,11 +266,11 @@ impl<Hash, Commit, F> SinsemillaChip<Hash, Commit, F>
 
 // Implement `SinsemillaInstructions` for `SinsemillaChip`
 impl<Hash, Commit, F> SinsemillaInstructions<pallas::Affine, { sinsemilla::K }, { sinsemilla::C }>
-for SinsemillaChip<Hash, Commit, F>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        F: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, F, Hash>,
+    for SinsemillaChip<Hash, Commit, F>
+where
+    Hash: HashDomains<pallas::Affine>,
+    F: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, F, Hash>,
 {
     type CellValue = AssignedCell<pallas::Base, pallas::Base>;
 
@@ -339,4 +339,4 @@ for SinsemillaChip<Hash, Commit, F>
     fn extract(point: &Self::NonIdentityPoint) -> Self::X {
         point.x()
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/sinsemilla/chip/generator_table.rs b/halo2_gadgets_optimized/src/sinsemilla/chip/generator_table.rs
@@ -172,4 +172,4 @@ impl GeneratorTableConfig {
             },
         )
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/sinsemilla/chip/hash_to_point.rs b/halo2_gadgets_optimized/src/sinsemilla/chip/hash_to_point.rs
@@ -17,10 +17,10 @@ use pasta_curves::{arithmetic::CurveAffine, pallas};
 use std::ops::Deref;
 
 impl<Hash, Commit, Fixed> SinsemillaChip<Hash, Commit, Fixed>
-    where
-        Hash: HashDomains<pallas::Affine>,
-        Fixed: FixedPoints<pallas::Affine>,
-        Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
+where
+    Hash: HashDomains<pallas::Affine>,
+    Fixed: FixedPoints<pallas::Affine>,
+    Commit: CommitDomains<pallas::Affine, Fixed, Hash>,
 {
     /// [Specification](https://p.z.cash/halo2-0.1:sinsemilla-constraints?partial).
     #[allow(non_snake_case)]
@@ -569,4 +569,4 @@ impl<F: Field> Deref for Y<F> {
     fn deref(&self) -> &Value<Assigned<F>> {
         &self.0
     }
-}
+}
diff --git a/halo2_gadgets_optimized/src/sinsemilla/merkle.rs b/halo2_gadgets_optimized/src/sinsemilla/merkle.rs
@@ -24,10 +24,10 @@ pub trait MerkleInstructions<
     const K: usize,
     const MAX_WORDS: usize,
 >:
-SinsemillaInstructions<C, K, MAX_WORDS>
-+ CondSwapInstructions<C::Base>
-+ UtilitiesInstructions<C::Base>
-+ Chip<C::Base>
+    SinsemillaInstructions<C, K, MAX_WORDS>
+    + CondSwapInstructions<C::Base>
+    + UtilitiesInstructions<C::Base>
+    + Chip<C::Base>
 {
     /// Compute MerkleCRH for a given `layer`. The hash that computes the root
     /// is at layer 0, and the hashes that are applied to two leaves are at
@@ -64,15 +64,15 @@ pub struct MerklePath<
 }
 
 impl<
-    C: CurveAffine,
-    MerkleChip,
-    const PATH_LENGTH: usize,
-    const K: usize,
-    const MAX_WORDS: usize,
-    const PAR: usize,
-> MerklePath<C, MerkleChip, PATH_LENGTH, K, MAX_WORDS, PAR>
-    where
-        MerkleChip: MerkleInstructions<C, PATH_LENGTH, K, MAX_WORDS> + Clone,
+        C: CurveAffine,
+        MerkleChip,
+        const PATH_LENGTH: usize,
+        const K: usize,
+        const MAX_WORDS: usize,
+        const PAR: usize,
+    > MerklePath<C, MerkleChip, PATH_LENGTH, K, MAX_WORDS, PAR>
+where
+    MerkleChip: MerkleInstructions<C, PATH_LENGTH, K, MAX_WORDS> + Clone,
 {
     /// Constructs a [`MerklePath`].
     ///
@@ -99,15 +99,15 @@ impl<
 
 #[allow(non_snake_case)]
 impl<
-    C: CurveAffine,
-    MerkleChip,
-    const PATH_LENGTH: usize,
-    const K: usize,
-    const MAX_WORDS: usize,
-    const PAR: usize,
-> MerklePath<C, MerkleChip, PATH_LENGTH, K, MAX_WORDS, PAR>
-    where
-        MerkleChip: MerkleInstructions<C, PATH_LENGTH, K, MAX_WORDS> + Clone,
+        C: CurveAffine,
+        MerkleChip,
+        const PATH_LENGTH: usize,
+        const K: usize,
+        const MAX_WORDS: usize,
+        const PAR: usize,
+    > MerklePath<C, MerkleChip, PATH_LENGTH, K, MAX_WORDS, PAR>
+where
+    MerkleChip: MerkleInstructions<C, PATH_LENGTH, K, MAX_WORDS> + Clone,
 {
     /// Calculates the root of the tree containing the given leaf at this Merkle path.
     ///
@@ -397,4 +397,4 @@ pub mod tests {
             .render(11, &circuit, &root)
             .unwrap();
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,4 +172,4 @@ impl GeneratorTableConfig { @@
                 },
             )
         }
-    }
+    }