Skip to content

Commit

Permalink
fix most of the remaining tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@oconnor663
oconnor663 committed Jul 10, 2023
1 parent 7c86c59 commit 92abb7c
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 53 deletions.
30 changes: 28 additions & 2 deletions rust/blake3_guts/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ impl Implementation {
block_len,
cv,
counter,
flags,
flags | ROOT,
out.as_mut_ptr(),
out.len(),
);
Expand Down Expand Up @@ -392,7 +392,7 @@ impl Implementation {
block_len,
cv,
counter,
flags,
flags | ROOT,
out.as_mut_ptr(),
out.len(),
);
Expand Down Expand Up @@ -894,6 +894,32 @@ pub fn largest_power_of_two_leq(n: usize) -> usize {
((n / 2) + 1).next_power_of_two()
}

#[test]
fn test_largest_power_of_two_leq() {
let input_output = &[
// The zero case is nonsensical, but it does work.
(0, 1),
(1, 1),
(2, 2),
(3, 2),
(4, 4),
(5, 4),
(6, 4),
(7, 4),
(8, 8),
// the largest possible usize
(usize::MAX, (usize::MAX >> 1) + 1),
];
for &(input, output) in input_output {
assert_eq!(
output,
crate::largest_power_of_two_leq(input),
"wrong output for n={}",
input
);
}
}

// Given some input larger than one chunk, return the number of bytes that
// should go in the left subtree. This is the largest power-of-2 number of
// chunks that leaves at least 1 byte for the right subtree.
Expand Down
6 changes: 3 additions & 3 deletions rust/blake3_guts/src/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ pub fn test_chunks_and_parents_vs_reference(test_impl: &Implementation) {
}

pub fn test_xof_vs_portable(test_impl: &Implementation) {
let flags = CHUNK_START | CHUNK_END | ROOT | KEYED_HASH;
let flags = CHUNK_START | CHUNK_END | KEYED_HASH;
for counter in INITIAL_COUNTERS {
dbg!(counter);
for input_len in [0, 1, BLOCK_LEN] {
Expand Down Expand Up @@ -388,7 +388,7 @@ pub fn test_xof_vs_reference(test_impl: &Implementation) {
input.len() as u32,
&TEST_KEY,
0,
crate::KEYED_HASH | crate::CHUNK_START | crate::CHUNK_END | crate::ROOT,
KEYED_HASH | CHUNK_START | CHUNK_END,
&mut test_output[..output_len],
);
assert_eq!(ref_output[..output_len], test_output[..output_len]);
Expand All @@ -403,7 +403,7 @@ pub fn test_xof_vs_reference(test_impl: &Implementation) {
input.len() as u32,
&TEST_KEY,
1,
crate::KEYED_HASH | crate::CHUNK_START | crate::CHUNK_END | crate::ROOT,
KEYED_HASH | CHUNK_START | CHUNK_END,
&mut test_output[..output_len - BLOCK_LEN],
);
assert_eq!(
Expand Down
64 changes: 16 additions & 48 deletions src/test.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use blake3_guts as guts;
use guts::{CVBytes, CVWords, BLOCK_LEN, CHUNK_LEN, OUT_LEN, UNIVERSAL_HASH_LEN};
use guts::{CVBytes, CVWords, BLOCK_LEN, CHUNK_LEN};

use arrayvec::ArrayVec;
use core::cmp;
use core::usize;
use rand::prelude::*;

Expand Down Expand Up @@ -53,10 +51,7 @@ pub const TEST_KEY_WORDS: &CVWords = &guts::words_from_le_bytes_32(TEST_KEY);

#[test]
fn test_key_bytes_equal_key_words() {
assert_eq!(
TEST_KEY_WORDS,
&crate::platform::words_from_le_bytes_32(TEST_KEY),
);
assert_eq!(TEST_KEY, &guts::le_bytes_from_words_32(TEST_KEY_WORDS),);
}

#[test]
Expand All @@ -69,36 +64,9 @@ fn test_reference_impl_size() {
assert_eq!(1880, core::mem::size_of::<reference_impl::Hasher>());
}

#[test]
fn test_counter_words() {
let counter: u64 = (1 << 32) + 2;
assert_eq!(crate::counter_low(counter), 2);
assert_eq!(crate::counter_high(counter), 1);
}

#[test]
fn test_largest_power_of_two_leq() {
let input_output = &[
// The zero case is nonsensical, but it does work.
(0, 1),
(1, 1),
(2, 2),
(3, 2),
(4, 4),
(5, 4),
(6, 4),
(7, 4),
(8, 8),
// the largest possible usize
(usize::MAX, (usize::MAX >> 1) + 1),
];
for &(input, output) in input_output {
assert_eq!(
output,
crate::largest_power_of_two_leq(input),
"wrong output for n={}",
input
);
fn paint_test_input(buf: &mut [u8]) {
for (i, b) in buf.iter_mut().enumerate() {
*b = (i % 251) as u8;
}
}

Expand All @@ -121,18 +89,18 @@ fn test_compare_reference_impl() {

// all at once
let test_out = crate::hash(input);
assert_eq!(test_out, *array_ref!(expected_out, 0, 32));
assert_eq!(test_out, expected_out[..32]);
// incremental
let mut hasher = crate::Hasher::new();
hasher.update(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out);
// incremental (rayon)
#[cfg(feature = "rayon")]
{
let mut hasher = crate::Hasher::new();
hasher.update_rayon(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out);
}
// xof
Expand All @@ -150,18 +118,18 @@ fn test_compare_reference_impl() {

// all at once
let test_out = crate::keyed_hash(TEST_KEY, input);
assert_eq!(test_out, *array_ref!(expected_out, 0, 32));
assert_eq!(test_out, expected_out[..32]);
// incremental
let mut hasher = crate::Hasher::new_keyed(TEST_KEY);
hasher.update(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out);
// incremental (rayon)
#[cfg(feature = "rayon")]
{
let mut hasher = crate::Hasher::new_keyed(TEST_KEY);
hasher.update_rayon(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out);
}
// xof
Expand All @@ -184,15 +152,15 @@ fn test_compare_reference_impl() {
// incremental
let mut hasher = crate::Hasher::new_derive_key(context);
hasher.update(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), *array_ref!(test_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out[..32]);
// incremental (rayon)
#[cfg(feature = "rayon")]
{
let mut hasher = crate::Hasher::new_derive_key(context);
hasher.update_rayon(input);
assert_eq!(hasher.finalize(), *array_ref!(expected_out, 0, 32));
assert_eq!(hasher.finalize(), *array_ref!(test_out, 0, 32));
assert_eq!(hasher.finalize(), expected_out[..32]);
assert_eq!(hasher.finalize(), test_out[..32]);
}
// xof
let mut extended = [0; OUT];
Expand Down Expand Up @@ -335,7 +303,7 @@ fn test_msg_schedule_permutation() {
}
}

assert_eq!(generated, crate::MSG_SCHEDULE);
assert_eq!(generated, guts::MSG_SCHEDULE);
}

#[test]
Expand Down

0 comments on commit 92abb7c

Please sign in to comment.