Companion for #5412 (#942)

* Fixes for democracy using Scheduler

* Revert branch change
This commit is contained in:
Gavin Wood
2020-04-01 17:01:14 +02:00
committed by GitHub
parent 6301baf024
commit d8e1180030
22 changed files with 315 additions and 285 deletions
+13 -2
View File
@@ -56,7 +56,7 @@ use frame_support::{
use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use system::offchain::TransactionSubmitter;
use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
use session::{historical as session_historical};
#[cfg(feature = "std")]
@@ -145,6 +145,13 @@ impl system::Trait for Runtime {
type OnKilledAccount = ();
}
impl scheduler::Trait for Runtime {
type Event = Event;
type Origin = Origin;
type Call = Call;
type MaximumWeight = MaximumBlockWeight;
}
parameter_types! {
pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
@@ -349,6 +356,7 @@ impl democracy::Trait for Runtime {
type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit;
type Slash = Treasury;
type Scheduler = Scheduler;
}
parameter_types! {
@@ -703,6 +711,9 @@ construct_runtime! {
// Vesting. Usable initially, but removed once all vesting is finished.
Vesting: vesting::{Module, Call, Storage, Event<T>, Config<T>},
// System scheduler.
Scheduler: scheduler::{Module, Call, Storage, Event<T>},
}
}
@@ -887,7 +898,7 @@ sp_api::impl_runtime_apis! {
}
}
impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
impl transaction_payment_rpc_runtime_api::TransactionPaymentApi<
Block,
Balance,
UncheckedExtrinsic,