Merge remote-tracking branch 'origin/master' into pallet-alliance-for…

…ce-set-members

frame/alliance/src/lib.rs

@@ -385,6 +385,12 @@ pub mod pallet {
 		AllianceNotReset,
 		/// Invalid witness data given.
 		BadWitness,
+		/// Account already gave retirement notice
+		AlreadyRetiring,
+		/// Account did not give a retirement notice required to retire.
+		RetirementNoticeNotGiven,
+		/// Retirement period has not passed.
+		RetirementPeriodNotPassed,
 	}
 
 	#[pallet::event]
@@ -678,7 +684,7 @@ pub mod pallet {
 					Error::<T, I>::AllianceNotReset
 				);
 				ensure!(
-					UpForKicking::<T, I>::clear(T::MaxMembersCount::get(), None)
+					RetiringMembers::<T, I>::clear(T::MaxMembersCount::get(), None)
 						.maybe_cursor
 						.is_none(),
 					Error::<T, I>::AllianceNotReset

frame/alliance/src/tests.rs

@@ -38,7 +38,9 @@ fn force_set_members_works() {
 		let (k_proposal, k_proposal_len, k_hash) = make_kick_member_proposal(2);
 		assert_ok!(Alliance::propose(Origin::signed(1), 3, Box::new(k_proposal), k_proposal_len));
 
-		assert!(Alliance::up_for_kicking(&2));
+		assert_ok!(Alliance::give_retirement_notice(Origin::signed(2)));
+
+		assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
 		// ensure proposal is listed as active proposal
 		assert_eq!(<Test as Config>::ProposalProvider::proposals(), vec![hash, k_hash]);
 		assert_eq!(<Test as Config>::ProposalProvider::proposals_count(), 2);
@@ -98,7 +100,6 @@ fn force_set_members_works() {
 		assert_eq!(Alliance::votable_members_sorted(), vec![4, 5, 8]);
 		// assert new members
 		assert!(Alliance::is_ally(&2));
-		assert!(!Alliance::up_for_kicking(&2));
 		assert!(!Alliance::is_member(&1));
 		assert!(!Alliance::is_member(&3));
 		// all proposals are removed
@@ -471,16 +472,10 @@ fn elevate_ally_works() {
 #[test]
 fn give_retirement_notice_work() {
 	new_test_ext().execute_with(|| {
-		let (proposal, proposal_len, _) = make_kick_member_proposal(2);
-		assert_ok!(Alliance::propose(
-			Origin::signed(1),
-			3,
-			Box::new(proposal.clone()),
-			proposal_len
-		));
-		assert_noop!(Alliance::retire(Origin::signed(2)), Error::<Test, ()>::UpForKicking);
-
-		assert_noop!(Alliance::retire(Origin::signed(4)), Error::<Test, ()>::NotMember);
+		assert_noop!(
+			Alliance::give_retirement_notice(Origin::signed(4)),
+			Error::<Test, ()>::NotMember
+		);
 
 		assert_eq!(Alliance::members(MemberRole::Fellow), vec![3]);
 		assert_ok!(Alliance::give_retirement_notice(Origin::signed(3)));
@@ -534,9 +529,18 @@ fn retire_works() {
 fn assert_powerless(user: Origin) {
 	//vote / veto with a valid propsal
 	let cid = test_cid();
-	let proposal = make_proposal(42);
+	let (proposal, _, _) = make_kick_member_proposal(42);
 
-	assert_noop!(Alliance::init_members(user.clone(), vec![], vec![], vec![]), BadOrigin);
+	assert_noop!(
+		Alliance::force_set_members(
+			user.clone(),
+			vec![],
+			vec![],
+			vec![],
+			ForceSetWitness { voting_members: 3, ..Default::default() }
+		),
+		BadOrigin
+	);
 
 	assert_noop!(Alliance::set_rule(user.clone(), cid.clone()), BadOrigin);
 
@@ -559,15 +563,7 @@ fn assert_powerless(user: Origin) {
 #[test]
 fn kick_member_works() {
 	new_test_ext().execute_with(|| {
-		let (proposal, proposal_len, _) = make_kick_member_proposal(2);
-		assert_ok!(Alliance::propose(
-			Origin::signed(1),
-			3,
-			Box::new(proposal.clone()),
-			proposal_len
-		));
-		assert_eq!(Alliance::up_for_kicking(2), true);
-		assert_eq!(Alliance::members(MemberRole::Founder), vec![1, 2]);
+		assert_noop!(Alliance::kick_member(Origin::signed(4), 4), BadOrigin);
 
 		assert_noop!(Alliance::kick_member(Origin::signed(2), 4), Error::<Test, ()>::NotMember);