fmt

rust/src/client/participant.rs

@@ -170,7 +170,8 @@ impl Participant {
         mask_len: usize,
     ) -> Result<MessageOwned, PetError> {
         let mask_seeds = self.get_seeds(seed_dict)?;
-        let (model_mask, scalar_mask) = self.compute_global_mask(mask_seeds, mask_len, dummy_config())?;
+        let (model_mask, scalar_mask) =
+            self.compute_global_mask(mask_seeds, mask_len, dummy_config())?;
         let payload = Sum2Owned {
             sum_signature: self.sum_signature,
             model_mask,
@@ -220,7 +221,7 @@ impl Participant {
     }
 
     /// Compute a global mask from local mask seeds.
-    fn compute_global_mask( // TODO rename aggregate_masks
+    fn compute_global_mask(
         &self,
         mask_seeds: Vec<MaskSeed>,
         mask_len: usize,

rust/src/mask/seed.rs

@@ -53,9 +53,9 @@ impl MaskSeed {
         EncryptedMaskSeed::from_slice_unchecked(pk.encrypt(self.as_slice()).as_slice())
     }
 
-    // TODO separate config for scalar mask
+    // TODO separate config for scalar mask - future refactoring
     /// Derives a mask of given length from this seed wrt the masking configuration.
-    pub fn derive_mask(&self, len: usize, config: MaskConfig) -> (MaskObject, MaskObject) { // TODO rename derive_masks
+    pub fn derive_mask(&self, len: usize, config: MaskConfig) -> (MaskObject, MaskObject) {
         let mut prng = ChaCha20Rng::from_seed(self.as_array());
         let rand_ints = iter::repeat_with(|| generate_integer(&mut prng, &config.order()))
             .take(len)

rust/src/message/payload/sum2.rs

@@ -171,8 +171,12 @@ where
     fn to_bytes<T: AsMut<[u8]>>(&self, buffer: &mut T) {
         let mut writer = Sum2Buffer::new_unchecked(buffer.as_mut());
         self.sum_signature.to_bytes(&mut writer.sum_signature_mut());
-        self.model_mask.borrow().to_bytes(&mut writer.model_mask_mut());
-        self.scalar_mask.borrow().to_bytes(&mut writer.scalar_mask_mut());
+        self.model_mask
+            .borrow()
+            .to_bytes(&mut writer.model_mask_mut());
+        self.scalar_mask
+            .borrow()
+            .to_bytes(&mut writer.scalar_mask_mut());
     }
 }
 
@@ -252,7 +256,9 @@ pub(in crate::message) mod tests {
                 .copy_from_slice(&helpers::signature().1[..]);
             let expected = helpers::mask().1;
             buffer.model_mask_mut()[..expected.len()].copy_from_slice(&expected[..]);
-            buffer.scalar_mask_mut().copy_from_slice(&helpers::mask_1().1[..]);
+            buffer
+                .scalar_mask_mut()
+                .copy_from_slice(&helpers::mask_1().1[..]);
         }
         assert_eq!(&bytes[..], &helpers::sum2().1[..]);
     }

rust/src/services/mod.rs

@@ -82,13 +82,7 @@ pub fn fetcher(event_subscriber: &EventSubscriber) -> impl Fetcher + Sync + Send
         .concurrency_limit(100)
         .service(SeedDictService::new(event_subscriber));
 
-    FetcherService::new(
-        round_params,
-        sum_dict,
-        seed_dict,
-        mask_length,
-        model,
-    )
+    FetcherService::new(round_params, sum_dict, seed_dict, mask_length, model)
 }
 
 /// Construct a [`PetMessageHandler`] service

rust/src/state_machine/phases/sum2.rs

@@ -145,7 +145,7 @@ impl PhaseState<Sum2> {
         shared: Shared,
         sum_dict: SumDict,
         model_agg: Aggregation,
-        scalar_agg: Aggregation
+        scalar_agg: Aggregation,
     ) -> Self {
         info!("state transition");
         Self {
@@ -206,7 +206,10 @@ impl PhaseState<Sum2> {
         let sum1 = self.inner.model_mask_dict.values().sum();
         let sum2: usize = self.inner.scalar_mask_dict.values().sum();
         if sum1 != sum2 {
-            warn!("unexpected difference in mask sum count: {} vs {}", sum1, sum2);
+            warn!(
+                "unexpected difference in mask sum count: {} vs {}",
+                sum1, sum2
+            );
         }
         sum1
     }

rust/src/state_machine/requests.rs

@@ -60,7 +60,7 @@ pub struct Sum2Request {
     /// The model mask computed by the participant.
     pub model_mask: MaskObject,
     /// The scalar mask computed by the participant.
-    pub scalar_mask: MaskObject
+    pub scalar_mask: MaskObject,
 }
 
 /// A [`StateMachine`] request.