Integration test using dummy VDAF with agg param (#2769)

Enable Janus to run the dummy VDAF from crate `prio` with arbitrary
rounds (by extending the representation of `VdafInstance::Fake`) and
with multiple aggregation parameters chosen by the test.

To that end, this resurrects some functionality previously deleted in
PR #1508, though it remains gated on `#[cfg(test)]`.

This wires up some tests for both time interval and fixed size tasks,
running multiple collections against a single batch with varying
aggregation parameters. However, a few tests are disabled because of
stuff that doesn't work yet:

- creating fixed size aggregation jobs w/ agg param
- using `Vdaf.is_valid` to check whether subsequent collections against a
  single batch are valid

Part of #225

Cargo.toml

@@ -47,7 +47,7 @@ k8s-openapi = { version = "0.20.0", features = ["v1_26"] }  # keep this version
 kube = { version = "0.87.2", default-features = false, features = ["client", "rustls-tls"] }
 opentelemetry = { version = "0.22", features = ["metrics"] }
 opentelemetry_sdk = { version = "0.22", features = ["metrics"] }
-prio = { version = "0.16.1", features = ["multithreaded", "experimental"] }
+prio = { version = "0.16.2", features = ["multithreaded", "experimental"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 serde_test = "1.0.175"

aggregator/src/aggregator.rs

@@ -942,7 +942,7 @@ impl<C: Clock> TaskAggregator<C> {
             }
 
             #[cfg(feature = "test-util")]
-            VdafInstance::Fake => VdafOps::Fake(Arc::new(dummy::Vdaf::new(1))),
+            VdafInstance::Fake { rounds } => VdafOps::Fake(Arc::new(dummy::Vdaf::new(*rounds))),
 
             #[cfg(feature = "test-util")]
             VdafInstance::FakeFailsPrepInit => VdafOps::Fake(Arc::new(

aggregator/src/aggregator/aggregate_init_tests.rs

@@ -176,7 +176,7 @@ pub(super) struct AggregationJobInitTestCase<
 pub(super) async fn setup_aggregate_init_test() -> AggregationJobInitTestCase<0, dummy::Vdaf> {
     setup_aggregate_init_test_for_vdaf(
         dummy::Vdaf::new(1),
-        VdafInstance::Fake,
+        VdafInstance::Fake { rounds: 1 },
         dummy::AggregationParam(0),
         0,
     )
@@ -324,7 +324,7 @@ pub(crate) async fn put_aggregation_job(
 async fn aggregation_job_init_authorization_dap_auth_token() {
     let test_case = setup_aggregate_init_test_without_sending_request(
         dummy::Vdaf::new(1),
-        VdafInstance::Fake,
+        VdafInstance::Fake { rounds: 1 },
         dummy::AggregationParam(0),
         0,
         AuthenticationToken::DapAuth(random()),
@@ -360,7 +360,7 @@ async fn aggregation_job_init_authorization_dap_auth_token() {
 async fn aggregation_job_init_malformed_authorization_header(#[case] header_value: &'static str) {
     let test_case = setup_aggregate_init_test_without_sending_request(
         dummy::Vdaf::new(1),
-        VdafInstance::Fake,
+        VdafInstance::Fake { rounds: 1 },
         dummy::AggregationParam(0),
         0,
         AuthenticationToken::Bearer(random()),
@@ -395,7 +395,7 @@ async fn aggregation_job_init_malformed_authorization_header(#[case] header_valu
 async fn aggregation_job_init_unexpected_taskprov_extension() {
     let test_case = setup_aggregate_init_test_without_sending_request(
         dummy::Vdaf::new(1),
-        VdafInstance::Fake,
+        VdafInstance::Fake { rounds: 1 },
         dummy::AggregationParam(0),
         0,
         random(),
@@ -541,7 +541,7 @@ async fn aggregation_job_mutation_report_aggregations() {
 async fn aggregation_job_intolerable_clock_skew() {
     let mut test_case = setup_aggregate_init_test_without_sending_request(
         dummy::Vdaf::new(1),
-        VdafInstance::Fake,
+        VdafInstance::Fake { rounds: 1 },
         dummy::AggregationParam(0),
         0,
         AuthenticationToken::Bearer(random()),