mirror of
https://github.com/saymrwulf/pasta_curves-source.git
synced 2026-09-06 20:20:34 +00:00
Fix deref breakage with nightly-2020-10-06
I think this is related to rust-lang/rust#77638
This commit is contained in:
parent
ca160f9ead
commit
5a6a45c6a8
3 changed files with 4 additions and 4 deletions
|
|
@ -281,7 +281,7 @@ impl<'a, C: CurveAffine> Proof<C> {
|
||||||
.chain(
|
.chain(
|
||||||
self.permutation_product_evals
|
self.permutation_product_evals
|
||||||
.iter()
|
.iter()
|
||||||
.map(|product_eval| l_0 * &(C::Scalar::one() - &product_eval)),
|
.map(|product_eval| l_0 * &(C::Scalar::one() - product_eval)),
|
||||||
)
|
)
|
||||||
// z(X) \prod (p(X) + \beta s_i(X) + \gamma)
|
// z(X) \prod (p(X) + \beta s_i(X) + \gamma)
|
||||||
// - z(omega^{-1} X) \prod (p(X) + \delta^i \beta X + \gamma)
|
// - z(omega^{-1} X) \prod (p(X) + \delta^i \beta X + \gamma)
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ impl<'a, C: CurveAffine> MSM<'a, C> {
|
||||||
assert_eq!(scalars.len(), self.params.n as usize);
|
assert_eq!(scalars.len(), self.params.n as usize);
|
||||||
if let Some(g_scalars) = &mut self.g_scalars {
|
if let Some(g_scalars) = &mut self.g_scalars {
|
||||||
for (g_scalar, scalar) in g_scalars.iter_mut().zip(scalars.iter()) {
|
for (g_scalar, scalar) in g_scalars.iter_mut().zip(scalars.iter()) {
|
||||||
*g_scalar += &scalar;
|
*g_scalar += scalar;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
self.g_scalars = Some(scalars.to_vec());
|
self.g_scalars = Some(scalars.to_vec());
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ impl<C: CurveAffine> Proof<C> {
|
||||||
let r_poly = lagrange_interpolate(points, evals);
|
let r_poly = lagrange_interpolate(points, evals);
|
||||||
let r_eval = eval_polynomial(&r_poly, x_6);
|
let r_eval = eval_polynomial(&r_poly, x_6);
|
||||||
let eval = points.iter().fold(*proof_eval - &r_eval, |eval, point| {
|
let eval = points.iter().fold(*proof_eval - &r_eval, |eval, point| {
|
||||||
eval * &(x_6 - &point).invert().unwrap()
|
eval * &(x_6 - point).invert().unwrap()
|
||||||
});
|
});
|
||||||
msm_eval * &x_5 + &eval
|
msm_eval * &x_5 + &eval
|
||||||
},
|
},
|
||||||
|
|
@ -119,7 +119,7 @@ impl<C: CurveAffine> Proof<C> {
|
||||||
|(mut commitment_msm, msm_eval), (q_commitment, q_eval)| {
|
|(mut commitment_msm, msm_eval), (q_commitment, q_eval)| {
|
||||||
commitment_msm.scale(x_7);
|
commitment_msm.scale(x_7);
|
||||||
commitment_msm.add_msm(&q_commitment);
|
commitment_msm.add_msm(&q_commitment);
|
||||||
(commitment_msm, msm_eval * &x_7 + &q_eval)
|
(commitment_msm, msm_eval * &x_7 + q_eval)
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue