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

Drop FoundingFellow role and veto call #12762

Merged
joepetrowski merged 2 commits into from
Nov 23, 2022
Merged

Drop FoundingFellow role and veto call #12762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81e84da
drop FoundingFellow role
muharem Nov 22, 2022
eed8283
drop veto call
muharem Nov 22, 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
Next Next commit
drop FoundingFellow role
  • Loading branch information
@muharem
muharem committed Nov 22, 2022
commit 81e84da1e868f4d0d35c3a01f78084f420d9749b
4 changes: 1 addition & 3 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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>;
Expand Down
137 changes: 42 additions & 95 deletions frame/alliance/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ fn funded_account<T: Config<I>, I: 'static>(name: &'static str, index: u32) -> T
account
}

fn founder<T: Config<I>, I: 'static>(index: u32) -> T::AccountId {
funded_account::<T, I>("founder", index)
}

fn fellow<T: Config<I>, I: 'static>(index: u32) -> T::AccountId {
funded_account::<T, I>("fellow", index)
}
Expand All @@ -82,10 +78,6 @@ fn generate_unscrupulous_account<T: Config<I>, I: 'static>(index: u32) -> T::Acc
}

fn set_members<T: Config<I>, I: 'static>() {
let founders: BoundedVec<_, T::MaxMembersCount> =
BoundedVec::try_from(vec![founder::<T, I>(1), founder::<T, I>(2)]).unwrap();
Members::<T, I>::insert(MemberRole::FoundingFellow, founders.clone());

let fellows: BoundedVec<_, T::MaxMembersCount> =
BoundedVec::try_from(vec![fellow::<T, I>(1), fellow::<T, I>(2)]).unwrap();
fellows.iter().for_each(|who| {
Expand All @@ -102,29 +94,24 @@ fn set_members<T: Config<I>, I: 'static>() {
});
Members::<T, I>::insert(MemberRole::Ally, allies);

T::InitializeMembers::initialize_members(&[founders.as_slice(), fellows.as_slice()].concat());
T::InitializeMembers::initialize_members(&[fellows.as_slice()].concat());
}

