Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: debug win/mac ci #4696

Closed
wants to merge 1 commit into from
Closed

chore: debug win/mac ci #4696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 59 additions & 28 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions network/src/services/dump_peer_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions util/app-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Loading