Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ff: refactor cubic extension #881

Merged
merged 1 commit into from
Nov 19, 2024
Merged

ff: refactor cubic extension #881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 15 additions & 24 deletions ff/src/fields/models/cubic_extension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,18 +548,18 @@ impl_multiplicative_ops_from_ref!(CubicExtField, CubicExtConfig);
impl<'a, P: CubicExtConfig> AddAssign<&'a Self> for CubicExtField<P> {
#[inline]
fn add_assign(&mut self, other: &Self) {
self.c0.add_assign(&other.c0);
self.c1.add_assign(&other.c1);
self.c2.add_assign(&other.c2);
self.c0 += &other.c0;
self.c1 += &other.c1;
self.c2 += &other.c2;
}
}

impl<'a, P: CubicExtConfig> SubAssign<&'a Self> for CubicExtField<P> {
#[inline]
fn sub_assign(&mut self, other: &Self) {
self.c0.sub_assign(&other.c0);
self.c1.sub_assign(&other.c1);
self.c2.sub_assign(&other.c2);
self.c0 -= &other.c0;
self.c1 -= &other.c1;
self.c2 -= &other.c2;
}
}

Expand Down Expand Up @@ -596,7 +596,7 @@ impl<'a, P: CubicExtConfig> MulAssign<&'a Self> for CubicExtField<P> {
impl<'a, P: CubicExtConfig> DivAssign<&'a Self> for CubicExtField<P> {
#[inline]
fn div_assign(&mut self, other: &Self) {
self.mul_assign(&other.inverse().unwrap());
*self *= &other.inverse().unwrap();
}
}

Expand Down Expand Up @@ -651,7 +651,7 @@ impl<P: CubicExtConfig> CanonicalDeserializeWithFlags for CubicExtField<P> {
let c0 = CanonicalDeserialize::deserialize_compressed(&mut reader)?;
let c1 = CanonicalDeserialize::deserialize_compressed(&mut reader)?;
let (c2, flags) = CanonicalDeserializeWithFlags::deserialize_with_flags(&mut reader)?;
Ok((CubicExtField::new(c0, c1, c2), flags))
Ok((Self::new(c0, c1, c2), flags))
}
}

Expand All @@ -670,13 +670,10 @@ impl<P: CubicExtConfig> CanonicalDeserialize for CubicExtField<P> {
compress: Compress,
validate: Validate,
) -> Result<Self, SerializationError> {
let c0: P::BaseField =
CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
let c1: P::BaseField =
CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
let c2: P::BaseField =
CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
Ok(CubicExtField::new(c0, c1, c2))
let c0 = CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
let c1 = CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
let c2 = CanonicalDeserialize::deserialize_with_mode(&mut reader, compress, validate)?;
Ok(Self::new(c0, c1, c2))
}
}

Expand All @@ -685,15 +682,9 @@ where
P::BaseField: ToConstraintField<P::BasePrimeField>,
{
fn to_field_elements(&self) -> Option<Vec<P::BasePrimeField>> {
let mut res = Vec::new();
let mut c0_elems = self.c0.to_field_elements()?;
let mut c1_elems = self.c1.to_field_elements()?;
let mut c2_elems = self.c2.to_field_elements()?;

res.append(&mut c0_elems);
res.append(&mut c1_elems);
res.append(&mut c2_elems);

let mut res = self.c0.to_field_elements()?;
res.extend(self.c1.to_field_elements()?);
res.extend(self.c2.to_field_elements()?);
Some(res)
}
}
Expand Down
Loading