Continue debugging.

Author: jhoyla

crates/daphne-server/tests/e2e/e2e.rs

@@ -1495,6 +1495,7 @@ async fn leader_collect_taskprov_ok(version: DapVersion) {
         "Now - batch_interval.start: {}",
         t.now - batch_interval.start
     );
+    println!("t.now: {}", t.now);
     let path = TestRunner::upload_path_for_task(&task_id);
     let method = match version {
         DapVersion::Draft09 => &Method::PUT,
@@ -1506,6 +1507,7 @@ async fn leader_collect_taskprov_ok(version: DapVersion) {
     for _ in 0..t.task_config.min_batch_size {
         let extensions = vec![Extension::Taskprov];
         let now = rng.gen_range(TestRunner::report_interval(&batch_interval));
+        println!("\tnow: {}", now);
         t.leader_request_expect_ok(
             client,
             &path,

crates/daphne-server/tests/e2e/test_runner.rs

@@ -328,7 +328,7 @@ impl TestRunner {
         const REPORT_STORAGE_MAX_FUTURE_TIME_SKEW: u64 = 300;
         // This is a portion of the interval which is guaranteed to be a valid report time
         // provided that the interval start time is valid.
-        interval.start..interval.start + REPORT_STORAGE_MAX_FUTURE_TIME_SKEW
+        interval.start..interval.start + interval.duration + REPORT_STORAGE_MAX_FUTURE_TIME_SKEW
     }
 
     pub async fn get_hpke_configs(

crates/daphne/src/protocol/report_init.rs

@@ -148,20 +148,24 @@ impl<P> InitializedReport<P> {
         let task_config = task_config.into();
         macro_rules! reject {
             ($failure:ident) => {
+                {tracing::warn!("Rejected - {}\nTimestamp - {}", ReportError::$failure, report_share.report_metadata.time);
                 return Ok(InitializedReport::Rejected {
                     metadata: report_share.report_metadata,
                     report_err: ReportError::$failure,
-                })
+                })}
             };
         }
+
+        tracing::info!("valid_report_range: {}..{}", valid_report_range.start, valid_report_range.end);
         match report_share.report_metadata.time {
             t if t >= task_config.not_after => reject!(TaskExpired),
-            t if t < task_config.not_before => reject!(TaskNotStarted),
+            t if t < task_config.not_before => {tracing::warn!("Reject TaskNotStarted"); reject!(TaskNotStarted)},
             t if t < valid_report_range.start => reject!(ReportDropped),
             t if valid_report_range.end < t => reject!(ReportTooEarly),
             _ => {}
         }
 
+        tracing::warn!("All tests pass");
         match (
             &report_share.report_metadata.public_extensions,
             task_config.version,

crates/daphne/src/roles/leader/mod.rs

@@ -228,14 +228,9 @@ pub async fn handle_upload_req<A: DapLeader>(
     // Check that the report was generated after the task's `not_before` time.
     println!(
         "report_metadata.time - task_config.not_before: {}",
-        report.report_metadata.time - task_config.as_ref().not_before
+        report.report_metadata.time as i128 - task_config.as_ref().not_before as i128
     );
-    if report.report_metadata.time < task_config.as_ref().not_before {
-        return Err(DapAbort::ReportRejected {
-            detail: "The timestamp preceeds the start of the task".into(),
-        }
-        .into());
-    }
+    println!("report_metadata.time: {}", report.report_metadata.time);
 
     if let Some(public_extensions) = &report.report_metadata.public_extensions {
         // We can be sure at this point that the ReportMetadata is well formed