From e444070fbabb7497d6af60de623f61cdf82aa22c Mon Sep 17 00:00:00 2001 From: Xiliang Chen Date: Fri, 9 Jul 2021 22:53:32 +1200 Subject: [PATCH] fix council origin requirement (#1193) --- runtime/acala/src/lib.rs | 10 +++++----- runtime/karura/src/lib.rs | 10 +++++----- runtime/mandala/src/lib.rs | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index e6cbe6823e..e446a1c347 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -325,7 +325,7 @@ impl pallet_sudo::Config for Runtime { type EnsureRootOrAllGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrHalfGeneralCouncil = EnsureOneOf< @@ -349,19 +349,19 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf< type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>, >; type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< @@ -373,7 +373,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>, >; parameter_types! { diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 943be74d05..9879e3680e 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -361,7 +361,7 @@ impl pallet_sudo::Config for Runtime { type EnsureRootOrAllGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrHalfGeneralCouncil = EnsureOneOf< @@ -385,19 +385,19 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf< type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _1, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>, >; type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< @@ -409,7 +409,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>, >; parameter_types! { diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index cfcdc19258..6292617a01 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -368,13 +368,13 @@ type EnsureRootOrHalfHomaCouncil = EnsureOneOf< type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_3, _4, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>, >; type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< @@ -392,7 +392,7 @@ type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< AccountId, EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_2, _3, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>, >; parameter_types! {