Test cleanup
GenKey unit tests were in the benchmark suite.
This commit is contained in:
parent
87e025fe22
commit
d4959bc157
|
@ -502,7 +502,7 @@ impl Crdt {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod tests {
|
||||||
use crdt::{Crdt, ReplicatedData};
|
use crdt::{Crdt, ReplicatedData};
|
||||||
use logger;
|
use logger;
|
||||||
use packet::Blob;
|
use packet::Blob;
|
||||||
|
|
|
@ -72,27 +72,23 @@ impl GenKeys {
|
||||||
pub fn gen_n_seeds(&self, n_seeds: i64) -> Vec<[u8; 16]> {
|
pub fn gen_n_seeds(&self, n_seeds: i64) -> Vec<[u8; 16]> {
|
||||||
let mut rng = self.generator.borrow_mut();
|
let mut rng = self.generator.borrow_mut();
|
||||||
|
|
||||||
let seeds = (0..n_seeds)
|
(0..n_seeds)
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|_| {
|
.map(|_| rng.gen::<[u8; 16]>())
|
||||||
let seed: [u8; 16] = rng.gen();
|
.collect()
|
||||||
seed
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
seeds
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn gen_n_keys(&self, n_keys: i64, tokens_per_user: i64) -> Vec<(Vec<u8>, i64)> {
|
pub fn gen_n_keys(&self, n_keys: i64, tokens_per_user: i64) -> Vec<(Vec<u8>, i64)> {
|
||||||
let keys = self.gen_n_seeds(n_keys);
|
let seeds = self.gen_n_seeds(n_keys);
|
||||||
|
|
||||||
let users: Vec<_> = keys.into_par_iter()
|
seeds
|
||||||
|
.into_par_iter()
|
||||||
.map(|seed| {
|
.map(|seed| {
|
||||||
let new: GenKeys = GenKeys::new(&seed[..]);
|
let new: GenKeys = GenKeys::new(&seed[..]);
|
||||||
let pkcs8 = KeyPair::generate_pkcs8(&new).unwrap().to_vec();
|
let pkcs8 = KeyPair::generate_pkcs8(&new).unwrap().to_vec();
|
||||||
(pkcs8, tokens_per_user)
|
(pkcs8, tokens_per_user)
|
||||||
})
|
})
|
||||||
.collect();
|
.collect()
|
||||||
users
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,22 +100,12 @@ impl SecureRandom for GenKeys {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(feature = "unstable", test))]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
extern crate test;
|
|
||||||
|
|
||||||
use self::test::Bencher;
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::iter::FromIterator;
|
use std::iter::FromIterator;
|
||||||
|
|
||||||
#[bench]
|
|
||||||
fn bench_gen_keys(b: &mut Bencher) {
|
|
||||||
let seed: &[_] = &[1, 2, 3, 4];
|
|
||||||
let rnd = GenKeys::new(seed);
|
|
||||||
b.iter(|| rnd.gen_n_keys(1000, 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_new_key_is_redundant() {
|
fn test_new_key_is_redundant() {
|
||||||
let seed: &[_] = &[1, 2, 3, 4];
|
let seed: &[_] = &[1, 2, 3, 4];
|
||||||
|
@ -145,3 +131,20 @@ mod tests {
|
||||||
assert_eq!(users1_set, users2_set);
|
assert_eq!(users1_set, users2_set);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(all(feature = "unstable", test))]
|
||||||
|
mod bench {
|
||||||
|
extern crate test;
|
||||||
|
|
||||||
|
use self::test::Bencher;
|
||||||
|
use super::*;
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use std::iter::FromIterator;
|
||||||
|
|
||||||
|
#[bench]
|
||||||
|
fn bench_gen_keys(b: &mut Bencher) {
|
||||||
|
let seed: &[_] = &[1, 2, 3, 4];
|
||||||
|
let rnd = GenKeys::new(seed);
|
||||||
|
b.iter(|| rnd.gen_n_keys(1000, 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue