From 0f06a01ac1e8c197bf198cde31a276ef4af43507 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Mon, 8 Nov 2021 10:49:14 +0100
Subject: [PATCH] Merge conflicts

---
 src/gates/interpolation.rs |  2 +-
 src/gates/poseidon.rs      | 12 +++++++-----
 src/gates/poseidon_mds.rs  |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs
index 88fca7ff..01fff1ba 100644
--- a/src/gates/interpolation.rs
+++ b/src/gates/interpolation.rs
@@ -20,7 +20,7 @@ use crate::polynomial::polynomial::PolynomialCoeffs;
 /// with the given size, and whose values are extension field elements, given by input wires.
 /// Outputs the evaluation of the interpolant at a given (extension field) evaluation point.
 #[derive(Clone, Debug)]
-pub(crate) struct InterpolationGate<F: RichField + Extendable<D>, const D: usize> {
+pub(crate) struct InterpolationGate<F: Extendable<D>, const D: usize> {
     pub subgroup_bits: usize,
     _phantom: PhantomData<F>,
 }
diff --git a/src/gates/poseidon.rs b/src/gates/poseidon.rs
index bea0d978..31b29bda 100644
--- a/src/gates/poseidon.rs
+++ b/src/gates/poseidon.rs
@@ -498,7 +498,6 @@ mod tests {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
         type F = <C as GenericConfig<D>>::F;
-        const WIDTH: usize = 12;
 
         let config = CircuitConfig {
             num_wires: 143,
@@ -510,7 +509,9 @@ mod tests {
         let gate_index = builder.add_gate(gate, vec![]);
         let circuit = builder.build_prover::<C>();
 
-        let permutation_inputs = (0..WIDTH).map(F::from_canonical_usize).collect::<Vec<_>>();
+        let permutation_inputs = (0..SPONGE_WIDTH)
+            .map(F::from_canonical_usize)
+            .collect::<Vec<_>>();
 
         let mut inputs = PartialWitness::new();
         inputs.set_wire(
@@ -520,7 +521,7 @@ mod tests {
             },
             F::ZERO,
         );
-        for i in 0..WIDTH {
+        for i in 0..SPONGE_WIDTH {
             inputs.set_wire(
                 Wire {
                     gate: gate_index,
@@ -532,8 +533,9 @@ mod tests {
 
         let witness = generate_partial_witness(inputs, &circuit.prover_only, &circuit.common);
 
-        let expected_outputs: [F; WIDTH] = F::poseidon(permutation_inputs.try_into().unwrap());
-        for i in 0..WIDTH {
+        let expected_outputs: [F; SPONGE_WIDTH] =
+            F::poseidon(permutation_inputs.try_into().unwrap());
+        for i in 0..SPONGE_WIDTH {
             let out = witness.get_wire(Wire {
                 gate: 0,
                 input: Gate::wire_output(i),
diff --git a/src/gates/poseidon_mds.rs b/src/gates/poseidon_mds.rs
index 38d0dd0e..32fb1da1 100644
--- a/src/gates/poseidon_mds.rs
+++ b/src/gates/poseidon_mds.rs
@@ -232,7 +232,6 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::poseidon_mds::PoseidonMdsGate;
-    use crate::hash::hashing::SPONGE_WIDTH;
     use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]