Skip to content

Commit

Permalink
fix council origin requirement (#1193)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xlc
xlc authored Jul 9, 2021
1 parent 94f8ea5 commit e444070
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions runtime/acala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ impl pallet_sudo::Config for Runtime {
type EnsureRootOrAllGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrHalfGeneralCouncil = EnsureOneOf<
Expand All @@ -349,19 +349,19 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf<
type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrAllTechnicalCommittee = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, TechnicalCommitteeInstance>,
pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>,
>;

type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf<
Expand All @@ -373,7 +373,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf<
type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>,
>;

parameter_types! {
Expand Down
10 changes: 5 additions & 5 deletions runtime/karura/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ impl pallet_sudo::Config for Runtime {
type EnsureRootOrAllGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrHalfGeneralCouncil = EnsureOneOf<
Expand All @@ -385,19 +385,19 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf<
type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrAllTechnicalCommittee = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, TechnicalCommitteeInstance>,
pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>,
>;

type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf<
Expand All @@ -409,7 +409,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf<
type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>,
>;

parameter_types! {
Expand Down
6 changes: 3 additions & 3 deletions runtime/mandala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,13 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf<
type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>,
pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>,
>;

type EnsureRootOrAllTechnicalCommittee = EnsureOneOf<
Expand All @@ -392,7 +392,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf<
type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf<
AccountId,
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>,
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>,
>;

parameter_types! {
Expand Down

0 comments on commit e444070

Please sign in to comment.