Fix incorrect signatures in .pyi stubs

ferveo-python/examples/server_api_precomputed.py

@@ -4,6 +4,7 @@
     decrypt_with_shared_secret,
     Keypair,
     Validator,
+    ValidatorMessage,
     Dkg,
     AggregatedTranscript,
 )
@@ -38,7 +39,7 @@ def gen_eth_addr(i: int) -> str:
         validators=validators,
         me=sender,
     )
-    messages.append((sender, dkg.generate_transcript()))
+    messages.append(ValidatorMessage(sender, dkg.generate_transcript()))
 
 # Every validator can aggregate the transcripts
 dkg = Dkg(

ferveo-python/examples/server_api_simple.py

@@ -4,6 +4,7 @@
     decrypt_with_shared_secret,
     Keypair,
     Validator,
+    ValidatorMessage,
     Dkg,
     AggregatedTranscript,
 )
@@ -36,7 +37,7 @@ def gen_eth_addr(i: int) -> str:
         validators=validators,
         me=sender,
     )
-    messages.append((sender, dkg.generate_transcript()))
+    messages.append(ValidatorMessage(sender, dkg.generate_transcript()))
 
 # Now that every validator holds a dkg instance and a transcript for every other validator,
 # every validator can aggregate the transcripts

ferveo-python/ferveo/__init__.py

@@ -13,8 +13,8 @@
     DecryptionSharePrecomputed,
     AggregatedTranscript,
     DkgPublicKey,
-    DkgPublicParameters,
     SharedSecret,
+    ValidatorMessage,
     ThresholdEncryptionError,
     InvalidShareNumberParameter,
     InvalidDkgStateToDeal,

ferveo-python/ferveo/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence, Tuple
+from typing import Sequence
 
 
 class Keypair:
@@ -65,6 +65,19 @@ class DkgPublicKey:
         ...
 
 
