Revert "Revert "Update orchestra to the recent version (#6854)" (#6916)"

This reverts commit 7dea636.
paritytech · Apr 18, 2023 · f325571 · f325571
1 parent e7d63ad
commit f325571
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -18,7 +18,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
 libc = "0.2.139"
 pin-project = "1.0.9"
 rand = "0.8.5"
-rayon = "1.5.1"
+rayon = "1.6.1"
 slotmap = "1.0"
 tempfile = "3.3.0"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }

diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
@@ -10,7 +10,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
 
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.4.0" }
 
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }

diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
@@ -15,15 +15,15 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
-orchestra = "0.0.5"
+orchestra = "0.2.0"
 gum = { package = "tracing-gum", path = "../gum" }
 lru = "0.9"
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }
 async-trait = "0.1.57"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 
 [dev-dependencies]
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.4.0" }
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }
 futures = { version = "0.3.21", features = ["thread-pool"] }

diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs
@@ -661,8 +661,9 @@ where
 						);
 						metrics.memory_stats_snapshot(memory_stats_snapshot);
 					},
-					Err(e) =>
-						gum::debug!(target: LOG_TARGET, "Failed to obtain memory stats: {:?}", e),
+					Err(e) => {
+						gum::debug!(target: LOG_TARGET, "Failed to obtain memory stats: {:?}", e)
+					},
 				}),
 			Err(_) => {
 				gum::debug!(

diff --git a/node/overseer/src/tests.rs b/node/overseer/src/tests.rs
@@ -1034,6 +1034,7 @@ fn overseer_all_subsystems_receive_signals_and_messages() {
 
 #[test]
 fn context_holds_onto_message_until_enough_signals_received() {
+	const CHANNEL_CAPACITY: usize = 1024;
 	let (candidate_validation_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);
 	let (candidate_backing_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);
 	let (statement_distribution_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);

diff --git a/node/subsystem-types/Cargo.toml b/node/subsystem-types/Cargo.toml
@@ -13,7 +13,6 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
-orchestra = "0.0.5"
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }

diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
@@ -27,7 +27,7 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-overseer = { path = "../overseer" }
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.4.0" }
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "sync-evict-idle-peers" }