Merge branch 'master' into params

runtime/kusama/src/lib.rs

@@ -547,11 +547,8 @@ impl pallet_staking::EraPayout<Balance> for EraPayout {
 
 parameter_types! {
 	// Six sessions in an era (6 hours).
-	pub SessionsPerEra: SessionIndex = prod_or_fast!(
-		6,
-		6,
-		"KSM_SESSIONS_PER_ERA"
-	);
+	pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
+
 	// 28 eras for unbonding (7 days).
 	pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
 		28,
@@ -564,7 +561,7 @@ parameter_types! {
 		27,
 		"DOT_SLASH_DEFER_DURATION"
 	);
-	pub const MaxNominatorRewardedPerValidator: u32 = 256;
+	pub const MaxNominatorRewardedPerValidator: u32 = 512;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
 	// 24
 	pub const MaxNominations: u32 = <NposCompactSolution24 as NposSolution>::LIMIT as u32;

runtime/polkadot/src/lib.rs

@@ -533,11 +533,8 @@ pallet_staking_reward_curve::build! {
 
 parameter_types! {
 	// Six sessions in an era (24 hours).
-	pub SessionsPerEra: SessionIndex = prod_or_fast!(
-		6,
-		6,
-		"DOT_SESSIONS_PER_ERA"
-	);
+	pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
+
 	// 28 eras for unbonding (28 days).
 	pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
 		28,