From 3fd7168fa4ec40f0740a5b9b12c842d699f140b6 Mon Sep 17 00:00:00 2001
From: porcuquine <porcuquine@users.noreply.github.com>
Date: Sun, 27 Aug 2023 16:50:05 -0700
Subject: [PATCH 1/2] Rename Ca/Cb to C1/C2.

---
 src/supernova/.#mod.rs |  1 +
 src/supernova/mod.rs   | 20 ++++++++++----------
 src/supernova/test.rs  | 12 ++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)
 create mode 120000 src/supernova/.#mod.rs

diff --git a/src/supernova/.#mod.rs b/src/supernova/.#mod.rs
new file mode 120000
index 00000000..b7616752
--- /dev/null
+++ b/src/supernova/.#mod.rs
@@ -0,0 +1 @@
+clwk@salmiyaki.local.64830
\ No newline at end of file
diff --git a/src/supernova/mod.rs b/src/supernova/mod.rs
index 8e636b34..69023191 100644
--- a/src/supernova/mod.rs
+++ b/src/supernova/mod.rs
@@ -155,32 +155,32 @@ where
 
 /// SuperNova takes Ui a list of running instances.
 /// One instance of Ui is a struct called RunningClaim.
-pub struct RunningClaim<G1, G2, Ca, Cb>
+pub struct RunningClaim<G1, G2, C1, C2>
 where
   G1: Group<Base = <G2 as Group>::Scalar>,
   G2: Group<Base = <G1 as Group>::Scalar>,
-  Ca: StepCircuit<G1::Scalar>,
-  Cb: StepCircuit<G2::Scalar>,
+  C1: StepCircuit<G1::Scalar>,
+  C2: StepCircuit<G2::Scalar>,
 {
   _phantom: PhantomData<G1>,
   augmented_circuit_index: usize,
-  c_primary: Ca,
-  c_secondary: Cb,
+  c_primary: C1,
+  c_secondary: C2,
   params: PublicParams<G1, G2>,
 }
 
-impl<G1, G2, Ca, Cb> RunningClaim<G1, G2, Ca, Cb>
+impl<G1, G2, C1, C2> RunningClaim<G1, G2, C1, C2>
 where
   G1: Group<Base = <G2 as Group>::Scalar>,
   G2: Group<Base = <G1 as Group>::Scalar>,
-  Ca: StepCircuit<G1::Scalar>,
-  Cb: StepCircuit<G2::Scalar>,
+  C1: StepCircuit<G1::Scalar>,
+  C2: StepCircuit<G2::Scalar>,
 {
   /// new a running claim
   pub fn new(
     augmented_circuit_index: usize,
-    circuit_primary: Ca,
-    circuit_secondary: Cb,
+    circuit_primary: C1,
+    circuit_secondary: C2,
     num_augmented_circuits: usize,
   ) -> Self {
     let claim = circuit_primary;
diff --git a/src/supernova/test.rs b/src/supernova/test.rs
index 80b0dd15..f01a1ad3 100644
--- a/src/supernova/test.rs
+++ b/src/supernova/test.rs
@@ -227,19 +227,19 @@ where
   }
 }
 
