Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2007c1f
Alliance pallet: add force_set_members instead of init_members function
muharem Aug 9, 2022
a405dfc
benchmark with witness data
muharem Aug 12, 2022
b654d68
remove invalid limit for clear
muharem Aug 12, 2022
855bb3d
Apply suggestions from code review
muharem Aug 12, 2022
7ad0f97
Revert "remove invalid limit for clear"
muharem Aug 12, 2022
8b071c4
compile constructor only for test
muharem Aug 12, 2022
fb4c22c
Update comments for force_set_members
muharem Aug 12, 2022
a40904e
Apply suggestions from code review
muharem Aug 16, 2022
8a254b4
Merge branch 'master' of https://github.com/paritytech/substrate into…
Aug 16, 2022
d202ae2
".git/.scripts/bench-bot.sh" pallet dev pallet_alliance
Aug 16, 2022
744178f
benchmark - founders count range
muharem Aug 16, 2022
dbc4fdd
Revert "benchmark - founders count range"
muharem Aug 16, 2022
2ea38af
witness members count instead votable members count
muharem Aug 19, 2022
e7b525a
update the doc
muharem Aug 24, 2022
92575a1
use decode_len for witness data checks
muharem Aug 26, 2022
628b1c3
Merge remote-tracking branch 'origin/master' into pallet-alliance-for…
Aug 26, 2022
523f256
change witness data member count to voting member count; update clear…
muharem Aug 26, 2022
cb3e63d
".git/.scripts/bench-bot.sh" pallet dev pallet_alliance
Aug 26, 2022
cd6bea8
merge master
muharem Aug 29, 2022
78d28a2
fixes after merge master
muharem Aug 29, 2022
f9312c5
revert to cb3e63
muharem Aug 29, 2022
ccc35ed
Merge remote-tracking branch 'origin/master' into pallet-alliance-for…
muharem Aug 29, 2022
f7828c2
disband alliance and return deposits
muharem Aug 31, 2022
9531b8a
revert debug changes
muharem Aug 31, 2022
5136902
Merge remote-tracking branch 'origin/master' into pallet-alliance-for…
muharem Aug 31, 2022
973483d
weights
muharem Aug 31, 2022
5cfb043
update docs
muharem Aug 31, 2022
145d14e
update test comments
muharem Aug 31, 2022
183ee71
Apply Joe suggestions from code review
muharem Sep 1, 2022
91b5891
rename event from AllianceDisband to AllianceDisbanded
muharem Sep 1, 2022
e730aa2
Merge branch 'master' of https://github.com/paritytech/substrate into…
Sep 1, 2022
7ba3056
".git/.scripts/bench-bot.sh" pallet dev pallet_alliance
Sep 1, 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
Prev Previous commit
Next Next commit
update test comments
  • Loading branch information
muharem committed Aug 31, 2022
commit 145d14e78ba9c323615abe8e262681a104a3ff3c
10 changes: 6 additions & 4 deletions frame/alliance/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@ benchmarks_instance_pallet! {
voting_members: c,
ally_members: m,
};
let mut old_fellows: Vec<T::AccountId> = Vec::new();
let mut old_allies: Vec<T::AccountId> = Vec::new();

let mut cc = c;
if (m > 0 && c == 0) || (p > 0 && c == 0) {
Expand All @@ -643,8 +645,8 @@ benchmarks_instance_pallet! {
// one voting member required to create proposal.
cc = 1;
}
let mut old_fellows: Vec<T::AccountId> = Vec::new();
let mut old_allies: Vec<T::AccountId> = Vec::new();

// setting the Alliance to disband on the benchmark call
if cc > 0 {
old_fellows = (0..cc).map(fellow::<T, I>).collect::<Vec<_>>();
old_allies = (0..m).map(ally::<T, I>).collect::<Vec<_>>();
Expand Down Expand Up @@ -687,11 +689,11 @@ benchmarks_instance_pallet! {
assert_eq!(Alliance::<T, I>::ally_members_count(), m);
}

// Add previous proposals.
// adding proposals to veto on the Alliance reset
for i in 0..p {
let threshold = cc;
let bytes_in_storage = i + size_of::<Cid>() as u32 + 32;
// Proposals should be different so that different proposal hashes are generated
// proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal =
AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; i as usize]) }.into();
Alliance::<T, I>::propose(
Expand Down
10 changes: 8 additions & 2 deletions frame/alliance/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ fn force_set_members_works() {
assert_ok!(Alliance::propose(Origin::signed(1), 3, Box::new(k_proposal), k_proposal_len));
let mut proposals = vec![hash, k_hash];

// give a retirement notice to check later a retiring member not removed
assert_ok!(Alliance::give_retirement_notice(Origin::signed(2)));

assert!(Alliance::is_member_of(&2, MemberRole::Retiring));

// join alliance and reserve funds
Expand Down Expand Up @@ -86,6 +86,8 @@ fn force_set_members_works() {
),
Error::<Test, ()>::AllianceAlreadyInitialized,
);

// wrong witness data checks
assert_noop!(
Alliance::force_set_members(
Origin::root(),
Expand Down Expand Up @@ -117,6 +119,7 @@ fn force_set_members_works() {
Error::<Test, ()>::BadWitness,
);

// founders missing, other members given
assert_noop!(
Alliance::force_set_members(
Origin::root(),
Expand All @@ -139,8 +142,10 @@ fn force_set_members_works() {

// assert new set of voting members
assert_eq!(Alliance::votable_members_sorted(), vec![4, 5, 8]);
// assert new members
// assert new ally member
assert!(Alliance::is_ally(&2));
// assert a retiring member from previous Alliance not removed
assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
// assert old alliance disband.
assert!(!Alliance::is_member(&1));
assert!(!Alliance::is_member(&3));
Expand All @@ -151,6 +156,7 @@ fn force_set_members_works() {
assert_eq!(<Test as Config>::ProposalProvider::proposals(), vec![]);
assert_eq!(<Test as Config>::ProposalProvider::proposals_count(), 0);

// assert events
proposals.sort();
assert_prev_event(mock::Event::Alliance(crate::Event::AllianceDisband {
members: vec![1, 3, 9],
Expand Down