Merge branch 'update-scheduler' of https://github.com/xlc/polkadot into xlc-update-scheduler

This commit is contained in:
Gav Wood
2020-07-02 15:06:11 +02:00
4 changed files with 35 additions and 4 deletions
+3
View File
@@ -58,6 +58,7 @@ use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
use session::historical as session_historical;
use system::EnsureRoot;
#[cfg(feature = "std")]
pub use staking::StakerStatus;
@@ -141,8 +142,10 @@ impl system::Trait for Runtime {
impl scheduler::Trait for Runtime {
type Event = Event;
type Origin = Origin;
type PalletsOrigin = OriginCaller;
type Call = Call;
type MaximumWeight = MaximumBlockWeight;
type ScheduleOrigin = EnsureRoot<AccountId>;
}
parameter_types! {