Drop FoundingFellow role and veto call (#12762)

* drop FoundingFellow role * drop veto call
paritytech · Nov 23, 2022 · 8360b39 · 8360b39
1 parent c5fd4da
commit 8360b39
Show file tree

Hide file tree

Showing 9 changed files with 361 additions and 681 deletions.
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
@@ -97,10 +97,6 @@ impl ProposalProvider<AccountId, Hash, RuntimeCall> for AllianceProposalProvider
 		AllianceMotion::do_vote(who, proposal, index, approve)
 	}
 
-	fn veto_proposal(proposal_hash: Hash) -> u32 {
-		AllianceMotion::do_disapprove_proposal(proposal_hash)
-	}
-
 	fn close_proposal(
 		proposal_hash: Hash,
 		proposal_index: ProposalIndex,

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -1574,8 +1574,7 @@ impl pallet_collective::Config<AllianceCollective> for Runtime {
 }
 
 parameter_types! {
-	pub const MaxFoundingFellows: u32 = 10;
-	pub const MaxFellows: u32 = AllianceMaxMembers::get() - MaxFoundingFellows::get();
+	pub const MaxFellows: u32 = AllianceMaxMembers::get();
 	pub const MaxAllies: u32 = 100;
 	pub const AllyDeposit: Balance = 10 * DOLLARS;
 	pub const RetirementPeriod: BlockNumber = ALLIANCE_MOTION_DURATION_IN_BLOCKS + (1 * DAYS);
@@ -1606,7 +1605,6 @@ impl pallet_alliance::Config for Runtime {
 	type IdentityVerifier = ();
 	type ProposalProvider = AllianceProposalProvider;
 	type MaxProposals = AllianceMaxProposals;
-	type MaxFoundingFellows = MaxFoundingFellows;
 	type MaxFellows = MaxFellows;
 	type MaxAllies = MaxAllies;
 	type MaxUnscrupulousItems = ConstU32<100>;

diff --git a/frame/alliance/README.md b/frame/alliance/README.md
@@ -22,11 +22,9 @@ to update the Alliance's rule and make announcements.
   members to enforce. Similar to a Charter or Code of Conduct.
 - Announcement: An IPFS CID of some content that the Alliance want to announce.
 - Member: An account that is already in the group of the Alliance, including three types:
-  FoundingFellow, Fellow, or Ally. A member can also be kicked by the `MembershipManager` origin
+  Fellow, or Ally. A member can also be kicked by the `MembershipManager` origin
   or retire by itself.
 - Fellow: An account who is elevated from Ally by other Fellows.
-- FoundingFellow: Operationally equivalent to a Fellow, but set by Root in the initialization of
-  the Alliance.
 - Ally: An account who would like to join the Alliance. To become a voting member (Fellow), it
   will need approval from the `MembershipManager` origin. Any account can join as an Ally either
   by placing a deposit or by nomination from a voting member.
@@ -51,7 +49,6 @@ to update the Alliance's rule and make announcements.
 
 - `propose` - Propose a motion.
 - `vote` - Vote on a motion.
-- `veto` - Veto on a motion about `set_rule` and `elevate_ally`.
 - `close` - Close a motion with enough votes or that has expired.
 - `set_rule` - Initialize or update the Alliance's rule by IPFS CID.
 - `announce` - Make announcement by IPFS CID.
@@ -65,5 +62,5 @@ to update the Alliance's rule and make announcements.
 
 #### Root Calls
 
-- `init_members` - Initialize the Alliance, onboard founders, fellows, and allies.
+- `init_members` - Initialize the Alliance, onboard fellows and allies.
 - `disband` - Disband the Alliance, remove all active members and unreserve deposits.