Skip to content
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
20 changes: 6 additions & 14 deletions src/xxh3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1307,20 +1307,12 @@ impl Xxh3Builder {
#[inline(always)]
///Creates `Xxh3` instance
pub const fn build(self) -> Xxh3 {
let (seed, secret) = match self.seed {
Some(seed) => match self.secret {
//Use user's secret
Some(secret) => (seed, secret),
//Derive secret from seed
None => (seed, const_custom_default_secret(seed)),
},
None => match self.secret {
//Use user's secret
Some(secret) => (0, secret),
//Default hasher config
None => (0, DEFAULT_SECRET)
}
};
let (seed, secret) = match (self.seed, self.secret) {
(Some(seed), Some(secret)) => (seed, secret),
(Some(seed), None) => (seed, const_custom_default_secret(seed)),
(None, Some(secret)) => (0, secret),
(None, None) => (0, DEFAULT_SECRET),
};

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove extra 4 white spaces in front of }

Xxh3::with_custom_ops(seed, secret)
}
}
Expand Down
24 changes: 24 additions & 0 deletions tests/assert_correctness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,27 @@ fn assert_xxh3() {
hasher_default_128.reset();
}
}

#[cfg(feature = "xxh3")]
#[test]
fn xxh3_builder_seed_and_secret_are_order_independent() {
use xxhash_rust::xxh3::Xxh3Builder;

const SEED: u64 = 0x0123_4567_89ab_cdef;
const SECRET: [u8; 192] = [0xa5; 192];
const INPUT: [u8; 241] = [0x42; 241];

let mut seed_then_secret = Xxh3Builder::new()
.with_seed(SEED)
.with_secret(SECRET)
.build();
let mut secret_then_seed = Xxh3Builder::new()
.with_secret(SECRET)
.with_seed(SEED)
.build();

seed_then_secret.update(&INPUT);
secret_then_seed.update(&INPUT);

assert_eq!(seed_then_secret.digest(), secret_then_seed.digest());
}
Loading