diff options
Diffstat (limited to 'crates/tor-netdir')
| -rw-r--r-- | crates/tor-netdir/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/tor-netdir/src/testnet.rs | 4 | ||||
| -rw-r--r-- | crates/tor-netdir/src/weight.rs | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/crates/tor-netdir/Cargo.toml b/crates/tor-netdir/Cargo.toml index 4d41c2e5f..5d0817ed1 100644 --- a/crates/tor-netdir/Cargo.toml +++ b/crates/tor-netdir/Cargo.toml @@ -82,6 +82,7 @@ tor-units = { path = "../tor-units", version = "0.40.0" } tracing = "0.1.36" typed-index-collections = "3.2.3" visibility = { version = "0.1.0", optional = true } +web-time-compat = { path = "../web-time-compat", version = "0.1.0" } [dev-dependencies] float_eq = "1.0.0" diff --git a/crates/tor-netdir/src/testnet.rs b/crates/tor-netdir/src/testnet.rs index fdea84985..d928e702d 100644 --- a/crates/tor-netdir/src/testnet.rs +++ b/crates/tor-netdir/src/testnet.rs @@ -15,7 +15,6 @@ use crate::{MdReceiver, PartialNetDir}; use std::iter; use std::net::SocketAddr; -use std::time::{Duration, SystemTime}; #[cfg(feature = "geoip")] use tor_geoip::GeoipDb; use tor_netdoc::doc::microdesc::{Microdesc, MicrodescBuilder}; @@ -23,6 +22,7 @@ use tor_netdoc::doc::netstatus::{Lifetime, MdRouterStatusBuilder, RelayWeight}; use tor_netdoc::doc::netstatus::{MdConsensus, MdConsensusBuilder}; use tor_netdoc::types::relay_flags::RelayFlag; pub use tor_netdoc::{BuildError, BuildResult}; +use web_time_compat::{Duration, SystemTime, SystemTimeExt}; /// A set of builder objects for a single node. #[derive(Debug, Clone)] @@ -201,7 +201,7 @@ where ]; let lifetime = lifetime.map(Ok).unwrap_or_else(|| { - let now = SystemTime::now(); + let now = SystemTime::get(); let one_day = Duration::new(86400, 0); Lifetime::new(now, now + one_day / 2, now + one_day) diff --git a/crates/tor-netdir/src/weight.rs b/crates/tor-netdir/src/weight.rs index 8acceb8fa..d47e34fd2 100644 --- a/crates/tor-netdir/src/weight.rs +++ b/crates/tor-netdir/src/weight.rs @@ -427,6 +427,7 @@ mod test { use tor_basic_utils::test_rng::testing_rng; use tor_netdoc::doc::netstatus::{Lifetime, MdRouterStatusBuilder}; use tor_netdoc::types::relay_flags::{RelayFlag, RelayFlags}; + use web_time_compat::SystemTimeExt; #[test] fn t_clamp() { @@ -642,7 +643,7 @@ mod test { #[test] fn weightset_from_consensus() { use rand::Rng; - let now = SystemTime::now(); + let now = SystemTime::get(); let one_hour = Duration::new(3600, 0); let mut rng = testing_rng(); let mut bld = MdConsensus::builder(); |
