Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump VERSION, update Prio3 test vectors #852

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vdaf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use subtle::{Choice, ConstantTimeEq};

/// A component of the domain-separation tag, used to bind the VDAF operations to the document
/// version. This will be revised with each draft with breaking changes.
pub(crate) const VERSION: u8 = 7;
pub(crate) const VERSION: u8 = 8;

/// Errors emitted by this module.
#[derive(Debug, thiserror::Error)]
Expand Down
20 changes: 8 additions & 12 deletions src/vdaf/prio3_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,10 @@ where
}

#[test]
#[ignore = "VDAF-08 support is incomplete"]
fn test_vec_prio3_count() {
for test_vector_str in [
include_str!("test_vec/07/Prio3Count_0.json"),
include_str!("test_vec/07/Prio3Count_1.json"),
include_str!("test_vec/08/Prio3Count_0.json"),
include_str!("test_vec/08/Prio3Count_1.json"),
] {
let t: TPrio3<u64> = serde_json::from_str(test_vector_str).unwrap();
let prio3 = Prio3::new_count(t.shares).unwrap();
Expand All @@ -190,11 +189,10 @@ fn test_vec_prio3_count() {
}

#[test]
#[ignore = "VDAF-08 support is incomplete"]
fn test_vec_prio3_sum() {
for test_vector_str in [
include_str!("test_vec/07/Prio3Sum_0.json"),
include_str!("test_vec/07/Prio3Sum_1.json"),
include_str!("test_vec/08/Prio3Sum_0.json"),
include_str!("test_vec/08/Prio3Sum_1.json"),
] {
let t: TPrio3<u128> = serde_json::from_str(test_vector_str).unwrap();
let bits = t.other_params["bits"].as_u64().unwrap() as usize;
Expand All @@ -206,11 +204,10 @@ fn test_vec_prio3_sum() {
}

#[test]
#[ignore = "VDAF-08 support is incomplete"]
fn test_vec_prio3_sum_vec() {
for test_vector_str in [
include_str!("test_vec/07/Prio3SumVec_0.json"),
include_str!("test_vec/07/Prio3SumVec_1.json"),
include_str!("test_vec/08/Prio3SumVec_0.json"),
include_str!("test_vec/08/Prio3SumVec_1.json"),
] {
let t: TPrio3<Vec<u128>> = serde_json::from_str(test_vector_str).unwrap();
let bits = t.other_params["bits"].as_u64().unwrap() as usize;
Expand All @@ -231,11 +228,10 @@ fn test_vec_prio3_sum_vec() {
}

#[test]
#[ignore = "VDAF-08 support is incomplete"]
fn test_vec_prio3_histogram() {
for test_vector_str in [
include_str!("test_vec/07/Prio3Histogram_0.json"),
include_str!("test_vec/07/Prio3Histogram_1.json"),
include_str!("test_vec/08/Prio3Histogram_0.json"),
include_str!("test_vec/08/Prio3Histogram_1.json"),
] {
let t: TPrio3<usize> = serde_json::from_str(test_vector_str).unwrap();
let length = t.other_params["length"].as_u64().unwrap() as usize;
Expand Down
52 changes: 0 additions & 52 deletions src/vdaf/test_vec/07/Prio3Histogram_0.json

This file was deleted.

89 changes: 0 additions & 89 deletions src/vdaf/test_vec/07/Prio3Histogram_1.json

This file was deleted.

Loading