revert

nervosnetwork · Nov 19, 2024 · a1b8f7b · a1b8f7b
1 parent fdc3a50
commit a1b8f7b
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -36,7 +36,7 @@ ckb-spawn = { path = "../util/spawn", version = "= 0.120.0-pre" }
 socket2 = "0.5"
 bitflags = "1.0"
 
-p2p = { version = "0.6.1", package = "tentacle", features = [
+p2p = { git = "https://github.com/nervosnetwork/tentacle.git", rev = "14fdd9ae6", package = "tentacle", features = [
     "upnp",
     "parking_lot",
     "openssl-vendored",

diff --git a/network/src/services/dump_peer_store.rs b/network/src/services/dump_peer_store.rs
@@ -7,7 +7,7 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
-use tokio::time::{Instant, Interval, MissedTickBehavior};
+use tokio::time::{Interval, MissedTickBehavior};
 
 const DEFAULT_DUMP_INTERVAL: Duration = Duration::from_secs(3600); // 1 hour
 
@@ -50,10 +50,7 @@ impl Future for DumpPeerStoreService {
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         if self.interval.is_none() {
             self.interval = {
-                let mut interval = tokio::time::interval_at(
-                    Instant::now() + DEFAULT_DUMP_INTERVAL,
-                    DEFAULT_DUMP_INTERVAL,
-                );
+                let mut interval = tokio::time::interval(DEFAULT_DUMP_INTERVAL);
                 // The dump peer store service does not need to urgently compensate for the missed wake,
                 // just delay behavior is enough
                 interval.set_missed_tick_behavior(MissedTickBehavior::Delay);

diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml
@@ -22,8 +22,8 @@ ckb-pow = { path = "../../pow", version = "= 0.120.0-pre" }
 ckb-resource = { path = "../../resource", version = "= 0.120.0-pre" }
 ckb-build-info = { path = "../build-info", version = "= 0.120.0-pre" }
 ckb-types = { path = "../types", version = "= 0.120.0-pre" }
-secio = { version = "0.6", package = "tentacle-secio" }
-multiaddr = { version = "0.3.0", package = "tentacle-multiaddr" }
+secio = { git = "https://github.com/nervosnetwork/tentacle.git", rev = "14fdd9ae6", package = "tentacle-secio" }
+multiaddr = { git = "https://github.com/nervosnetwork/tentacle.git", rev = "14fdd9ae6", package = "tentacle-multiaddr" }
 rand = "0.8"
 sentry = { version = "0.34.0", optional = true }
 ckb-systemtime = { path = "../systemtime", version = "= 0.120.0-pre" }