SQUASH Mendes round 1

daphne/src/testing.rs

@@ -1204,8 +1204,8 @@ impl AggregationJobTest {
  prometheus_registry,
  leader_metrics,
  helper_metrics,
- leader_reports_processed: Arc::new(Mutex::new(HashSet::new())),
- helper_reports_processed: Arc::new(Mutex::new(HashSet::new())),
+ leader_reports_processed: Default::default(),
+ helper_reports_processed: Default::default(),
  }
  }
 

daphne/src/vdaf/mod.rs

@@ -665,6 +665,7 @@ impl VdafConfig {
  .initialize_reports(true, task_id, task_config, part_batch_sel, consumed_reports)
  .await?;
 
+ assert_eq!(initialized_reports.len(), helper_shares.len());
  for (initialized_report, helper_share) in initialized_reports
  .into_iter()
  .zip(helper_shares.into_iter())

daphne_worker/src/dap.rs

@@ -297,11 +297,11 @@ impl DapReportInitializer for DaphneWorker<'_> {
  } = initialized_report
  {
  // The request to ReportsProcessed is not idempotent. If it was retried, then
- // it's possible that one or more of the reports were erroneously as replayed.
- // This would happen if, for example, a fresh report was marked as aggregated
- // in the failed request, then marked as replayed by a retried request. In this
- // case we cannot determine definitively if the report was replayed, so we drop
- // it to be safe.
+ // it's possible that one or more of the reports were erroneously marked as
+ // replayed. This would happen if, for example, a fresh report was marked as
+ // aggregated in the failed request, then marked as replayed by a retried
+ // request. In this case we cannot determine definitively if the report was
+ // replayed, so we drop it to be safe.
  if retried && matches!(failure, TransitionFailure::ReportReplayed) {
  *failure = TransitionFailure::ReportDropped;
  }