From 18d59ec9de3cf8b8e066c0041d97c603fa1ee14c Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Wed, 12 May 2021 11:26:21 -0700
Subject: [PATCH] Fix minor post-merge conflicts

---
 src/polynomial/commitment.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs
index cab9413d..dabf2bf2 100644
--- a/src/polynomial/commitment.rs
+++ b/src/polynomial/commitment.rs
@@ -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()