diff --git a/Cargo.lock b/Cargo.lock index 950cc155f9..c35d997586 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6484,14 +6484,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", @@ -6504,13 +6503,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.5", ] [[package]] diff --git a/crates/net/network/src/session/active.rs b/crates/net/network/src/session/active.rs index b1a715fafe..886ae8035a 100644 --- a/crates/net/network/src/session/active.rs +++ b/crates/net/network/src/session/active.rs @@ -972,7 +972,7 @@ mod tests { let fut = builder.with_client_stream(local_addr, move |client_stream| async move { let _client_stream = client_stream; - tokio::time::sleep(drop_timeout * 10).await; + tokio::time::sleep(drop_timeout * 60).await; }); tokio::task::spawn(fut); @@ -982,7 +982,8 @@ mod tests { .internal_request_timeout .store(request_timeout.as_millis() as u64, Ordering::Relaxed); session.protocol_breach_request_timeout = drop_timeout; - session.internal_request_timeout_interval = tokio::time::interval(request_timeout); + session.internal_request_timeout_interval = + tokio::time::interval_at(tokio::time::Instant::now(), request_timeout); let (tx, rx) = oneshot::channel(); let req = PeerRequest::GetBlockBodies { request: GetBlockBodies(vec![]), response: tx }; session.on_internal_peer_request(req, Instant::now()); @@ -995,7 +996,7 @@ mod tests { let msg = builder.active_session_rx.next().await.unwrap(); match msg { ActiveSessionMessage::ProtocolBreach { .. } => {} - _ => unreachable!(), + ev => unreachable!("{ev:?}"), } }