logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-03 14:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor post-merge conflicts

Browse Source
This commit is contained in:
Daniel Lubarov 2021-05-12 11:26:21 -07:00
parent 51114e4ef6
commit 18d59ec9de
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/polynomial/commitment.rs
View File

@ -4,7 +4,6 @@ use crate::fri::{prover::fri_proof, verifier::verify_fri_proof, FriConfig};
use crate::merkle_tree::MerkleTree;
use crate::plonk_challenger::Challenger;
use crate::plonk_common::reduce_with_powers;
use crate::polynomial::old_polynomial::Polynomial;
use crate::polynomial::polynomial::PolynomialCoeffs;
use crate::proof::{FriProof, Hash, OpeningSet};
use crate::util::{log2_strict, reverse_index_bits_in_place, transpose};
@ -181,7 +180,9 @@ impl<F: Field> ListPolynomialCommitment<F> {
.flat_map(|c| &c.polynomials)
.rev()
.map(|p| p.clone().into())
.fold(Polynomial::empty(), |acc, p| acc.scalar_mul(alpha).add(&p));
.fold(PolynomialCoeffs::zero(degree), |acc, p| {
&(&acc * alpha) + &p
});
// Scale evaluations by `alpha`.
let composition_evals = &evaluations
.par_iter()