summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-02-10 18:30:11 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-02-10 18:30:11 +0100
commit8de8f4c882c224d302f323fd461588cd69ba01d1 (patch)
treebce9ff17d1e2c3c87e1a8b07e287b3e1b0980e92
parentc5d32c8c14b967ffcbc7bb8cbab693ab5eca81fb (diff)
parente65e124a7f9b31c2e9536e5d8b72cbeb325ab89e (diff)
downloadmullvadvpn-8de8f4c882c224d302f323fd461588cd69ba01d1.tar.xz
mullvadvpn-8de8f4c882c224d302f323fd461588cd69ba01d1.zip
Merge branch 'update-qc-dep'
-rw-r--r--Cargo.lock13
-rw-r--r--talpid-core/Cargo.toml4
-rw-r--r--talpid-core/src/future_retry.rs11
3 files changed, 15 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a3bc60ee02..0579b09ae3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1987,21 +1987,20 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quickcheck"
-version = "0.9.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
dependencies = [
- "env_logger 0.7.1",
+ "env_logger 0.8.2",
"log 0.4.14",
- "rand 0.7.3",
- "rand_core 0.5.1",
+ "rand 0.8.3",
]
[[package]]
name = "quickcheck_macros"
-version = "0.9.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"
+checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
dependencies = [
"proc-macro2",
"quote",
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 5685e62d00..f44ab9f0ad 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -83,5 +83,5 @@ tonic-build = { version = "0.3", default-features = false, features = ["transpor
[dev-dependencies]
tempfile = "3.0"
-quickcheck = "0.9"
-quickcheck_macros = "0.9"
+quickcheck = "1.0"
+quickcheck_macros = "1.0"
diff --git a/talpid-core/src/future_retry.rs b/talpid-core/src/future_retry.rs
index cc1fb1ed20..a88f6c3b36 100644
--- a/talpid-core/src/future_retry.rs
+++ b/talpid-core/src/future_retry.rs
@@ -139,6 +139,7 @@ fn apply_jitter(duration: Duration, jitter: f64) -> Duration {
#[cfg(test)]
mod test {
use super::*;
+ use rand::SeedableRng;
#[test]
fn test_exponetnial_backoff() {
@@ -189,8 +190,12 @@ mod test {
#[derive(Clone, Debug)]
struct ArbitraryJitter(f64);
impl quickcheck::Arbitrary for ArbitraryJitter {
- fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
- let jitter = g.sample(OpenClosed01);
+ 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)
}
}
@@ -199,9 +204,7 @@ mod test {
fn test_jitter(millis: u64, jitter: ArbitraryJitter) {
let jitter = jitter.0;
let unjittered_duration = Duration::from_millis(millis);
- let expected_duration = Duration::from_millis(((millis as f64) * jitter) as u64);
let jittered_duration = apply_jitter(unjittered_duration, jitter);
- assert_eq!(expected_duration, jittered_duration);
assert!(jittered_duration <= unjittered_duration);
}
}