Merge branch 'master' of github.com:paritytech/cumulus into release-statemint-v1

This commit is contained in:
Alexander Popiak
2021-10-12 11:30:17 +02:00
21 changed files with 3317 additions and 1461 deletions
-2
View File
@@ -545,7 +545,6 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
}
parameter_types! {
pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
pub const Period: u32 = 6 * HOURS;
pub const Offset: u32 = 0;
pub const MaxAuthorities: u32 = 100_000;
@@ -562,7 +561,6 @@ impl pallet_session::Config for Runtime {
// Essentially just Aura, but lets be pedantic.
type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
type Keys = SessionKeys;
type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
type WeightInfo = ();
}