Implement unit tests for Verifier

Also simplify VerifierState, and implement Debug traits where needed.

PiperOrigin-RevId: 831545309

Author: schoppmp

willow/src/testing_utils/testing_utils.rs

@@ -18,6 +18,7 @@ use kahe_traits::KaheBase;
 use rand::Rng;
 use shell_testing_parameters::{make_ahe_config, make_kahe_config};
 use single_thread_hkdf::Seed;
+use std::collections::HashMap;
 use vahe_shell::ShellVahe;
 use vahe_traits::{Recover, VaheBase};
 use willow_api_common::AggregationConfig;
@@ -65,6 +66,24 @@ pub fn ahe_decrypt_with_single_sk_share(
     common.vahe.recover(&partial_decryption, &rest_of_ciphertext, None)
 }
 
+/// Generates an AggregationConfig for test cases in this file.
+pub fn generate_aggregation_config(
+    vector_id: String,
+    vector_length: isize,
+    vector_bound: i64,
+    max_number_of_decryptors: i64,
+    max_number_of_clients: i64,
+) -> AggregationConfig {
+    AggregationConfig {
+        vector_lengths_and_bounds: HashMap::from([(vector_id, (vector_length, vector_bound))]),
+        max_number_of_decryptors,
+        max_number_of_clients,
+        max_decryptor_dropouts: 0,
+        session_id: String::from("test"),
+        willow_version: (1, 0),
+    }
+}
+
 /// Concrete implementation of the client using the Shell KAHE/VAHE
 /// implementations.
 pub type ShellClient = WillowV1Client<ShellKahe, ShellVahe>;

willow/src/willow_v1/BUILD

@@ -109,3 +109,27 @@ rust_library(
         "//willow/src/traits:verifier_traits",
     ],
 )
+
+rust_test(
+    name = "willow_v1_verifier_test",
+    crate = ":willow_v1_verifier",
+    deps = [
+        "@crate_index//:googletest",
+        "//shell_wrapper:status_matchers_rs",
+        "//willow/src/shell:kahe_shell",
+        "//willow/src/shell:single_thread_hkdf",
+        "//willow/src/shell:vahe_shell",
+        "//willow/src/testing_utils",
+        "//willow/src/traits:ahe_traits",
+        "//willow/src/traits:client_traits",
+        "//willow/src/traits:decryptor_traits",
+        "//willow/src/traits:kahe_traits",
+        "//willow/src/traits:prng_traits",
+        "//willow/src/traits:server_traits",
+        "//willow/src/traits:vahe_traits",
+        "//willow/src/willow_v1:willow_v1_client",
+        "//willow/src/willow_v1:willow_v1_common",
+        "//willow/src/willow_v1:willow_v1_decryptor",
+        "//willow/src/willow_v1:willow_v1_server",
+    ],
+)

willow/src/willow_v1/common.rs

@@ -15,6 +15,7 @@
 use ahe_traits::AheBase;
 use common_traits::SecureAggregationCommon;
 use kahe_traits::KaheBase;
+use std::fmt::Debug;
 use vahe_traits::VaheBase;
 
 /// Common types for a generic lightweight KAHE/AHE-based implementation of the
@@ -61,25 +62,51 @@ impl<Vahe: VaheBase> Clone for PartialDecryptionRequest<Vahe> {
     }
 }
 
+impl<Vahe: VaheBase> Debug for PartialDecryptionRequest<Vahe> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        f.debug_struct("PartialDecryptionRequest")
+            .field("partial_dec_ciphertext", &"(OMITTED)")
+            .finish()
+    }
+}
+
 pub struct PartialDecryptionResponse<Vahe: VaheBase> {
     pub partial_decryption: Vahe::PartialDecryption,
 }
 
 /// The part of the client message that the verifier needn't check
-#[derive(Debug, Clone)]
 pub struct CiphertextContribution<Kahe: KaheBase, Vahe: VaheBase> {
     pub kahe_ciphertext: Kahe::Ciphertext,
     pub ahe_recover_ciphertext: Vahe::RecoverCiphertext,
 }
 
+impl<Kahe: KaheBase, Vahe: VaheBase> Clone for CiphertextContribution<Kahe, Vahe> {
+    fn clone(&self) -> CiphertextContribution<Kahe, Vahe> {
+        CiphertextContribution {
+            kahe_ciphertext: self.kahe_ciphertext.clone(),
+            ahe_recover_ciphertext: self.ahe_recover_ciphertext.clone(),
+        }
+    }
+}
+
 /// The material from the client that the verifier must check.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct DecryptionRequestContribution<Vahe: VaheBase> {
     pub partial_dec_ciphertext: Vahe::PartialDecCiphertext,
     pub proof: Vahe::EncryptionProof,
     pub nonce: Vec<u8>,
 }
 
+impl<Vahe: VaheBase> Clone for DecryptionRequestContribution<Vahe> {
+    fn clone(&self) -> DecryptionRequestContribution<Vahe> {
+        DecryptionRequestContribution {
+            partial_dec_ciphertext: self.partial_dec_ciphertext.clone(),
+            proof: self.proof.clone(),
+            nonce: self.nonce.clone(),
+        }
+    }
+}
+
 impl<Kahe: KaheBase, Vahe: VaheBase> SecureAggregationCommon for WillowCommon<Kahe, Vahe> {
     type DecryptorPublicKeyShare = DecryptorPublicKeyShare<Vahe>;