-fn print_constraints_name_on_error_index<G1, G2, Ca, Cb>(
+fn print_constraints_name_on_error_index<G1, G2, C1, C2>(
   err: SuperNovaError,
-  running_claim: &RunningClaim<G1, G2, Ca, Cb>,
+  running_claim: &RunningClaim<G1, G2, C1, C2>,
   num_augmented_circuits: usize,
 ) where
   G1: Group<Base = <G2 as Group>::Scalar>,
   G2: Group<Base = <G1 as Group>::Scalar>,
-  Ca: StepCircuit<G1::Scalar>,
-  Cb: StepCircuit<G2::Scalar>,
+  C1: StepCircuit<G1::Scalar>,
+  C2: StepCircuit<G2::Scalar>,
 {
   match err {
     SuperNovaError::UnSatIndex(msg, index) if msg == "r_primary" => {
-      let circuit_primary: SuperNovaAugmentedCircuit<'_, G2, Ca> = SuperNovaAugmentedCircuit::new(
+      let circuit_primary: SuperNovaAugmentedCircuit<'_, G2, C1> = SuperNovaAugmentedCircuit::new(
         &running_claim.params.augmented_circuit_params_primary,
         None,
         &running_claim.c_primary,
@@ -253,7 +253,7 @@ fn print_constraints_name_on_error_index<G1, G2, Ca, Cb>(
         .tap_some(|constraint| debug!("{msg} failed at constraint {}", constraint.3));
     }
     SuperNovaError::UnSatIndex(msg, index) if msg == "r_secondary" || msg == "l_secondary" => {
-      let circuit_secondary: SuperNovaAugmentedCircuit<'_, G1, Cb> = SuperNovaAugmentedCircuit::new(
+      let circuit_secondary: SuperNovaAugmentedCircuit<'_, G1, C2> = SuperNovaAugmentedCircuit::new(
         &running_claim.params.augmented_circuit_params_secondary,
         None,
         &running_claim.c_secondary,

From 33dec550462d4c4cba39f73423962df1f00cec71 Mon Sep 17 00:00:00 2001
From: porcuquine <porcuquine@users.noreply.github.com>
Date: Sun, 27 Aug 2023 17:42:50 -0700
Subject: [PATCH 2/2] Rename TestRomCircuit to TestROMCircuit.

---
 src/supernova/.#mod.rs |  1 -
 src/supernova/test.rs  | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 120000 src/supernova/.#mod.rs

diff --git a/src/supernova/.#mod.rs b/src/supernova/.#mod.rs
deleted file mode 120000
index b7616752..00000000
--- a/src/supernova/.#mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-clwk@salmiyaki.local.64830
\ No newline at end of file
diff --git a/src/supernova/test.rs b/src/supernova/test.rs
index f01a1ad3..681ebeb5 100644
--- a/src/supernova/test.rs
+++ b/src/supernova/test.rs
@@ -284,12 +284,12 @@ where
 }
 
 #[derive(Debug, Clone)]
-enum TestRomCircuit<F: PrimeField> {
+enum TestROMCircuit<F: PrimeField> {
   Cubic(CubicCircuit<F>),
   Square(SquareCircuit<F>),
 }
 
-impl<F: PrimeField> StepCircuit<F> for TestRomCircuit<F> {
+impl<F: PrimeField> StepCircuit<F> for TestROMCircuit<F> {
   fn arity(&self) -> usize {
     match self {
       Self::Cubic(x) => x.arity(),
@@ -310,7 +310,7 @@ impl<F: PrimeField> StepCircuit<F> for TestRomCircuit<F> {
   }
 }
 
-impl<G1, G2> NonUniformCircuit<G1, G2, TestRomCircuit<G1::Scalar>>
+impl<G1, G2> NonUniformCircuit<G1, G2, TestROMCircuit<G1::Scalar>>
   for TestROM<G1, G2, TrivialSecondaryCircuit<G2::Scalar>>
 where
   G1: Group<Base = <G2 as Group>::Scalar>,
@@ -320,10 +320,10 @@ where
     2
   }
 
-  fn primary_circuit(&self, circuit_index: usize) -> TestRomCircuit<G1::Scalar> {
+  fn primary_circuit(&self, circuit_index: usize) -> TestROMCircuit<G1::Scalar> {
     match circuit_index {
-      0 => TestRomCircuit::Cubic(CubicCircuit::new(circuit_index, self.rom.len())),
-      1 => TestRomCircuit::Square(SquareCircuit::new(circuit_index, self.rom.len())),
+      0 => TestROMCircuit::Cubic(CubicCircuit::new(circuit_index, self.rom.len())),
+      1 => TestROMCircuit::Square(SquareCircuit::new(circuit_index, self.rom.len())),
       _ => panic!("unsupported primary circuit index"),
     }
   }