From 041b0ae92cfcf59f89e3666931c3148c0fe85c6d Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Mon, 9 Oct 2023 11:29:32 +0200
Subject: [PATCH] refactor: the non-synth porep does not require comm_r

The non-Synthetic PoRep doesn't require comm_r as an input. Hence call the
`derive_porep()` function directly. This renders the `derive()` function
unused.
---
 .../src/stacked/vanilla/challenges.rs         | 44 +------------------
 .../src/stacked/vanilla/params.rs             |  2 +-
 .../src/stacked/vanilla/proof.rs              |  5 +--
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/storage-proofs-porep/src/stacked/vanilla/challenges.rs b/storage-proofs-porep/src/stacked/vanilla/challenges.rs
index e43b17fd6..ee21f02ac 100644
--- a/storage-proofs-porep/src/stacked/vanilla/challenges.rs
+++ b/storage-proofs-porep/src/stacked/vanilla/challenges.rs
@@ -65,29 +65,7 @@ impl LayerChallenges {
     }
 
     /// Returns the porep challenges for partition `k`.
-    pub fn derive<D: Domain>(
-        &self,
-        sector_nodes: usize,
-        replica_id: &D,
-        comm_r: &D,
-        seed: &[u8; 32],
-        k: u8,
-    ) -> Vec<usize> {
-        assert!(sector_nodes > 2, "Too few sector_nodes: {}", sector_nodes);
-        if self.use_synthetic {
-            trace!(
-                "deriving porep challenges from synthetic challenges (k = {})",
-                k,
-            );
-            self.derive_porep_synth(sector_nodes, replica_id, comm_r, seed, k)
-        } else {
-            trace!("deriving porep challenges (k = {})", k);
-            self.derive_porep(sector_nodes, replica_id, seed, k)
-        }
-    }
-
-    /// Returns the porep challenges for partition `k`.
-    fn derive_porep<D: Domain>(
+    pub(crate) fn derive_porep<D: Domain>(
         &self,
         sector_nodes: usize,
         replica_id: &D,
@@ -111,26 +89,6 @@ impl LayerChallenges {
             .collect()
     }
 
-    /// Returns the porep challenges for partition `k` taken from the synthetic challenges.
-    fn derive_porep_synth<D: Domain>(
-        &self,
-        sector_nodes: usize,
-        replica_id: &D,
-        comm_r: &D,
-        seed: &[u8; 32],
-        k: u8,
-    ) -> Vec<usize> {
-        assert!(self.use_synthetic);
-        let partition_challenge_count = self.challenges_count_all();
-        let replica_id: Fr = (*replica_id).into();
-        let comm_r: Fr = (*comm_r).into();
-        SynthChallenges::default(sector_nodes, &replica_id, &comm_r).gen_porep_partition_challenges(
-            partition_challenge_count,
-            seed,
-            k as usize,
-        )
-    }
-
     /// Returns the synthetic challenge indexes of the porep challenges for partition `k`.
     pub fn derive_synth_indexes<D: Domain>(
         &self,
diff --git a/storage-proofs-porep/src/stacked/vanilla/params.rs b/storage-proofs-porep/src/stacked/vanilla/params.rs
index 5ffa36255..99f23b485 100644
--- a/storage-proofs-porep/src/stacked/vanilla/params.rs
+++ b/storage-proofs-porep/src/stacked/vanilla/params.rs
@@ -159,7 +159,7 @@ impl<T: Domain, S: Domain> PublicInputs<T, S> {
             .unwrap_or(T::default());
 
         if let Some(seed) = self.seed.as_ref() {
-            layer_challenges.derive(sector_nodes, &self.replica_id, &comm_r, seed, k as u8)
+            layer_challenges.derive_porep(sector_nodes, &self.replica_id, seed, k as u8)
         } else if k == 0 {
             layer_challenges.derive_synthetic(sector_nodes, &self.replica_id, &comm_r)
         } else {
diff --git a/storage-proofs-porep/src/stacked/vanilla/proof.rs b/storage-proofs-porep/src/stacked/vanilla/proof.rs
index 743992cc5..19be4db7d 100644
--- a/storage-proofs-porep/src/stacked/vanilla/proof.rs
+++ b/storage-proofs-porep/src/stacked/vanilla/proof.rs
@@ -161,7 +161,6 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
         } else {
             info!("generating non-synthetic vanilla proofs");
 
-            let comm_r = pub_inputs.tau.as_ref().expect("tau is set").comm_r;
             let seed = pub_inputs
                 .seed
                 .expect("seed must be set for non-synthetic vanilla proofs");
@@ -169,12 +168,10 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
             (0..partition_count)
                 .map(|k| {
                     trace!("proving partition {}/{}", k + 1, partition_count);
-
                     // Derive the set of challenges we are proving over.
-                    let challenges = layer_challenges.derive(
+                    let challenges = layer_challenges.derive_porep(
                         graph.size(),
                         &pub_inputs.replica_id,
-                        &comm_r,
                         &seed,
                         k as u8,
                     );