Skip to content

Commit 3c8d8fb

Browse files
authored
Merge pull request #4868 from driftluo/upgrade-p2p
chore: upgrade p2p
2 parents 03f4257 + 7a5b975 commit 3c8d8fb

File tree

3 files changed

+35
-19
lines changed

3 files changed

+35
-19
lines changed

Cargo.lock

Lines changed: 31 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ version = "0.201.0-pre"
104104
tempfile = "3"
105105
itertools = "0.11.0"
106106
# issue tracking: https://github.com/GREsau/schemars/pull/251
107-
schemars = { package = "ckb_schemars", version="0.8.22" }
107+
schemars = { package = "ckb_schemars", version = "0.8.22" }
108108
anyhow = "1.0.34"
109109
arc-swap = "1.3"
110110
async-stream = "0.3.3"
@@ -243,7 +243,7 @@ multiaddr = { version = "0.3.0", package = "tentacle-multiaddr" }
243243
num-bigint = "0.4"
244244
num_cpus = "1.16.0"
245245
numext-fixed-uint = "0.1"
246-
p2p = { version = "0.6.2", package = "tentacle", default-features = false }
246+
p2p = { version = "0.7.0", package = "tentacle", default-features = false }
247247
parking_lot = "0.12"
248248
paste = "1.0"
249249
path-clean = "0.1.0"

network/src/network.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ impl NetworkService {
10101010
}
10111011
if let Some(addr) = multiaddr_to_socketaddr(multi_addr) {
10121012
let domain = socket2::Domain::for_address(addr);
1013-
let bind_fn = move |socket: p2p::service::TcpSocket| {
1013+
let bind_fn = move |socket: p2p::service::TcpSocket, _ctxt| {
10141014
let socket_ref = socket2::SockRef::from(&socket);
10151015
#[cfg(all(
10161016
unix,
@@ -1035,7 +1035,7 @@ impl NetworkService {
10351035
}
10361036
if let Some(addr) = multiaddr_to_socketaddr(multi_addr) {
10371037
let domain = socket2::Domain::for_address(addr);
1038-
let bind_fn = move |socket: p2p::service::TcpSocket| {
1038+
let bind_fn = move |socket: p2p::service::TcpSocket, _ctxt| {
10391039
let socket_ref = socket2::SockRef::from(&socket);
10401040
#[cfg(all(
10411041
unix,

0 commit comments

Comments
 (0)