You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.1 KiB
70 lines
2.1 KiB
4 years ago
|
diff -Naur a/Cargo.toml b/Cargo.toml
|
||
|
|
--- a/Cargo.toml 2020-10-22 03:41:51.000000000 -0700
|
||
|
|
+++ b/Cargo.toml 2021-06-25 11:28:55.575860642 -0700
|
||
|
|
@@ -42,10 +42,10 @@
|
||
|
|
version = "0.3"
|
||
|
|
|
||
|
|
[dev-dependencies.quickcheck]
|
||
|
|
-version = "0.4"
|
||
|
|
+version = "1.0"
|
||
|
|
|
||
|
|
[dev-dependencies.rand]
|
||
|
|
-version = "0.3"
|
||
|
|
+version = "0.8"
|
||
|
|
|
||
|
|
[dev-dependencies.serde_test]
|
||
|
|
version = "1.0"
|
||
|
|
diff -Naur a/src/qc_test.rs b/src/qc_test.rs
|
||
|
|
--- a/src/qc_test.rs 2019-11-16 23:50:28.000000000 -0800
|
||
|
|
+++ b/src/qc_test.rs 2021-06-25 11:28:40.618805434 -0700
|
||
|
|
@@ -13,21 +13,21 @@
|
||
|
|
|
||
|
|
const MAX_KEYS: usize = 512;
|
||
|
|
const KEY_RUN_LEN: usize = 8;
|
||
|
|
-const KEY_MAX_VAL: u8 = 4;
|
||
|
|
+const KEY_MAX_VAL: usize = 4;
|
||
|
|
|
||
|
|
impl Arbitrary for Key {
|
||
|
|
- fn arbitrary<G: Gen>(g: &mut G) -> Key {
|
||
|
|
- let len = g.gen::<usize>() % KEY_RUN_LEN;
|
||
|
|
+ fn arbitrary(g: &mut Gen) -> Key {
|
||
|
|
+ let len = g.size() % KEY_RUN_LEN;
|
||
|
|
let mut key = Vec::with_capacity(len);
|
||
|
|
for _ in 0..len {
|
||
|
|
- key.push(g.gen::<u8>() % KEY_MAX_VAL);
|
||
|
|
+ key.push((g.size() % KEY_MAX_VAL) as u8);
|
||
|
|
}
|
||
|
|
Key(key)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
impl Key {
|
||
|
|
- fn extend_random<G: Gen>(&self, g: &mut G) -> Key {
|
||
|
|
+ fn extend_random(&self, g: &mut Gen) -> Key {
|
||
|
|
self.extend(Key::arbitrary(g))
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -49,18 +49,18 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
impl Arbitrary for RandomKeys {
|
||
|
|
- fn arbitrary<G: Gen>(g: &mut G) -> RandomKeys {
|
||
|
|
- let num_keys = g.gen::<usize>() % MAX_KEYS;
|
||
|
|
+ fn arbitrary(g: &mut Gen) -> RandomKeys {
|
||
|
|
+ let num_keys = g.size() % MAX_KEYS;
|
||
|
|
let mut keys = Vec::with_capacity(num_keys);
|
||
|
|
keys.push(Key::arbitrary(g));
|
||
|
|
|
||
|
|
for _ in 0..num_keys {
|
||
|
|
- match g.gen::<u8>() % 10 {
|
||
|
|
+ match g.size() % 10 {
|
||
|
|
// Generate a new random key.
|
||
|
|
1 => keys.push(Key::arbitrary(g)),
|
||
|
|
// Extend an existing key.
|
||
|
|
_ => {
|
||
|
|
- let i = g.gen::<usize>() % keys.len();
|
||
|
|
+ let i = g.size() % keys.len();
|
||
|
|
let key = keys[i].extend_random(g);
|
||
|
|
keys.push(key);
|
||
|
|
}
|