protocols/{relay,dcutr}: Replace std::time::SystemTime with instant::SystemTime (#2991)

This commit is contained in:
Thomas Eizinger
2022-10-13 00:09:47 +11:00
committed by GitHub
parent f711dd5ce0
commit eb10af7a4b
5 changed files with 13 additions and 5 deletions

View File

@ -23,11 +23,11 @@ use crate::v2::protocol::{HOP_PROTOCOL_NAME, MAX_MESSAGE_SIZE};
use asynchronous_codec::{Framed, FramedParts};
use bytes::Bytes;
use futures::{future::BoxFuture, prelude::*};
use instant::{Duration, SystemTime};
use libp2p_core::{upgrade, Multiaddr, PeerId};
use libp2p_swarm::NegotiatedSubstream;
use std::convert::TryInto;
use std::iter;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use thiserror::Error;
pub struct Upgrade {
@ -142,7 +142,7 @@ impl ReservationReq {
reservation: Some(Reservation {
addrs: addrs.into_iter().map(|a| a.to_vec()).collect(),
expire: (SystemTime::now() + self.reservation_duration)
.duration_since(UNIX_EPOCH)
.duration_since(SystemTime::UNIX_EPOCH)
.unwrap()
.as_secs(),
voucher: None,

View File

@ -24,11 +24,11 @@ use asynchronous_codec::{Framed, FramedParts};
use bytes::Bytes;
use futures::{future::BoxFuture, prelude::*};
use futures_timer::Delay;
use instant::{Duration, SystemTime};
use libp2p_core::{upgrade, Multiaddr, PeerId};
use libp2p_swarm::NegotiatedSubstream;
use std::convert::TryFrom;
use std::iter;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use thiserror::Error;
pub enum Upgrade {
@ -134,7 +134,7 @@ impl upgrade::OutboundUpgrade<NegotiatedSubstream> for Upgrade {
.expire
.checked_sub(
SystemTime::now()
.duration_since(UNIX_EPOCH)
.duration_since(SystemTime::UNIX_EPOCH)
.unwrap()
.as_secs(),
)