Update to prio 0.12 (#1117)

divviup · Mar 22, 2023 · 00be66d · 00be66d
1 parent 5524439
commit 00be66d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ janus_interop_binaries = { version = "0.3", path = "interop_binaries" }
 janus_messages = { version = "0.3", path = "messages" }
 k8s-openapi = { version = "0.16.0", features = ["v1_24"] }  # keep this version in sync with what is referenced by the indirect dependency via `kube`
 kube = { version = "0.75.0", default-features = false, features = ["client"] }
-prio = { version = "0.11.1", features = ["multithreaded"] }
+prio = { version = "0.12.0", features = ["multithreaded"] }
 
 [profile.dev]
 # Disabling debug info improves build speeds & reduces build artifact sizes, which helps CI caching.

diff --git a/core/src/task.rs b/core/src/task.rs
@@ -22,7 +22,7 @@ pub enum VdafInstance {
     /// A vector of `Prio3` counters.
     Prio3CountVec { length: usize },
     /// A `Prio3` sum.
-    Prio3Sum { bits: u32 },
+    Prio3Sum { bits: usize },
     /// A vector of `Prio3` sums.
     Prio3SumVec { bits: usize, length: usize },
     /// A `Prio3` histogram.
@@ -617,7 +617,7 @@ mod tests {
                     len: 1,
                 },
                 Token::Str("bits"),
-                Token::U32(64),
+                Token::U64(64),
                 Token::StructVariantEnd,
             ],
         );

diff --git a/interop_binaries/src/lib.rs b/interop_binaries/src/lib.rs
@@ -106,7 +106,7 @@ pub enum VdafObject {
         length: NumberAsString<usize>,
     },
     Prio3Sum {
-        bits: NumberAsString<u32>,
+        bits: NumberAsString<usize>,
     },
     Prio3SumVec {
         bits: NumberAsString<usize>,

diff --git a/messages/Cargo.toml b/messages/Cargo.toml
@@ -20,7 +20,7 @@ hex = "0.4"
 num_enum = "0.5.11"
 # We can't pull prio in from the workspace because that would enable default features, and we do not
 # want prio/crypto-dependencies
-prio = { version = "0.11.1", default-features = false }
+prio = { version = "0.12.0", default-features = false }
 rand = "0.8"
 serde = { version = "1.0.158", features = ["derive"] }
 thiserror = "1.0"

diff --git a/tools/src/bin/collect.rs b/tools/src/bin/collect.rs
@@ -304,7 +304,7 @@ struct Options {
     length: Option<usize>,
     /// Bit length of measurements, for use with --vdaf=sum
     #[clap(long, help_heading = "VDAF Algorithm and Parameters")]
-    bits: Option<u32>,
+    bits: Option<usize>,
     /// Comma-separated list of bucket boundaries, for use with --vdaf=histogram
     #[clap(
         long,