From 802e7121d5eb5a31617bf88c4e14fe79d45e68e3 Mon Sep 17 00:00:00 2001
From: Piotr Roslaniec <p.roslaniec@gmail.com>
Date: Fri, 19 Jan 2024 17:04:39 +0100
Subject: [PATCH] chore: remove duplicated field

---
 ferveo-tdec/benches/tpke.rs | 2 +-
 ferveo-tdec/src/context.rs  | 8 +++-----
 ferveo-tdec/src/lib.rs      | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ferveo-tdec/benches/tpke.rs b/ferveo-tdec/benches/tpke.rs
index e47d6b51..420bf869 100644
--- a/ferveo-tdec/benches/tpke.rs
+++ b/ferveo-tdec/benches/tpke.rs
@@ -189,7 +189,7 @@ pub fn bench_create_decryption_share(c: &mut Criterion) {
                         .map(|ctx| {
                             // Using create_unchecked here to avoid the cost of verifying the ciphertext
                             DecryptionShareSimple::create_unchecked(
-                                &ctx.validator_private_key,
+                                &ctx.setup_params.b,
                                 &ctx.private_key_share,
                                 &setup.shared.ciphertext.header().unwrap(),
                             )
diff --git a/ferveo-tdec/src/context.rs b/ferveo-tdec/src/context.rs
index 32fa91fb..238db71c 100644
--- a/ferveo-tdec/src/context.rs
+++ b/ferveo-tdec/src/context.rs
@@ -29,7 +29,7 @@ pub struct PublicDecryptionContextSimple<E: Pairing> {
 
 #[derive(Clone, Debug)]
 pub struct SetupParams<E: Pairing> {
-    pub b: E::ScalarField,
+    pub b: E::ScalarField, // Validator private key
     pub b_inv: E::ScalarField,
     pub g: E::G1Affine,
     pub g_inv: E::G1Prepared,
@@ -71,8 +71,6 @@ pub struct PrivateDecryptionContextSimple<E: Pairing> {
     pub setup_params: SetupParams<E>,
     pub private_key_share: PrivateKeyShare<E>,
     pub public_decryption_contexts: Vec<PublicDecryptionContextSimple<E>>,
-    // TODO: Remove/replace with `setup_params.b` after refactoring
-    pub validator_private_key: E::ScalarField,
 }
 
 impl<E: Pairing> PrivateDecryptionContextSimple<E> {
@@ -82,7 +80,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
         aad: &[u8],
     ) -> Result<DecryptionShareSimple<E>> {
         DecryptionShareSimple::create(
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,
@@ -104,7 +102,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
 
         DecryptionSharePrecomputed::new(
             self.index,
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,
diff --git a/ferveo-tdec/src/lib.rs b/ferveo-tdec/src/lib.rs
index a5c1b302..297b066c 100644
--- a/ferveo-tdec/src/lib.rs
+++ b/ferveo-tdec/src/lib.rs
@@ -243,7 +243,6 @@ pub mod test_common {
                     h,
                 },
                 private_key_share,
-                validator_private_key: b,
                 public_decryption_contexts: vec![],
             });
             public_contexts.push(PublicDecryptionContextSimple::<E> {