message: correct merge error for pr-50
diff: @@ -5,14 +5,14 @@ This source file implements Plonk circuit constraint primitive.
  *****************************************************************************************************************/
  use algebra::{FftField, SquareRootField};
  -use oracle::poseidon::{SPONGE_WIDTH, ArithmeticSpongeParams};
  +use oracle::poseidon::{SpongeConstants, PlonkSpongeConstants, ArithmeticSpongeParams};
  use ff_fft::{EvaluationDomain, DensePolynomial, Evaluations, Radix2EvaluationDomain as D};
  pub use super::polynomial::{WitnessOverDomains, WitnessShifts, WitnessEvals};
  pub use super::gate::{CircuitGate, GateType};
  pub use super::domains::EvaluationDomains;
  pub use super::wires::GateWires;
  use blake2::{Blake2b, Digest};
  -use oracle::utils::{EvalUtils};
  +use oracle::utils::EvalUtils;
  use array_init::array_init;
  #[derive(Clone)]
  @@ -34,7 +34,7 @@ pub struct ConstraintSystem<F: FftField>
  pub qc: DensePolynomial<F>, // constant wire polynomial
  // poseidon selector polynomials
  - pub rcm: [DensePolynomial<F>; SPONGE_WIDTH], // round constant polynomials
  + pub rcm: [DensePolynomial<F>; PlonkSpongeConstants::SPONGE_WIDTH], // round constant polynomials
  pub psm: DensePolynomial<F>, // poseidon constraint selector polynomial
  // EC point addition constraint polynomials
  