Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Collectives Alliance: Remove Founder role and veto call #1902

Merged
merged 4 commits into from
Nov 25, 2022
Merged

Collectives Alliance: Remove Founder role and veto call #1902

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67365ae
Companion: Remove Founder role and veto call
muharem Nov 23, 2022
6ed4156
wieghts
muharem Nov 23, 2022
a4db027
Merge remote-tracking branch 'origin' into muharem-collectives-allian…
joepetrowski Nov 25, 2022
ca1b2f8
update lockfile for {"polkadot", "substrate"}
Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ where
pallet_collective::Pallet::<T, I>::do_vote(who, proposal, index, approve)
}

fn veto_proposal(proposal_hash: HashOf<T>) -> u32 {
pallet_collective::Pallet::<T, I>::do_disapprove_proposal(proposal_hash)
}

fn close_proposal(
proposal_hash: HashOf<T>,
proposal_index: ProposalIndex,
Expand Down
4 changes: 1 addition & 3 deletions parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,7 @@ impl pallet_collective::Config<AllianceCollective> for Runtime {
type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
}

pub const MAX_FOUNDERS: u32 = 10;
pub const MAX_FELLOWS: u32 = ALLIANCE_MAX_MEMBERS - MAX_FOUNDERS;
pub const MAX_FELLOWS: u32 = ALLIANCE_MAX_MEMBERS;
pub const MAX_ALLIES: u32 = 100;

parameter_types! {
Expand All @@ -477,7 +476,6 @@ impl pallet_alliance::Config for Runtime {
type IdentityVerifier = (); // Don't block accounts on identity criteria
type ProposalProvider = AllianceProposalProvider<Runtime, AllianceCollective>;
type MaxProposals = ConstU32<ALLIANCE_MAX_MEMBERS>;
type MaxFounders = ConstU32<MAX_FOUNDERS>;
type MaxFellows = ConstU32<MAX_FELLOWS>;
type MaxAllies = ConstU32<MAX_ALLIES>;
type MaxUnscrupulousItems = ConstU32<100>;
Expand Down
Loading