Skip to content

fix: constraint count regression introduced in commit 53f652b #53

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

Merged
kashbrti merged 2 commits into from
Nov 15, 2024
Merged

fix: constraint count regression introduced in commit 53f652b #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a46a06
don't convert to slice and back to array
iAmMichaelConnor Nov 14, 2024
8cb9df6
fmt
iAmMichaelConnor Nov 14, 2024
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
37 changes: 12 additions & 25 deletions src/bignum.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,18 +212,17 @@ where
unconstrained fn __batch_invert<let M: u32>(x: [Self; M]) -> [Self; M] {
let params = Params::get_params();
assert(params.has_multiplicative_inverse);
__batch_invert::<_, MOD_BITS, _>(params, x.map(|bn| Self::get_limbs_slice(bn).as_array()))
.map(|limbs| Self { limbs })
__batch_invert::<_, MOD_BITS, _>(params, x.map(|bn: Self| bn.limbs)).map(|limbs| {
Copy link
Copy Markdown
Collaborator Author

@iAmMichaelConnor iAmMichaelConnor Nov 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hadn't appreciated you could put type annotations inside the closure |bn: T|. Pretty cool.

Self { limbs }
})
}

unconstrained fn __batch_invert_slice<let M: u32>(x: [Self]) -> [Self] {
let params = Params::get_params();
assert(params.has_multiplicative_inverse);
__batch_invert_slice::<_, MOD_BITS>(
params,
x.map(|bn| Self::get_limbs_slice(bn).as_array()),
)
.map(|limbs| Self { limbs })
__batch_invert_slice::<_, MOD_BITS>(params, x.map(|bn: Self| bn.limbs)).map(|limbs| {
Self { limbs }
})
}

unconstrained fn __tonelli_shanks_sqrt(self) -> std::option::Option<Self> {
Expand All @@ -243,17 +242,11 @@ where
let params = Params::get_params();
let (q_limbs, r_limbs) = __compute_quadratic_expression::<_, MOD_BITS, _, _, _, _>(
params,
map(
lhs_terms,
|bns| map(bns, |bn| Self::get_limbs_slice(bn).as_array()),
),
map(lhs_terms, |bns| map(bns, |bn: Self| bn.limbs)),
lhs_flags,
map(
rhs_terms,
|bns| map(bns, |bn| Self::get_limbs_slice(bn).as_array()),
),
map(rhs_terms, |bns| map(bns, |bn: Self| bn.limbs)),
rhs_flags,
map(linear_terms, |bn| Self::get_limbs_slice(bn).as_array()),
map(linear_terms, |bn: Self| bn.limbs),
linear_flags,
);
(Self { limbs: q_limbs }, Self { limbs: r_limbs })
Expand All @@ -270,17 +263,11 @@ where
let params = Params::get_params();
evaluate_quadratic_expression::<_, MOD_BITS, _, _, _, _>(
params,
map(
lhs_terms,
|bns| map(bns, |bn| Self::get_limbs_slice(bn).as_array()),
),
map(lhs_terms, |bns| map(bns, |bn: Self| bn.limbs)),
lhs_flags,
map(
rhs_terms,
|bns| map(bns, |bn| Self::get_limbs_slice(bn).as_array()),
),
map(rhs_terms, |bns| map(bns, |bn: Self| bn.limbs)),
rhs_flags,
map(linear_terms, |bn| Self::get_limbs_slice(bn).as_array()),
map(linear_terms, |bn: Self| bn.limbs),
linear_flags,
)
}
Expand Down