diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-02-12 11:23:10 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-02-12 14:24:48 +0100 |
| commit | e3ef789d264d2ed7edaed191195ef0c014be7856 (patch) | |
| tree | 193fa1abace780fb570d5209ef1c28e28bab48fd | |
| parent | 5511ed2aada2e542b470ce9c8ded00441038a103 (diff) | |
| download | mullvadvpn-e3ef789d264d2ed7edaed191195ef0c014be7856.tar.xz mullvadvpn-e3ef789d264d2ed7edaed191195ef0c014be7856.zip | |
Simplify jitter test
| -rw-r--r-- | talpid-core/src/future_retry.rs | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/talpid-core/src/future_retry.rs b/talpid-core/src/future_retry.rs index a88f6c3b36..8b4745a7b2 100644 --- a/talpid-core/src/future_retry.rs +++ b/talpid-core/src/future_retry.rs @@ -139,7 +139,6 @@ fn apply_jitter(duration: Duration, jitter: f64) -> Duration { #[cfg(test)] mod test { use super::*; - use rand::SeedableRng; #[test] fn test_exponetnial_backoff() { @@ -187,22 +186,10 @@ mod test { assert_eq!(apply_jitter(second, 1.0), second); } - #[derive(Clone, Debug)] - struct ArbitraryJitter(f64); - impl quickcheck::Arbitrary for ArbitraryJitter { - fn arbitrary(_g: &mut quickcheck::Gen) -> Self { - // This should not be private: - // g.gen_range - - let mut rng = rand::rngs::SmallRng::from_entropy(); - let jitter: f64 = rng.sample(OpenClosed01); - ArbitraryJitter(jitter) - } - } - #[quickcheck_macros::quickcheck] - fn test_jitter(millis: u64, jitter: ArbitraryJitter) { - let jitter = jitter.0; + fn test_jitter(millis: u64, jitter: u64) { + let max_num = 2u64.checked_pow(f64::MANTISSA_DIGITS).unwrap(); + let jitter = (jitter % max_num) as f64 / (max_num as f64); let unjittered_duration = Duration::from_millis(millis); let jittered_duration = apply_jitter(unjittered_duration, jitter); assert!(jittered_duration <= unjittered_duration); |
