Revert changes made outside parafold

src/circuit.rs

@@ -4,16 +4,6 @@
 //! of the running instances. Each of these hashes is H(params = H(shape, ck), i, z0, zi, U).
 //! Each circuit folds the last invocation of the other into the running instance
 
-use abomonation_derive::Abomonation;
-use bellpepper::gadgets::Assignment;
-use bellpepper_core::{
-  boolean::{AllocatedBit, Boolean},
-  num::AllocatedNum,
-  ConstraintSystem, SynthesisError,
-};
-use ff::Field;
-use serde::{Deserialize, Serialize};
-
 use crate::{
   constants::{NIO_NOVA_FOLD, NUM_FE_WITHOUT_IO_FOR_CRHF, NUM_HASH_BITS},
   gadgets::{
@@ -29,6 +19,15 @@ use crate::{
   },
   Commitment,
 };
+use abomonation_derive::Abomonation;
+use bellpepper::gadgets::Assignment;
+use bellpepper_core::{
+  boolean::{AllocatedBit, Boolean},
+  num::AllocatedNum,
+  ConstraintSystem, SynthesisError,
+};
+use ff::Field;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Abomonation)]
 pub struct NovaAugmentedCircuitParams {
@@ -363,8 +362,7 @@ impl<'a, E: Engine, SC: StepCircuit<E::Base>> NovaAugmentedCircuit<'a, E, SC> {
 
 #[cfg(test)]
 mod tests {
-  use expect_test::{expect, Expect};
-
+  use super::*;
   use crate::{
     bellpepper::{
       r1cs::{NovaShape, NovaWitness},
@@ -379,8 +377,7 @@ mod tests {
     },
     traits::{circuit::TrivialCircuit, snark::default_ck_hint, CurveCycleEquipped, Dual},
   };
-
-  use super::*;
+  use expect_test::{expect, Expect};
 
   // In the following we use 1 to refer to the primary, and 2 to refer to the secondary circuit
   fn test_recursive_circuit_with<E1>(

src/nifs.rs

@@ -274,7 +274,7 @@ mod tests {
   ) {
     // produce a default running instance
     let mut r_W = RelaxedR1CSWitness::default(shape);
-    let mut r_U = RelaxedR1CSInstance::default(shape);
+    let mut r_U = RelaxedR1CSInstance::default(ck, shape);
 
     // produce a step SNARK with (W1, U1) as the first incoming witness-instance pair
     let res = NIFS::prove(ck, ro_consts, pp_digest, shape, &r_U, &r_W, U1, W1);

src/parafold/nivc/circuit.rs

@@ -15,6 +15,7 @@ use crate::parafold::nivc::{
 use crate::parafold::transcript::circuit::AllocatedTranscript;
 use crate::parafold::transcript::TranscriptConstants;
 use crate::supernova::EnforcingStepCircuit;
+
 use crate::traits::Engine;
 
 /// A representation of a NIVC state, where `io` represents the computations inputs and outputs,

src/r1cs/mod.rs

@@ -55,7 +55,7 @@ pub struct R1CSResult<E: Engine> {
 /// A type that holds a witness for a given R1CS instance
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct R1CSWitness<E: Engine> {
-  pub(crate) W: Vec<E::Scalar>,
+  W: Vec<E::Scalar>,
 }
 
 /// A type that holds an R1CS instance
@@ -704,7 +704,7 @@ impl<E: Engine> RelaxedR1CSWitness<E> {
 
 impl<E: Engine> RelaxedR1CSInstance<E> {
   /// Produces a default `RelaxedR1CSInstance` given `R1CSGens` and `R1CSShape`
-  pub fn default(S: &R1CSShape<E>) -> Self {
+  pub fn default(_ck: &CommitmentKey<E>, S: &R1CSShape<E>) -> Self {
     let (comm_W, comm_E) = (Commitment::<E>::default(), Commitment::<E>::default());
     Self {
       comm_W,

src/supernova/mod.rs

@@ -43,7 +43,7 @@ use bellpepper_core::ConstraintSystem;
 use crate::nifs::NIFS;
 
 mod circuit; // declare the module first
-pub use circuit::{StepCircuit, TrivialSecondaryCircuit, TrivialTestCircuit};
+pub use circuit::{EnforcingStepCircuit, StepCircuit, TrivialSecondaryCircuit, TrivialTestCircuit};
 use circuit::{
   SuperNovaAugmentedCircuit, SuperNovaAugmentedCircuitInputs, SuperNovaAugmentedCircuitParams,
 };