Remove Council Membership and Simplify Technical Committee Configurat…

…ion (#783) * removed the memebership for Council * council can't setMemebers of the Technical commeteed * fix benchmark compilation
freeverseio · Sep 19, 2024 · d48769b · d48769b
1 parent 9ad1b1a
commit d48769b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/runtime/laos/src/benchmarks.rs b/runtime/laos/src/benchmarks.rs
@@ -36,6 +36,6 @@ frame_benchmarking::define_benchmarks!(
 	[pallet_scheduler, Scheduler]
 	[pallet_treasury, Treasury]
 	[pallet_democracy, Democracy]
-	[pallet_membership, CouncilMembership]
+	[pallet_membership, TechnicalCommitteeMembership]
 	// TODO pallet_xcm?
 );
diff --git a/runtime/laos/src/configs/collective.rs b/runtime/laos/src/configs/collective.rs
@@ -1,5 +1,5 @@
 use crate::{weights, AccountId, BlockNumber, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin};
-use frame_support::{pallet_prelude::Weight, parameter_types, traits::EitherOfDiverse};
+use frame_support::{pallet_prelude::Weight, parameter_types};
 use frame_system::EnsureRoot;
 use laos_primitives::RuntimeBlockWeights;
 use parachains_common::{DAYS, MINUTES};
@@ -50,7 +50,7 @@ impl pallet_collective::Config<TechnicalCommittee> for Runtime {
 	type Proposal = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
-	// the root or a turnout of 50%+1 of the council can select the technical committee
-	type SetMembersOrigin = EitherOfDiverse<EnsureRoot<AccountId>, CouncilMajority>;
+	// the root can select the technical committee
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
 }
diff --git a/runtime/laos/src/configs/membership.rs b/runtime/laos/src/configs/membership.rs
@@ -1,24 +1,10 @@
 use frame_support::traits::EitherOfDiverse;
 use frame_system::EnsureRoot;
 
-use crate::{weights, AccountId, Council, Runtime, RuntimeEvent, TechnicalCommittee};
+use crate::{weights, AccountId, Runtime, RuntimeEvent, TechnicalCommittee};
 
 use super::collective::CouncilMajority;
 
-type CouncilMembership = pallet_membership::Instance1;
-impl pallet_membership::Config<CouncilMembership> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type AddOrigin = EnsureRoot<AccountId>;
-	type RemoveOrigin = EnsureRoot<AccountId>;
-	type SwapOrigin = EnsureRoot<AccountId>;
-	type ResetOrigin = EnsureRoot<AccountId>;
-	type PrimeOrigin = EnsureRoot<AccountId>;
-	type MembershipInitialized = Council;
-	type MembershipChanged = Council;
-	type MaxMembers = super::collective::MaxMembers;
-	type WeightInfo = weights::pallet_membership::WeightInfo<Runtime>;
-}
-
 type TechnicalCommitteeMembership = pallet_membership::Instance2;
 impl pallet_membership::Config<TechnicalCommitteeMembership> for Runtime {
 	type RuntimeEvent = RuntimeEvent;

diff --git a/runtime/laos/src/lib.rs b/runtime/laos/src/lib.rs
@@ -127,6 +127,7 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue = 30,
 		PolkadotXcm: pallet_xcm = 31,
 		CumulusXcm: cumulus_pallet_xcm = 32,
+		// TODO put the name of the remove pallet as placeholder = 33,
 		MessageQueue: pallet_message_queue = 34,
 
 		// Governance
@@ -137,8 +138,7 @@ construct_runtime!(
 		TechnicalCommittee: pallet_collective::<Instance2> = 44,
 		Scheduler: pallet_scheduler = 45,
 		Democracy: pallet_democracy = 46,
-		CouncilMembership: pallet_membership::<Instance1> = 47,
-		TechnicalCommitteeMembership: pallet_membership::<Instance2> = 48,
+		TechnicalCommitteeMembership: pallet_membership::<Instance2> = 47,
 
 		// Frontier
 		Ethereum: pallet_ethereum = 50,