upgrade libp2p to 0.50.0 (#12734)

* upgrade libp2p to 0.50.0 * on_swarm_event and on_connection_handler_event * replace `Swarm::new` with `Swarm::with_threadpool_executor` * on_swarm_event and on_connection_handler_event part 2 * on_swarm_event and on_connection_handler_event part 3 * on_swarm_event and on_connection_handler_event part 4 * update libp2p * libp2p 0.50.0 * rename OutboundQueryCompleted to OutboundQueryProgressed refs libp2p/rust-libp2p#2712 * remove unused var * accumulate outbound_query_records until query is finished * format code * use p_handler instead of new_handler #12734 (comment) * pass ListenFailure to kademlia #12734 (comment) * use tokio executor in tests #12734 (comment) * use chrono Local::now instead of deprecated Local::today * remove unused vars from request_responses tests * attempt to fix pallet UI tests * restart CI * restart CI * restart CI * restart CI * restart CI * restart CI * restart CI * restart CI
paritytech · Jan 5, 2023 · 05fe10b · 05fe10b
1 parent ea387c6
commit 05fe10b
Show file tree

Hide file tree

Showing 31 changed files with 2,970 additions and 2,002 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 futures = "0.3.21"
 futures-timer = "3.0.1"
 ip_network = "0.4.1"
-libp2p = { version = "0.49.0", default-features = false, features = ["kad"] }
+libp2p = { version = "0.50.0", features = ["kad"] }
 log = "0.4.17"
 prost = "0.11"
 rand = "0.8.5"

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -18,7 +18,7 @@ chrono = "0.4.10"
 clap = { version = "4.0.9", features = ["derive", "string"] }
 fdlimit = "0.2.1"
 futures = "0.3.21"
-libp2p = "0.49.0"
+libp2p = "0.50.0"
 log = "0.4.17"
 names = { version = "0.13.0", default-features = false }
 parity-scale-codec = "3.0.0"

diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
@@ -228,7 +228,7 @@ impl<C: SubstrateCli> Runner<C> {
 pub fn print_node_infos<C: SubstrateCli>(config: &Configuration) {
 	info!("{}", C::impl_name());
 	info!("✌️  version {}", C::impl_version());
-	info!("❤️  by {}, {}-{}", C::author(), C::copyright_start_year(), Local::today().year());
+	info!("❤️  by {}, {}-{}", C::author(), C::copyright_start_year(), Local::now().year());
 	info!("📋 Chain specification: {}", config.chain_spec.name());
 	info!("🏷  Node name: {}", config.network.node_name);
 	info!("👤 Role: {}", config.display_role());

diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.57"
 futures = { version = "0.3.21", features = ["thread-pool"] }
 futures-timer = "3.0.1"
-libp2p = { version = "0.49.0", default-features = false }
+libp2p = "0.50.0"
 log = "0.4.17"
 mockall = "0.11.2"
 parking_lot = "0.12.1"

diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ahash = "0.7.6"
 futures = "0.3.21"
 futures-timer = "3.0.1"
-libp2p = { version = "0.49.0", default-features = false }
+libp2p = "0.50.0"
 log = "0.4.17"
 lru = "0.8.1"
 tracing = "0.1.29"

diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
@@ -25,7 +25,7 @@ fnv = "1.0.6"
 futures = "0.3.21"
 futures-timer = "3.0.2"
 ip_network = "0.4.1"
-libp2p = { version = "0.49.0", features = ["dns", "identify", "kad", "mdns", "mplex", "noise", "ping", "tcp", "tokio", "yamux", "websocket"] }
+libp2p = { version = "0.50.0", features = ["dns", "identify", "kad", "macros", "mdns", "mplex", "noise", "ping", "tcp",  "tokio", "yamux", "websocket"] }
 log = "0.4.17"
 lru = "0.8.1"
 parking_lot = "0.12.1"

diff --git a/client/network/bitswap/Cargo.toml b/client/network/bitswap/Cargo.toml
@@ -18,7 +18,7 @@ prost-build = "0.11"
 [dependencies]
 cid = "0.8.6"
 futures = "0.3.21"
-libp2p = "0.49.0"
+libp2p = "0.50.0"
 log = "0.4.17"
 prost = "0.11"
 thiserror = "1.0"

diff --git a/client/network/common/Cargo.toml b/client/network/common/Cargo.toml
@@ -24,7 +24,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
 ] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
-libp2p = { version = "0.49.0", features = [ "request-response", "kad" ] }
+libp2p = { version = "0.50.0", features = ["request-response", "kad"] }
 linked_hash_set = "0.1.3"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../../utils/prometheus" }
 smallvec = "1.8.0"

diff --git a/client/network/light/Cargo.toml b/client/network/light/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
     "derive",
 ] }
 futures = "0.3.21"
-libp2p = "0.49.0"
+libp2p = "0.50.0"
 log = "0.4.16"
 prost = "0.11"
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }

diff --git a/client/network/src/behaviour.rs b/client/network/src/behaviour.rs
@@ -29,7 +29,7 @@ use libp2p::{
 	core::{Multiaddr, PeerId, PublicKey},
 	identify::Info as IdentifyInfo,
 	kad::record,
-	NetworkBehaviour,
+	swarm::NetworkBehaviour,
 };
 
 use sc_network_common::{