allow root with gov2 origins (#6390)

This commit is contained in:
joe petrowski
2022-12-05 21:46:14 +01:00
committed by GitHub
parent 1dba1dca03
commit 8571bc645c
+5 -5
View File
@@ -499,7 +499,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
(), (),
>; >;
type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
type ForceOrigin = StakingAdmin; type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Self>; type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Self>;
type MaxElectingVoters = MaxElectingVoters; type MaxElectingVoters = MaxElectingVoters;
type MaxElectableTargets = MaxElectableTargets; type MaxElectableTargets = MaxElectableTargets;
@@ -843,8 +843,8 @@ impl pallet_identity::Config for Runtime {
type MaxAdditionalFields = MaxAdditionalFields; type MaxAdditionalFields = MaxAdditionalFields;
type MaxRegistrars = MaxRegistrars; type MaxRegistrars = MaxRegistrars;
type Slashed = Treasury; type Slashed = Treasury;
type ForceOrigin = GeneralAdmin; type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type RegistrarOrigin = GeneralAdmin; type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>; type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
} }
@@ -1204,7 +1204,7 @@ impl slots::Config for Runtime {
type Registrar = Registrar; type Registrar = Registrar;
type LeasePeriod = LeasePeriod; type LeasePeriod = LeasePeriod;
type LeaseOffset = (); type LeaseOffset = ();
type ForceOrigin = LeaseAdmin; type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>; type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
} }
@@ -1244,7 +1244,7 @@ impl auctions::Config for Runtime {
type EndingPeriod = EndingPeriod; type EndingPeriod = EndingPeriod;
type SampleLength = SampleLength; type SampleLength = SampleLength;
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type InitiateOrigin = AuctionAdmin; type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>; type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
} }