+class ValidatorMessage:
+
+    def __init__(
+            self,
+            validator: Validator,
+            transcript: Transcript,
+    ):
+        ...
+
+    validator: Validator
+    transcript: Transcript
+
+
 class Dkg:
 
     def __init__(
@@ -82,7 +95,7 @@ class Dkg:
     def generate_transcript(self) -> Transcript:
         ...
 
-    def aggregate_transcripts(self, messages: Sequence[Tuple[Validator, Transcript]]) -> AggregatedTranscript:
+    def aggregate_transcripts(self, messages: Sequence[ValidatorMessage]) -> AggregatedTranscript:
         ...
 
 
@@ -115,10 +128,10 @@ class DecryptionSharePrecomputed:
 
 class AggregatedTranscript:
 
-    def __init__(self, messages: Sequence[Tuple[Validator, Transcript]]):
+    def __init__(self, messages: Sequence[ValidatorMessage]):
         ...
 
-    def verify(self, shares_num: int, messages: Sequence[Tuple[Validator, Transcript]]) -> bool:
+    def verify(self, shares_num: int, messages: Sequence[ValidatorMessage]) -> bool:
         ...
 
     def create_decryption_share_simple(

ferveo-python/test/test_ferveo.py

@@ -7,6 +7,7 @@
     decrypt_with_shared_secret,
     Keypair,
     Validator,
+    ValidatorMessage,
     Dkg,
     AggregatedTranscript,
     DkgPublicKey,
@@ -57,7 +58,7 @@ def scenario_for_variant(variant, shares_num, threshold, shares_to_use):
             validators=validators,
             me=sender,
         )
-        messages.append((sender, dkg.generate_transcript()))
+        messages.append(ValidatorMessage(sender, dkg.generate_transcript()))
 
     dkg = Dkg(
         tau=tau,
@@ -144,7 +145,6 @@ def test_precomputed_tdec_doesnt_have_enough_messages():
     for threshold in range(1, shares_num):
         TEST_CASES_WITH_THRESHOLD_RANGE.append((variant, shares_num, threshold))
 
-
 # Avoid running this test case as it takes a long time
 # @pytest.mark.parametrize("variant, shares_num, threshold", TEST_CASES_WITH_THRESHOLD_RANGE)
 # def test_reproduce_nucypher_issue(variant, shares_num, threshold):

ferveo/src/bindings_python.rs

@@ -367,9 +367,33 @@ impl DkgPublicKey {
     }
 }
 
-// TODO: Consider using a `pyclass` instead
-#[derive(FromPyObject, Clone)]
-pub struct ValidatorMessage(Validator, Transcript);
+#[pyclass(module = "ferveo")]
+#[derive(derive_more::From, derive_more::AsRef, Clone)]
+pub struct ValidatorMessage(api::ValidatorMessage);
+
+#[pymethods]
+impl ValidatorMessage {
+    #[new]
+    pub fn new(validator: &Validator, transcript: &Transcript) -> Self {
+        Self((validator.0.clone(), transcript.0.clone()))
+    }
+
+    #[getter]
+    pub fn validator(&self) -> Validator {
+        Validator(self.0 .0.clone())
+    }
+
+    #[getter]
+    pub fn transcript(&self) -> Transcript {
+        Transcript(self.0 .1.clone())
+    }
+}
+
+impl ValidatorMessage {
+    pub(crate) fn to_inner(&self) -> api::ValidatorMessage {
+        self.0.clone()
+    }
+}
 
 #[pyclass(module = "ferveo")]
 #[derive(derive_more::From, derive_more::AsRef)]
@@ -415,10 +439,7 @@ impl Dkg {
         &mut self,
         messages: Vec<ValidatorMessage>,
     ) -> PyResult<AggregatedTranscript> {
-        let messages: Vec<_> = messages
-            .iter()
-            .map(|m| ((m.0).0.clone(), (m.1).0.clone()))
-            .collect();
+        let messages: Vec<_> = messages.iter().map(|m| m.to_inner()).collect();
         let aggregated_transcript = self
             .0
             .aggregate_transcripts(&messages)
@@ -465,10 +486,8 @@ generate_common_methods!(AggregatedTranscript);
 impl AggregatedTranscript {
     #[new]
     pub fn new(messages: Vec<ValidatorMessage>) -> Self {
-        let messages: Vec<_> = messages
-            .into_iter()
-            .map(|ValidatorMessage(v, t)| (v.0, t.0))
-            .collect();
+        let messages: Vec<_> =
+            messages.into_iter().map(|vm| vm.to_inner()).collect();
         Self(api::AggregatedTranscript::new(&messages))
     }
 
@@ -477,10 +496,8 @@ impl AggregatedTranscript {
         shares_num: u32,
         messages: Vec<ValidatorMessage>,
     ) -> PyResult<bool> {
-        let messages: Vec<_> = messages
-            .into_iter()
-            .map(|ValidatorMessage(v, t)| (v.0, t.0))
-            .collect();
+        let messages: Vec<_> =
+            messages.into_iter().map(|vm| vm.to_inner()).collect();
         let is_valid = self
             .0
             .verify(shares_num, &messages)
@@ -569,6 +586,7 @@ pub fn make_ferveo_py_module(py: Python<'_>, m: &PyModule) -> PyResult<()> {
     m.add_class::<AggregatedTranscript>()?;
     m.add_class::<DkgPublicKey>()?;
     m.add_class::<SharedSecret>()?;
+    m.add_class::<ValidatorMessage>()?;
 
     // Exceptions
     m.add(
@@ -668,7 +686,10 @@ mod test_ferveo_python {
                     &sender,
                 )
                 .unwrap();
-                ValidatorMessage(sender, dkg.generate_transcript().unwrap())
+                ValidatorMessage::new(
+                    &sender,
+                    &dkg.generate_transcript().unwrap(),
+                )
             })
             .collect();
         (messages, validators, validator_keypairs)