Rename get_{,hpke_}receiver_configs

cloudflare · Jan 3, 2025 · f839d01 · f839d01
1 parent 933aaba
commit f839d01
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/crates/daphne-server/src/roles/aggregator.rs b/crates/daphne-server/src/roles/aggregator.rs
@@ -422,7 +422,7 @@ impl HpkeProvider for crate::App {
             .unwrap_or(false))
     }
 
-    async fn get_receiver_configs<'s>(
+    async fn get_hpke_receiver_configs<'s>(
         &'s self,
         version: DapVersion,
     ) -> Result<Self::ReceiverConfigs<'s>, DapError> {

diff --git a/crates/daphne/src/hpke.rs b/crates/daphne/src/hpke.rs
@@ -235,7 +235,7 @@ pub trait HpkeProvider {
         task_id: Option<&TaskId>,
     ) -> Result<Self::WrappedHpkeConfig<'s>, DapError>;
 
-    async fn get_receiver_configs<'s>(
+    async fn get_hpke_receiver_configs<'s>(
         &'s self,
         version: DapVersion,
     ) -> Result<Self::ReceiverConfigs<'s>, DapError>;

diff --git a/crates/daphne/src/roles/helper/handle_agg_job.rs b/crates/daphne/src/roles/helper/handle_agg_job.rs
@@ -119,7 +119,9 @@ impl HandleAggJob<WithTaskConfig> {
         let task_id = request.task_id;
         let part_batch_sel = request.payload.part_batch_sel.clone();
         let initialized_reports = task_config.consume_agg_job_req(
-            &aggregator.get_receiver_configs(task_config.version).await?,
+            &aggregator
+                .get_hpke_receiver_configs(task_config.version)
+                .await?,
             aggregator.valid_report_time_range(),
             &task_id,
             request.payload,

diff --git a/crates/daphne/src/roles/leader/mod.rs b/crates/daphne/src/roles/leader/mod.rs
@@ -302,7 +302,9 @@ async fn run_agg_job<A: DapLeader>(
     // Prepare AggregationJobInitReq.
     let agg_job_id = AggregationJobId(thread_rng().gen());
     let (agg_job_state, agg_job_init_req) = task_config.produce_agg_job_req(
-        aggregator.get_receiver_configs(task_config.version).await?,
+        aggregator
+            .get_hpke_receiver_configs(task_config.version)
+            .await?,
         aggregator.valid_report_time_range(),
         task_id,
         part_batch_sel,

diff --git a/crates/daphne/src/testing/mod.rs b/crates/daphne/src/testing/mod.rs
@@ -640,7 +640,7 @@ impl HpkeProvider for InMemoryAggregator {
         Ok(&self.hpke_receiver_config_list[0].config)
     }
 
-    async fn get_receiver_configs<'s>(
+    async fn get_hpke_receiver_configs<'s>(
         &'s self,
         _version: DapVersion,
     ) -> Result<Self::ReceiverConfigs<'s>, DapError> {