From 1648f009e614841ecf7aeeb433c944260d37d02f Mon Sep 17 00:00:00 2001
From: Adrian Hamelink <adrian@hamelink.com>
Date: Tue, 30 Jan 2024 12:33:56 +0100
Subject: [PATCH] fix rebase

---
 src/gadgets/nonnative/bignat.rs | 4 ++--
 src/parafold/circuit.rs         | 4 ++--
 src/parafold/nivc/circuit.rs    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gadgets/nonnative/bignat.rs b/src/gadgets/nonnative/bignat.rs
index 66dead141..d30bd6260 100644
--- a/src/gadgets/nonnative/bignat.rs
+++ b/src/gadgets/nonnative/bignat.rs
@@ -58,7 +58,7 @@ pub fn nat_to_limbs<Scalar: PrimeField>(
   }
 }
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BigNatParams {
   pub min_bits: usize,
   pub max_word: BigInt,
@@ -80,7 +80,7 @@ impl BigNatParams {
 }
 
 /// A representation of a large natural number (a member of {0, 1, 2, ... })
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct BigNat<Scalar: PrimeField> {
   /// The linear combinations which constrain the value of each limb of the number
   pub limbs: Vec<LinearCombination<Scalar>>,
diff --git a/src/parafold/circuit.rs b/src/parafold/circuit.rs
index 46df8970a..49b4ad066 100644
--- a/src/parafold/circuit.rs
+++ b/src/parafold/circuit.rs
@@ -4,7 +4,7 @@ use crate::parafold::nivc::circuit::AllocatedNIVCState;
 use crate::parafold::nivc::{NIVCMergeProof, NIVCUpdateProof, NIVCIO};
 use crate::parafold::transcript::circuit::AllocatedTranscript;
 use crate::parafold::transcript::TranscriptConstants;
-use crate::traits::circuit_supernova::EnforcingStepCircuit;
+use crate::supernova::StepCircuit;
 use crate::traits::Engine;
 
 pub fn synthesize_step<E1, E2, CS, SF>(
@@ -17,7 +17,7 @@ where
   E1: Engine,
   E2: Engine<Scalar = E1::Base, Base = E1::Scalar>,
   CS: ConstraintSystem<E1::Scalar>,
-  SF: EnforcingStepCircuit<E1::Scalar>,
+  SF: StepCircuit<E1::Scalar>,
 {
   // Fold proof for previous state
   let (mut state, transcript) =
diff --git a/src/parafold/nivc/circuit.rs b/src/parafold/nivc/circuit.rs
index 3c3de6950..133b255f2 100644
--- a/src/parafold/nivc/circuit.rs
+++ b/src/parafold/nivc/circuit.rs
@@ -14,7 +14,7 @@ use crate::parafold::nivc::{
 };
 use crate::parafold::transcript::circuit::AllocatedTranscript;
 use crate::parafold::transcript::TranscriptConstants;
-use crate::traits::circuit_supernova::EnforcingStepCircuit;
+use crate::supernova::EnforcingStepCircuit;
 use crate::traits::Engine;
 
 /// A representation of a NIVC state, where `io` represents the computations inputs and outputs,
@@ -122,7 +122,7 @@ where
 
     let (pc_curr, z_curr) = (Some(&self.io.pc_out), self.io.z_out.as_slice());
 
-    let (pc_next, z_next) = step_circuit.synthesize(cs_step, pc_curr, z_curr)?;
+    let (pc_next, z_next) = step_circuit.enforcing_synthesize(cs_step, pc_curr, z_curr)?;
 
     self.io.pc_out = pc_next.ok_or(SynthesisError::AssignmentMissing)?;
     self.io.z_out = z_next;