benchmarks_instance_pallet! {
// This tests when proposal is created and queued as "proposed"
propose_proposed {
let b in 1 .. MAX_BYTES;
let x in 2 .. T::MaxFoundingFellows::get();
let y in 0 .. T::MaxFellows::get();
let m in 2 .. T::MaxFellows::get();
let p in 1 .. T::MaxProposals::get();

let m = x + y;

let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let proposer = founders[0].clone();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
let proposer = fellows[0].clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -154,28 +141,21 @@ benchmarks_instance_pallet! {
}

vote {
// We choose 5 (3 founders + 2 fellows) as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let x in 3 .. T::MaxFoundingFellows::get();
let y in 2 .. T::MaxFellows::get();

let m = x + y;
// We choose 5 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 5 .. T::MaxFellows::get();

let p = T::MaxProposals::get();
let b = MAX_BYTES;
let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let proposer = founders[0].clone();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
let proposer = fellows[0].clone();

let mut members = Vec::with_capacity(founders.len() + fellows.len());
members.extend(founders.clone());
members.extend(fellows.clone());
let members = fellows.clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -238,13 +218,12 @@ benchmarks_instance_pallet! {
let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. m).map(founder::<T, I>).collect::<Vec<_>>();
let vetor = founders[0].clone();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
let vetor = fellows[0].clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
vec![],
fellows,
vec![],
)?;

Expand Down Expand Up @@ -274,27 +253,20 @@ benchmarks_instance_pallet! {
}

close_early_disapproved {
// We choose 4 (2 founders + 2 fellows) as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let x in 2 .. T::MaxFoundingFellows::get();
let y in 2 .. T::MaxFellows::get();
// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 4 .. T::MaxFellows::get();
let p in 1 .. T::MaxProposals::get();

let m = x + y;

let bytes = 100;
let bytes_in_storage = bytes + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();

let mut members = Vec::with_capacity(founders.len() + fellows.len());
members.extend(founders.clone());
members.extend(fellows.clone());
let members = fellows.clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -361,25 +333,19 @@ benchmarks_instance_pallet! {

close_early_approved {
let b in 1 .. MAX_BYTES;
// We choose 4 (2 founders + 2 fellows) as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let x in 2 .. T::MaxFoundingFellows::get();
let y in 2 .. T::MaxFellows::get();
// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 4 .. T::MaxFellows::get();
let p in 1 .. T::MaxProposals::get();

let m = x + y;
let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();

let mut members = Vec::with_capacity(founders.len() + fellows.len());
members.extend(founders.clone());
members.extend(fellows.clone());
let members = fellows.clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -450,27 +416,20 @@ benchmarks_instance_pallet! {
}

close_disapproved {
// We choose 2 (2 founders / 2 fellows) as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let x in 2 .. T::MaxFoundingFellows::get();
let y in 2 .. T::MaxFellows::get();
// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 2 .. T::MaxFellows::get();
let p in 1 .. T::MaxProposals::get();

let m = x + y;

let bytes = 100;
let bytes_in_storage = bytes + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();

let mut members = Vec::with_capacity(founders.len() + fellows.len());
members.extend(founders.clone());
members.extend(fellows.clone());
let members = fellows.clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -528,25 +487,19 @@ benchmarks_instance_pallet! {

close_approved {
let b in 1 .. MAX_BYTES;
// We choose 4 (2 founders + 2 fellows) as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let x in 2 .. T::MaxFoundingFellows::get();
let y in 2 .. T::MaxFellows::get();
// We choose 4 fellows as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 5 .. T::MaxFellows::get();
let p in 1 .. T::MaxProposals::get();

let m = x + y;
let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;

// Construct `members`.
let founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();

let mut members = Vec::with_capacity(founders.len() + fellows.len());
members.extend(founders.clone());
members.extend(fellows.clone());
let members = fellows.clone();

Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
founders,
fellows,
vec![],
)?;
Expand Down Expand Up @@ -605,54 +558,48 @@ benchmarks_instance_pallet! {
}

init_members {
// at least 1 founders
let x in 1 .. T::MaxFoundingFellows::get();
let y in 0 .. T::MaxFellows::get();
// at least 1 fellow
let m in 1 .. T::MaxFellows::get();
let z in 0 .. T::MaxAllies::get();

let mut founders = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let mut fellows = (0 .. y).map(fellow::<T, I>).collect::<Vec<_>>();
let mut fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
let mut allies = (0 .. z).map(ally::<T, I>).collect::<Vec<_>>();

}: _(SystemOrigin::Root, founders.clone(), fellows.clone(), allies.clone())
}: _(SystemOrigin::Root, fellows.clone(), allies.clone())
verify {
founders.sort();
fellows.sort();
allies.sort();
assert_last_event::<T, I>(Event::MembersInitialized {
founders: founders.clone(),
fellows: fellows.clone(),
allies: allies.clone(),
}.into());
assert_eq!(Alliance::<T, I>::members(MemberRole::FoundingFellow), founders);
assert_eq!(Alliance::<T, I>::members(MemberRole::Fellow), fellows);
assert_eq!(Alliance::<T, I>::members(MemberRole::Ally), allies);
}

disband {
// at least 1 founders
let x in 1 .. T::MaxFoundingFellows::get() + T::MaxFellows::get();
let x in 1 .. T::MaxFellows::get();
let y in 0 .. T::MaxAllies::get();
let z in 0 .. T::MaxMembersCount::get() / 2;

let voting_members = (0 .. x).map(founder::<T, I>).collect::<Vec<_>>();
let fellows = (0 .. x).map(fellow::<T, I>).collect::<Vec<_>>();
let allies = (0 .. y).map(ally::<T, I>).collect::<Vec<_>>();
let witness = DisbandWitness{
voting_members: x,
fellow_members: x,
ally_members: y,
};

// setting the Alliance to disband on the benchmark call
Alliance::<T, I>::init_members(
SystemOrigin::Root.into(),
voting_members.clone(),
vec![],
fellows.clone(),
allies.clone(),
)?;

// reserve deposits
let deposit = T::AllyDeposit::get();
for member in voting_members.iter().chain(allies.iter()).take(z as usize) {
for member in fellows.iter().chain(allies.iter()).take(z as usize) {
T::Currency::reserve(&member, deposit)?;
<DepositOf<T, I>>::insert(&member, deposit);
}
Expand All @@ -662,7 +609,7 @@ benchmarks_instance_pallet! {
}: _(SystemOrigin::Root, witness)
verify {
assert_last_event::<T, I>(Event::AllianceDisbanded {
voting_members: x,
fellow_members: x,
ally_members: y,
unreserved: cmp::min(z, x + y),
}.into());
Expand Down Expand Up @@ -732,22 +679,22 @@ benchmarks_instance_pallet! {
nominate_ally {
set_members::<T, I>();

let founder1 = founder::<T, I>(1);
assert!(Alliance::<T, I>::is_member_of(&founder1, MemberRole::FoundingFellow));
let fellow1 = fellow::<T, I>(1);
assert!(Alliance::<T, I>::is_member_of(&fellow1, MemberRole::Fellow));

let outsider = outsider::<T, I>(1);
assert!(!Alliance::<T, I>::is_member(&outsider));
assert_eq!(DepositOf::<T, I>::get(&outsider), None);

let outsider_lookup = T::Lookup::unlookup(outsider.clone());
}: _(SystemOrigin::Signed(founder1.clone()), outsider_lookup)
}: _(SystemOrigin::Signed(fellow1.clone()), outsider_lookup)
verify {
assert!(Alliance::<T, I>::is_member_of(&outsider, MemberRole::Ally)); // outsider is now an ally
assert_eq!(DepositOf::<T, I>::get(&outsider), None); // without a deposit
assert!(!Alliance::<T, I>::has_voting_rights(&outsider)); // allies don't have voting rights
assert_last_event::<T, I>(Event::NewAllyJoined {
ally: outsider,
nominator: Some(founder1),
nominator: Some(fellow1),
reserved: None
}.into());
}
Expand Down
Loading