Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Remove parathreads scheduler from westend, rococo, and kusama
Browse files Browse the repository at this point in the history
  • Loading branch information
alexgparity committed Jan 17, 2023
1 parent a9ece0b commit 664bafa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 24 deletions.
10 changes: 2 additions & 8 deletions runtime/kusama/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use runtime_parachains::{
initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
runtime_api_impl::v2 as parachains_runtime_api_impl, scheduler as parachains_scheduler,
scheduler_parathreads, session_info as parachains_session_info, shared as parachains_shared,
session_info as parachains_session_info, shared as parachains_shared,
ump as parachains_ump,
};

Expand Down Expand Up @@ -1165,13 +1165,8 @@ impl parachains_paras_inherent::Config for Runtime {
}

impl parachains_scheduler::Config for Runtime {
type CoreAssigners<T: runtime_parachains::scheduler::Config> = (
runtime_parachains::scheduler_parachains::ParachainsScheduler,
runtime_parachains::scheduler_parathreads::ParathreadsScheduler,
);
type CoreAssigners<T: runtime_parachains::scheduler::Config> = runtime_parachains::scheduler_parachains::ParachainsScheduler;
}
impl scheduler_parathreads::Config for Runtime {}

impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>;
Expand Down Expand Up @@ -1446,7 +1441,6 @@ construct_runtime! {
Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config} = 60,
ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
SchedulerThreads: scheduler_parathreads::{Pallet, Storage} = 63,

// Parachain Onboarding Pallets. Start indices at 70 to leave room.
Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>} = 70,
Expand Down
12 changes: 3 additions & 9 deletions runtime/rococo/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ use runtime_parachains::{
origin as parachains_origin, paras as parachains_paras,
paras_inherent as parachains_paras_inherent,
runtime_api_impl::v2 as parachains_runtime_api_impl, scheduler as parachains_scheduler,
scheduler_parathreads, session_info as parachains_session_info, shared as parachains_shared,
session_info as parachains_session_info, shared as parachains_shared,
scheduler_parachains::ParachainsScheduler,
ump as parachains_ump,
};

Expand Down Expand Up @@ -89,9 +90,6 @@ pub use pallet_balances::Call as BalancesCall;

/// Constant values used within the runtime.
use rococo_runtime_constants::{currency::*, fee::*, time::*};
use runtime_parachains::{
scheduler_parachains::ParachainsScheduler, scheduler_parathreads::ParathreadsScheduler,
};

// Weights used in the runtime.
mod weights;
Expand Down Expand Up @@ -1087,11 +1085,8 @@ impl parachains_paras_inherent::Config for Runtime {
}

impl parachains_scheduler::Config for Runtime {
type CoreAssigners<T: runtime_parachains::scheduler::Config> =
(ParachainsScheduler, ParathreadsScheduler);
type CoreAssigners<T: runtime_parachains::scheduler::Config> = ParachainsScheduler;
}
impl scheduler_parathreads::Config for Runtime {}

impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>;
Expand Down Expand Up @@ -1428,7 +1423,6 @@ construct_runtime! {
ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
SchedulerThreads: scheduler_parathreads::{Pallet, Storage} = 64,

// Parachain Onboarding Pallets. Start indices at 70 to leave room.
Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config} = 70,
Expand Down
9 changes: 2 additions & 7 deletions runtime/westend/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use runtime_parachains::{
origin as parachains_origin, paras as parachains_paras,
paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
runtime_api_impl::v2 as parachains_runtime_api_impl, scheduler as parachains_scheduler,
scheduler_parathreads, session_info as parachains_session_info, shared as parachains_shared,
session_info as parachains_session_info, shared as parachains_shared,
ump as parachains_ump,
};
use scale_info::TypeInfo;
Expand Down Expand Up @@ -944,12 +944,8 @@ impl parachains_paras_inherent::Config for Runtime {
}

impl parachains_scheduler::Config for Runtime {
type CoreAssigners<T: runtime_parachains::scheduler::Config> = (
runtime_parachains::scheduler_parachains::ParachainsScheduler,
runtime_parachains::scheduler_parathreads::ParathreadsScheduler,
);
type CoreAssigners<T: runtime_parachains::scheduler::Config> = runtime_parachains::scheduler_parachains::ParachainsScheduler;
}
impl scheduler_parathreads::Config for Runtime {}

impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
Expand Down Expand Up @@ -1175,7 +1171,6 @@ construct_runtime! {
ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 52,
ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 53,
ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 54,
SchedulerThreads: scheduler_parathreads::{Pallet, Storage} = 55,

// Parachain Onboarding Pallets. Start indices at 60 to leave room.
Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config} = 60,
Expand Down

0 comments on commit 664bafa

Please sign in to comment.