Fix unit tests in collect example binary (#615)

divviup · Oct 7, 2022 · d8bc70b · d8bc70b
1 parent 566c33a
commit d8bc70b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -53,14 +53,14 @@ jobs:
     - name: Cache dependencies
       uses: Swatinem/rust-cache@v2
     - name: Build
-      run: cargo test --no-run --locked
+      run: cargo test --no-run --locked --all-targets
     - name: Build minimal janus_messages
       run: cargo build --package janus_messages --no-default-features
     - name: Test
       id: test
       env:
         JANUS_E2E_LOGS_PATH: ${{ github.workspace }}/test-logs
-      run: cargo test
+      run: cargo test --all-targets
       # Continue on error so we can upload logs
       continue-on-error: true
     - name: Upload container logs

diff --git a/janus_collector/examples/collect.rs b/janus_collector/examples/collect.rs
@@ -383,6 +383,7 @@ mod tests {
     use assert_matches::assert_matches;
     use janus_core::hpke::test_util::generate_test_hpke_config_and_private_key;
     use prio::codec::Encode;
+    use rand::random;
 
     #[test]
     fn verify_app() {
@@ -395,7 +396,7 @@ mod tests {
         let encoded_hpke_config = base64::encode_config(hpke_config.get_encoded(), URL_SAFE_NO_PAD);
         let encoded_private_key = base64::encode_config(hpke_private_key.as_ref(), URL_SAFE_NO_PAD);
 
-        let task_id = TaskId::random();
+        let task_id: TaskId = random();
         let task_id_encoded = base64::encode_config(task_id.get_encoded(), URL_SAFE_NO_PAD);
 
         let leader = Url::parse("https://example.com/dap/").unwrap();
@@ -501,31 +502,31 @@ mod tests {
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut bad_arguments = base_arguments.clone();
         bad_arguments.extend(["--vdaf=sum", "--buckets=1,2,3,4"]);
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut bad_arguments = base_arguments.clone();
         bad_arguments.extend(["--vdaf=countvec", "--buckets=1,2,3,4"]);
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut bad_arguments = base_arguments.clone();
         bad_arguments.extend(["--vdaf=countvec", "--bits=3"]);
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut bad_arguments = base_arguments.clone();
@@ -540,15 +541,15 @@ mod tests {
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut bad_arguments = base_arguments.clone();
         bad_arguments.extend(["--vdaf=sum"]);
         let bad_options = Options::try_parse_from(bad_arguments).unwrap();
         assert_matches!(
             run(bad_options).await.unwrap_err(),
-            Error::Clap(err) => assert_eq!(err.kind, ErrorKind::ArgumentConflict)
+            Error::Clap(err) => assert_eq!(err.kind(), ErrorKind::ArgumentConflict)
         );
 
         let mut good_arguments = base_arguments.clone();