Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…

…-validator-in-bags
paritytech · Mar 23, 2022 · bc93fa5 · bc93fa5
2 parents bfa88e2 + 1ec8f9e
commit bc93fa5
Show file tree

Hide file tree

Showing 9 changed files with 189 additions and 179 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -10,7 +10,7 @@ path = "bin/puppet_worker.rs"
 
 [dependencies]
 always-assert = "0.1"
-async-std = { version = "1.10.0", features = ["attributes"] }
+async-std = { version = "1.11.0", features = ["attributes"] }
 async-process = "1.3.0"
 assert_matches = "1.4.0"
 futures = "0.3.21"

diff --git a/node/core/pvf/tests/it/main.rs b/node/core/pvf/tests/it/main.rs
@@ -78,6 +78,7 @@ impl TestHost {
 }
 
 #[async_std::test]
+#[ignore]
 async fn terminates_on_timeout() {
 	let host = TestHost::new();
 

diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"
 
 [dependencies]
-async-std = "1.8.0"
+async-std = "1.11.0"
 mick-jaeger = "0.1.8"
 lazy_static = "1.4"
 parking_lot = "0.12.0"

diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
@@ -27,7 +27,7 @@ log = "0.4.13"
 assert_cmd = "2.0.4"
 nix = "0.23.1"
 tempfile = "3.2.0"
-hyper = { version = "0.14.17", default-features = false, features = ["http1", "tcp"] }
+hyper = { version = "0.14.18", default-features = false, features = ["http1", "tcp"] }
 tokio = "1.17.0"
 polkadot-test-service = { path = "../test/service", features=["runtime-metrics"]}
 substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -406,12 +406,11 @@ parameter_types! {
 	// 1 hour session, 15 minutes unsigned phase, 8 offchain executions.
 	pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 8;
 
-	/// We take the top 22_500 nominators as electing voters..
-	pub const MaxElectingVoters: u32 = 22_500;
+	/// We take the top 12500 nominators as electing voters..
+	pub const MaxElectingVoters: u32 = 12_500;
 	/// ... and all of the validators as electable targets. Whilst this is the case, we cannot and
 	/// shall not increase the size of the validator intentions.
 	pub const MaxElectableTargets: u16 = u16::MAX;
-
 }
 
 frame_election_provider_support::generate_solution_type!(
@@ -420,6 +419,7 @@ frame_election_provider_support::generate_solution_type!(
 		VoterIndex = u32,
 		TargetIndex = u16,
 		Accuracy = sp_runtime::PerU16,
+		MaxVoters = MaxElectingVoters,
 	>(24)
 );
 

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -449,7 +449,7 @@ parameter_types! {
 	// 4 hour session, 1 hour unsigned phase, 32 offchain executions.
 	pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 32;
 
-	/// We take the top 22_500 nominators as electing voters..
+	/// We take the top 22500 nominators as electing voters..
 	pub const MaxElectingVoters: u32 = 22_500;
 	/// ... and all of the validators as electable targets. Whilst this is the case, we cannot and
 	/// shall not increase the size of the validator intentions.
@@ -462,6 +462,7 @@ frame_election_provider_support::generate_solution_type!(
 		VoterIndex = u32,
 		TargetIndex = u16,
 		Accuracy = sp_runtime::PerU16,
+		MaxVoters = MaxElectingVoters,
 	>(16)
 );
 

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -351,7 +351,7 @@ parameter_types! {
 	// 1 hour session, 15 minutes unsigned phase, 4 offchain executions.
 	pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 4;
 
-	/// We take the top 22_500 nominators as electing voters..
+	/// We take the top 22500 nominators as electing voters..
 	pub const MaxElectingVoters: u32 = 22_500;
 	/// ... and all of the validators as electable targets. Whilst this is the case, we cannot and
 	/// shall not increase the size of the validator intentions.
@@ -364,6 +364,7 @@ frame_election_provider_support::generate_solution_type!(
 		VoterIndex = u32,
 		TargetIndex = u16,
 		Accuracy = sp_runtime::PerU16,
+		MaxVoters = MaxElectingVoters,
 	>(16)
 );
 

diff --git a/scripts/run_benches_for_runtime.sh b/scripts/run_benches_for_runtime.sh
@@ -17,8 +17,7 @@ cargo +nightly build --profile production --locked --features=runtime-benchmarks
     --list |\
   tail -n+2 |\
   cut -d',' -f1 |\
-  uniq | \
-  grep -v frame_system > "${runtime}_pallets"
+  uniq > "${runtime}_pallets"
 
 # For each pallet found in the previous command, run benches on each function
 while read -r line; do