diff --git a/ecdsa/src/gadgets/biguint.rs b/ecdsa/src/gadgets/biguint.rs index 188b04ba..faae365c 100644 --- a/ecdsa/src/gadgets/biguint.rs +++ b/ecdsa/src/gadgets/biguint.rs @@ -277,12 +277,13 @@ pub trait WitnessBigUint: Witness { impl, F: PrimeField64> WitnessBigUint for T { fn get_biguint_target(&self, target: BigUintTarget) -> BigUint { - target.limbs - .into_iter() - .rev() - .fold(BigUint::zero(), |acc, limb| { - (acc << 32) + self.get_target(limb.0).to_canonical_biguint() - }) + target + .limbs + .into_iter() + .rev() + .fold(BigUint::zero(), |acc, limb| { + (acc << 32) + self.get_target(limb.0).to_canonical_biguint() + }) } fn set_biguint_target(&mut self, target: &BigUintTarget, value: &BigUint) { @@ -352,7 +353,7 @@ mod tests { }; use rand::Rng; - use crate::gadgets::biguint::{WitnessBigUint, CircuitBuilderBiguint}; + use crate::gadgets::biguint::{CircuitBuilderBiguint, WitnessBigUint}; #[test] fn test_biguint_add() -> Result<()> { diff --git a/ecdsa/src/gadgets/glv.rs b/ecdsa/src/gadgets/glv.rs index 2d86652c..4302023e 100644 --- a/ecdsa/src/gadgets/glv.rs +++ b/ecdsa/src/gadgets/glv.rs @@ -116,9 +116,9 @@ impl, const D: usize> SimpleGenerator } fn run_once(&self, witness: &PartitionWitness, out_buffer: &mut GeneratedValues) { - let k = Secp256K1Scalar::from_noncanonical_biguint(witness.get_biguint_target( - self.k.value.clone(), - )); + let k = Secp256K1Scalar::from_noncanonical_biguint( + witness.get_biguint_target(self.k.value.clone()), + ); let (k1, k2, k1_neg, k2_neg) = decompose_secp256k1_scalar(k); diff --git a/ecdsa/src/gadgets/nonnative.rs b/ecdsa/src/gadgets/nonnative.rs index db1231bc..c6ff4753 100644 --- a/ecdsa/src/gadgets/nonnative.rs +++ b/ecdsa/src/gadgets/nonnative.rs @@ -14,7 +14,7 @@ use plonky2_u32::witness::GeneratedValuesU32; use plonky2_util::ceil_div_usize; use crate::gadgets::biguint::{ - GeneratedValuesBigUint, WitnessBigUint, BigUintTarget, CircuitBuilderBiguint, + BigUintTarget, CircuitBuilderBiguint, GeneratedValuesBigUint, WitnessBigUint, }; #[derive(Clone, Debug)] @@ -467,12 +467,8 @@ impl, const D: usize, FF: PrimeField> SimpleGenerat } fn run_once(&self, witness: &PartitionWitness, out_buffer: &mut GeneratedValues) { - let a = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.a.value.clone(), - )); - let b = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.b.value.clone(), - )); + let a = FF::from_noncanonical_biguint(witness.get_biguint_target(self.a.value.clone())); + let b = FF::from_noncanonical_biguint(witness.get_biguint_target(self.b.value.clone())); let a_biguint = a.to_canonical_biguint(); let b_biguint = b.to_canonical_biguint(); let sum_biguint = a_biguint + b_biguint; @@ -512,9 +508,7 @@ impl, const D: usize, FF: PrimeField> SimpleGenerat .summands .iter() .map(|summand| { - FF::from_noncanonical_biguint(witness.get_biguint_target( - summand.value.clone(), - )) + FF::from_noncanonical_biguint(witness.get_biguint_target(summand.value.clone())) }) .collect(); let summand_biguints: Vec<_> = summands @@ -559,12 +553,8 @@ impl, const D: usize, FF: PrimeField> SimpleGenerat } fn run_once(&self, witness: &PartitionWitness, out_buffer: &mut GeneratedValues) { - let a = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.a.value.clone(), - )); - let b = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.b.value.clone(), - )); + let a = FF::from_noncanonical_biguint(witness.get_biguint_target(self.a.value.clone())); + let b = FF::from_noncanonical_biguint(witness.get_biguint_target(self.b.value.clone())); let a_biguint = a.to_canonical_biguint(); let b_biguint = b.to_canonical_biguint(); @@ -604,12 +594,8 @@ impl, const D: usize, FF: PrimeField> SimpleGenerat } fn run_once(&self, witness: &PartitionWitness, out_buffer: &mut GeneratedValues) { - let a = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.a.value.clone(), - )); - let b = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.b.value.clone(), - )); + let a = FF::from_noncanonical_biguint(witness.get_biguint_target(self.a.value.clone())); + let b = FF::from_noncanonical_biguint(witness.get_biguint_target(self.b.value.clone())); let a_biguint = a.to_canonical_biguint(); let b_biguint = b.to_canonical_biguint(); @@ -639,9 +625,7 @@ impl, const D: usize, FF: PrimeField> SimpleGenerat } fn run_once(&self, witness: &PartitionWitness, out_buffer: &mut GeneratedValues) { - let x = FF::from_noncanonical_biguint(witness.get_biguint_target( - self.x.value.clone(), - )); + let x = FF::from_noncanonical_biguint(witness.get_biguint_target(self.x.value.clone())); let inv = x.inverse(); let x_biguint = x.to_canonical_biguint();