fixing borrow checker and refcells

barustenberg/src/ecc/curves/mod.rs

@@ -3,7 +3,7 @@ use ark_ff::{FftField, Field};
 //pub(crate) mod grumpkin;
 pub(crate) mod bn254_scalar_multiplication;
 
-pub(crate) fn coset_generator<F: Field + FftField>(idx: usize) -> F {
+pub(crate) fn coset_generator<F: Field + FftField>(_idx: usize) -> F {
     /*
         ASSERT(idx < 7);
     const FieldExt result{

barustenberg/src/ecc/mod.rs

@@ -28,8 +28,8 @@ pub(crate) fn reduced_ate_pairing_batch_precomputed<G: AffineRepr>(
 
 #[inline]
 pub(crate) fn conditionally_subtract_from_double_modulus<Fr: Field + FftField>(
-    this: &Fr,
-    predicate: u64,
+    _this: &Fr,
+    _predicate: u64,
 ) -> Fr {
     todo!("see comment")
     // yikes man

barustenberg/src/plonk/proof_system/commitment_scheme.rs

@@ -56,7 +56,7 @@ pub(crate) trait CommitmentScheme {
         &mut self,
         transcript: &Transcript<Self::Hasher>,
         queue: &mut WorkQueue<'a, Self::Hasher, Self::Fr, Self::Group>,
-        input_key: Option<&'a ProvingKey<'a, Self::Fr, Self::Group>>,
+        input_key: Option<Rc<RefCell<ProvingKey<'a, Self::Fr, Self::Group>>>>,
     );
 
     fn batch_verify<'a>(
@@ -70,7 +70,7 @@ pub(crate) trait CommitmentScheme {
     fn add_opening_evaluations_to_transcript<'a>(
         &self,
         transcript: &mut Transcript<Self::Hasher>,
-        input_key: Option<&'a ProvingKey<'a, Self::Fr, Self::Group>>,
+        input_key: Option<Rc<RefCell<ProvingKey<'a, Self::Fr, Self::Group>>>>,
         in_lagrange_form: bool,
     );
 }
@@ -113,7 +113,7 @@ impl<Fq: Field + FftField, Fr: Field + FftField, G: AffineRepr, H: BarretenHashe
     fn add_opening_evaluations_to_transcript<'a>(
         &self,
         _transcript: &mut Transcript<H>,
-        _input_key: Option<&'a ProvingKey<'a, Fr, G>>,
+        _input_key: Option<Rc<RefCell<ProvingKey<'a, Self::Fr, Self::Group>>>>,
         _in_lagrange_form: bool,
     ) {
         todo!()
@@ -217,7 +217,7 @@ impl<Fq: Field + FftField, Fr: Field + FftField, G: AffineRepr, H: BarretenHashe
         &mut self,
         _transcript: &Transcript<H>,
         _queue: &mut WorkQueue<'a, H, Fr, G>,
-        _input_key: Option<&'a ProvingKey<'a, Fr, G>>,
+        _input_key: Option<Rc<RefCell<ProvingKey<'a, Self::Fr, Self::Group>>>>,
     ) {
         todo!()
     }

barustenberg/src/plonk/proof_system/constants.rs

@@ -1,4 +1,4 @@
 // limb size when simulating a non-native FieldExt using bigFieldExt class
 // (needs to be a universal constant to be used by native verifier)
-pub(crate) const NUM_LIMB_BITS_IN_FieldExt_SIMULATION: u64 = 68;
+pub(crate) const NUM_LIMB_BITS_IN_FIELD_SIMULATION: u64 = 68;
 pub(crate) const NUM_QUOTIENT_PARTS: u32 = 4;

barustenberg/src/plonk/proof_system/prover.rs

@@ -393,7 +393,7 @@ impl<
         self.commitment_scheme.batch_open(
             &(*self.transcript).borrow(),
             &mut self.queue,
-            Some(&*(*self.key).borrow()),
+            Some(self.key.clone()),
         );
     }
 
@@ -553,7 +553,7 @@ impl<
         self.commitment_scheme
             .add_opening_evaluations_to_transcript(
                 &mut (*self.transcript).borrow_mut(),
-                Some(&self.key.borrow()),
+                Some(self.key.clone()),
                 false,
             );
 

barustenberg/src/plonk/proof_system/types/prover_settings.rs

@@ -106,10 +106,10 @@ impl<H: BarretenHasher> Settings for StandardSettings<H> {
 
     #[inline]
     fn compute_quotient_evaluation_contribution(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<H>,
-        quotient_numerator_eval: &Fr,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<H>,
+        _quotient_numerator_eval: &Fr,
     ) -> Fr {
         unimplemented!("todo");
         /*
@@ -128,10 +128,10 @@ impl<H: BarretenHasher> Settings for StandardSettings<H> {
 
     #[inline]
     fn append_scalar_multiplication_inputs(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<H>,
-        scalars: &HashMap<String, Fr>,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<H>,
+        _scalars: &HashMap<String, Fr>,
     ) -> Fr {
         unimplemented!("todo");
     }
@@ -188,10 +188,10 @@ impl Settings for TurboSettings {
     }
     #[inline]
     fn compute_quotient_evaluation_contribution(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PedersenBlake3s>,
-        quotient_numerator_eval: &Fr,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PedersenBlake3s>,
+        _quotient_numerator_eval: &Fr,
     ) -> Fr {
         unimplemented!();
         /*
@@ -211,10 +211,10 @@ impl Settings for TurboSettings {
          */
     }
     fn append_scalar_multiplication_inputs(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PedersenBlake3s>,
-        scalars: &HashMap<String, Fr>,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PedersenBlake3s>,
+        _scalars: &HashMap<String, Fr>,
     ) -> Fr {
         unimplemented!("todo");
     }
@@ -266,10 +266,10 @@ impl Settings for UltraSettings {
 
     #[inline]
     fn compute_quotient_evaluation_contribution(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PlookupPedersenBlake3s>,
-        quotient_numerator_eval: &Fr,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PlookupPedersenBlake3s>,
+        _quotient_numerator_eval: &Fr,
     ) -> Fr {
         /*
                 auto updated_alpha_base = PermutationWidget::compute_quotient_evaluation_contribution(
@@ -291,10 +291,10 @@ impl Settings for UltraSettings {
     }
 
     fn append_scalar_multiplication_inputs(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PlookupPedersenBlake3s>,
-        scalars: &HashMap<String, Fr>,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PlookupPedersenBlake3s>,
+        _scalars: &HashMap<String, Fr>,
     ) -> Fr {
         unimplemented!("todo");
     }
@@ -345,20 +345,20 @@ impl Settings for UltraToStandardSettings {
     }
     #[inline]
     fn compute_quotient_evaluation_contribution(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PedersenBlake3s>,
-        quotient_numerator_eval: &Fr,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PedersenBlake3s>,
+        _quotient_numerator_eval: &Fr,
     ) -> Fr {
         // UltraSettings::compute_quotient_evaluation_contribution(verification_key, alpha_base, transcript, quotient_numerator_eval)
         todo!()
     }
 
     fn append_scalar_multiplication_inputs(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<PedersenBlake3s>,
-        scalars: &HashMap<String, Fr>,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<PedersenBlake3s>,
+        _scalars: &HashMap<String, Fr>,
     ) -> Fr {
         unimplemented!("todo");
     }
@@ -409,19 +409,19 @@ impl Settings for UltraWithKeccakSettings {
     }
     #[inline]
     fn compute_quotient_evaluation_contribution(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<Keccak256>,
-        quotient_numerator_eval: &Fr,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<Keccak256>,
+        _quotient_numerator_eval: &Fr,
     ) -> Fr {
         //UltraSettings::compute_quotient_evaluation_contribution(verification_key, alpha_base, transcript, quotient_numerator_eval)
         todo!()
     }
     fn append_scalar_multiplication_inputs(
-        verification_key: &VerificationKey<'_, Fr>,
-        alpha_base: &Fr,
-        transcript: &Transcript<Keccak256>,
-        scalars: &HashMap<String, Fr>,
+        _verification_key: &VerificationKey<'_, Fr>,
+        _alpha_base: &Fr,
+        _transcript: &Transcript<Keccak256>,
+        _scalars: &HashMap<String, Fr>,
     ) -> Fr {
         unimplemented!("todo");
     }