Merge branch 'master' into refactor/web-time-switch

libp2p · Apr 30, 2024 · 0b36054 · 0b36054
2 parents b15ece5 + e5c072c
commit 0b36054
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 - Fix support for unlimited relay connection according to spec.
   See [PR 5244](https://github.com/libp2p/rust-libp2p/pull/5244).
-- Use `web-time` instead of `instant`.
-  See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX).
+- use `web_time` `Instant` and `SystemTime` versions for wasm support.
+  See [PR 5328](https://github.com/libp2p/rust-libp2p/pull/5328).
 
 ## 0.17.1
 

diff --git a/protocols/relay/src/protocol/inbound_hop.rs b/protocols/relay/src/protocol/inbound_hop.rs
@@ -18,7 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::time::{Duration, SystemTime};
+use std::time::Duration;
+use web_time::SystemTime;
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;

diff --git a/protocols/relay/src/protocol/outbound_hop.rs b/protocols/relay/src/protocol/outbound_hop.rs
@@ -19,13 +19,14 @@
 // DEALINGS IN THE SOFTWARE.
 
 use std::io;
-use std::time::{Duration, SystemTime};
+use std::time::Duration;
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
 use futures_timer::Delay;
 use thiserror::Error;
+use web_time::SystemTime;
 
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;