diff options
Diffstat (limited to 'crates/tor-rtmock/src/time.rs')
| -rw-r--r-- | crates/tor-rtmock/src/time.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crates/tor-rtmock/src/time.rs b/crates/tor-rtmock/src/time.rs index 56be8c117..e5608ffaa 100644 --- a/crates/tor-rtmock/src/time.rs +++ b/crates/tor-rtmock/src/time.rs @@ -20,8 +20,8 @@ use std::{ pin::Pin, sync::{Arc, Mutex, Weak}, task::{Context, Poll, Waker}, - time::{Duration, Instant, SystemTime}, }; +use web_time_compat::{Duration, Instant, InstantExt, SystemTime}; use futures::Future; use tracing::trace; @@ -211,7 +211,7 @@ impl Default for MockSleepProvider { impl MockSleepProvider { /// Create a new MockSleepProvider, starting at a given wall-clock time. pub fn new(wallclock: SystemTime) -> Self { - let instant = Instant::now(); + let instant = Instant::get(); let sleepers = BinaryHeap::new(); let core = MockTimeCore::new(instant, wallclock); let state = SleepSchedule { @@ -590,10 +590,11 @@ mod test { //! <!-- @@ end test lint list maintained by maint/add_warning @@ --> use super::*; use tor_rtcompat::test_with_all_runtimes; + use web_time_compat::SystemTimeExt; #[test] fn basics_of_time_travel() { - let w1 = SystemTime::now(); + let w1 = SystemTime::get(); let sp = MockSleepProvider::new(w1); let i1 = sp.now(); assert_eq!(sp.wallclock(), w1); @@ -615,7 +616,7 @@ mod test { use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; - let sp = MockSleepProvider::new(SystemTime::now()); + let sp = MockSleepProvider::new(SystemTime::get()); let one_hour = Duration::new(3600, 0); let (s1, r1) = oneshot::channel(); @@ -626,7 +627,7 @@ mod test { let b2 = AtomicBool::new(false); let b3 = AtomicBool::new(false); - let real_start = Instant::now(); + let real_start = Instant::get(); futures::join!( async { @@ -662,7 +663,7 @@ mod test { assert!(b1.load(Ordering::SeqCst)); assert!(b2.load(Ordering::SeqCst)); assert!(b3.load(Ordering::SeqCst)); - let real_end = Instant::now(); + let real_end = Instant::get(); assert!(real_end - real_start < one_hour); } |
