0.6 specific fixes

divviup · Jan 26, 2024 · 4dba3c4 · 4dba3c4
1 parent 84c3740
commit 4dba3c4
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/aggregator/src/aggregator.rs b/aggregator/src/aggregator.rs
@@ -3864,7 +3864,7 @@ mod tests {
 
         // Try to upload the report, verify that we get the expected error.
         let error = aggregator
-            .handle_upload(task.id(), &report.get_encoded().unwrap())
+            .handle_upload(task.id(), &report.get_encoded())
             .await
             .unwrap_err();
         assert_matches!(
@@ -3920,7 +3920,7 @@ mod tests {
 
         // Try to upload the report, verify that we get the expected error.
         let error = aggregator
-            .handle_upload(task.id(), &report.get_encoded().unwrap())
+            .handle_upload(task.id(), &report.get_encoded())
             .await
             .unwrap_err();
         assert_matches!(
@@ -3976,7 +3976,7 @@ mod tests {
 
         // Try to upload the report, verify that we get the expected error.
         let error = aggregator
-            .handle_upload(task.id(), &report.get_encoded().unwrap())
+            .handle_upload(task.id(), &report.get_encoded())
             .await
             .unwrap_err();
         assert_matches!(
@@ -4031,7 +4031,7 @@ mod tests {
 
         // Try to upload the report, verify that we get the expected error.
         let error = aggregator
-            .handle_upload(task.id(), &report.get_encoded().unwrap())
+            .handle_upload(task.id(), &report.get_encoded())
             .await
             .unwrap_err();
         assert_matches!(
@@ -4083,24 +4083,21 @@ mod tests {
                 task.current_hpke_key().config(),
                 &HpkeApplicationInfo::new(&Label::InputShare, &Role::Client, &Role::Leader),
                 // Some obviously wrong payload.
-                &PlaintextInputShare::new(Vec::new(), vec![0; 100])
-                    .get_encoded()
-                    .unwrap(),
+                &PlaintextInputShare::new(Vec::new(), vec![0; 100]).get_encoded(),
                 &InputShareAad::new(
                     *task.id(),
                     report.metadata().clone(),
                     report.public_share().to_vec(),
                 )
-                .get_encoded()
-                .unwrap(),
+                .get_encoded(),
             )
             .unwrap(),
             report.helper_encrypted_input_share().clone(),
         );
 
         // Try to upload the report, verify that we get the expected error.
         let error = aggregator
-            .handle_upload(task.id(), &report.get_encoded().unwrap())
+            .handle_upload(task.id(), &report.get_encoded())
             .await
             .unwrap_err();
         assert_matches!(