Frame-like M now is an associated type (#1136)

* Frame-like M now is an associated type

* `M` -> `Frame` rename

src/proof/mod.rs

@@ -149,12 +149,15 @@ impl FoldingMode {
 }
 
 /// A trait for a prover that works with a field `F`.
-pub trait Prover<'a, F: CurveCycleEquipped, M: FrameLike<Ptr, FrameIO = Vec<Ptr>>> {
+pub trait Prover<'a, F: CurveCycleEquipped> {
+    /// Associated type for a frame-like datatype
+    type Frame: FrameLike<Ptr, FrameIO = Vec<Ptr>>;
+
     /// Associated type for public parameters
     type PublicParams;
 
     /// Associated proof type, which must implement `RecursiveSNARKTrait`
-    type RecursiveSnark: RecursiveSNARKTrait<F, M, PublicParams = Self::PublicParams>;
+    type RecursiveSnark: RecursiveSNARKTrait<F, Self::Frame, PublicParams = Self::PublicParams>;
 
     /// Returns a reference to the prover's FoldingMode
     fn folding_mode(&self) -> &FoldingMode;
@@ -166,7 +169,7 @@ pub trait Prover<'a, F: CurveCycleEquipped, M: FrameLike<Ptr, FrameIO = Vec<Ptr>
     fn prove(
         &self,
         pp: &Self::PublicParams,
-        steps: Vec<M>,
+        steps: Vec<Self::Frame>,
         store: &'a Store<F>,
     ) -> Result<(Self::RecursiveSnark, Vec<F>, Vec<F>, usize), ProofError> {
         store.hydrate_z_cache();

src/proof/nova.rs

@@ -403,9 +403,8 @@ impl<'a, F: CurveCycleEquipped, C: Coprocessor<F> + 'a> NovaProver<'a, F, C> {
     }
 }
 
-impl<'a, F: CurveCycleEquipped, C: Coprocessor<F> + 'a> Prover<'a, F, C1LEM<'a, F, C>>
-    for NovaProver<'a, F, C>
-{
+impl<'a, F: CurveCycleEquipped, C: Coprocessor<F> + 'a> Prover<'a, F> for NovaProver<'a, F, C> {
+    type Frame = C1LEM<'a, F, C>;
     type PublicParams = PublicParams<F>;
     type RecursiveSnark = Proof<F, C1LEM<'a, F, C>>;
 

src/proof/supernova.rs

@@ -323,9 +323,8 @@ impl<'a, F: CurveCycleEquipped, C: Coprocessor<F>> RecursiveSNARKTrait<F, C1LEM<
     }
 }
 
-impl<'a, F: CurveCycleEquipped, C: Coprocessor<F>> Prover<'a, F, C1LEM<'a, F, C>>
-    for SuperNovaProver<'a, F, C>
-{
+impl<'a, F: CurveCycleEquipped, C: Coprocessor<F>> Prover<'a, F> for SuperNovaProver<'a, F, C> {
+    type Frame = C1LEM<'a, F, C>;
     type PublicParams = PublicParams<F>;
     type RecursiveSnark = Proof<F, C1LEM<'a, F, C>>;