fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-16 21:01:19 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Eizinger 2022-10-13 00:09:47 +11:00 committed by GitHub
parent f711dd5ce0
commit eb10af7a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocols/dcutr/CHANGELOG.md
View File

@ -4,6 +4,10 @@
- Update to `libp2p-swarm` `v0.40.0`. - Update to `libp2p-swarm` `v0.40.0`.
- Fix WASM compilation. See [PR 2991].
[PR 2991]: https://github.com/libp2p/rust-libp2p/pull/2991/
# 0.6.0 # 0.6.0
- Update to `libp2p-swarm` `v0.39.0`. - Update to `libp2p-swarm` `v0.39.0`.

2
protocols/dcutr/src/protocol/outbound.rs
View File

@ -22,11 +22,11 @@ use crate::message_proto::{hole_punch, HolePunch};
use asynchronous_codec::Framed; use asynchronous_codec::Framed;
use futures::{future::BoxFuture, prelude::*}; use futures::{future::BoxFuture, prelude::*};
use futures_timer::Delay; use futures_timer::Delay;
use instant::Instant;
use libp2p_core::{multiaddr::Protocol, upgrade, Multiaddr}; use libp2p_core::{multiaddr::Protocol, upgrade, Multiaddr};
use libp2p_swarm::NegotiatedSubstream; use libp2p_swarm::NegotiatedSubstream;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::iter; use std::iter;
use std::time::Instant;
use thiserror::Error; use thiserror::Error;
pub struct Upgrade { pub struct Upgrade {

4
protocols/relay/CHANGELOG.md
View File

@ -4,6 +4,10 @@
- Update to `libp2p-swarm` `v0.40.0`. - Update to `libp2p-swarm` `v0.40.0`.
- Fix WASM compilation. See [PR 2991].
[PR 2991]: https://github.com/libp2p/rust-libp2p/pull/2991/
# 0.12.0 # 0.12.0
- Update to `libp2p-swarm` `v0.39.0`. - Update to `libp2p-swarm` `v0.39.0`.

4
protocols/relay/src/v2/protocol/inbound_hop.rs
View File

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

4
protocols/relay/src/v2/protocol/outbound_hop.rs
View File

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