BREAKING: Rename Origin (#12258)

* BREAKING: Rename Origin

* more renaming

* a bit more renaming

* fix

* more fixing

* fix in frame_support

* even more fixes

* fix

* small fix

* ...

* update .stderr

* docs

* update docs

* update docs

* docs
This commit is contained in:
Sergej Sakac
2022-09-21 00:13:09 +02:00
committed by GitHub
parent 986d20b352
commit e4b6f4a66d
221 changed files with 5233 additions and 4200 deletions
+103 -74
View File
@@ -30,28 +30,31 @@ fn init_members_works() {
new_test_ext().execute_with(|| {
// alliance must be reset first, no witness data
assert_noop!(
Alliance::init_members(Origin::root(), vec![8], vec![], vec![],),
Alliance::init_members(RuntimeOrigin::root(), vec![8], vec![], vec![],),
Error::<Test, ()>::AllianceAlreadyInitialized,
);
// give a retirement notice to check later a retiring member not removed
assert_ok!(Alliance::give_retirement_notice(Origin::signed(2)));
assert_ok!(Alliance::give_retirement_notice(RuntimeOrigin::signed(2)));
assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
// disband the Alliance to init new
assert_ok!(Alliance::disband(Origin::root(), DisbandWitness::new(2, 0)));
assert_ok!(Alliance::disband(RuntimeOrigin::root(), DisbandWitness::new(2, 0)));
// fails without root
assert_noop!(Alliance::init_members(Origin::signed(1), vec![], vec![], vec![]), BadOrigin);
assert_noop!(
Alliance::init_members(RuntimeOrigin::signed(1), vec![], vec![], vec![]),
BadOrigin
);
// founders missing, other members given
assert_noop!(
Alliance::init_members(Origin::root(), vec![], vec![4], vec![2],),
Alliance::init_members(RuntimeOrigin::root(), vec![], vec![4], vec![2],),
Error::<Test, ()>::FoundersMissing,
);
// success call
assert_ok!(Alliance::init_members(Origin::root(), vec![8, 5], vec![4], vec![2],));
assert_ok!(Alliance::init_members(RuntimeOrigin::root(), vec![8, 5], vec![4], vec![2],));
// assert new set of voting members
assert_eq!(Alliance::voting_members_sorted(), vec![4, 5, 8]);
@@ -78,36 +81,36 @@ fn disband_works() {
assert_eq!(Alliance::voting_members_sorted(), vec![1, 2, 3]);
// give a retirement notice to check later a retiring member not removed
assert_ok!(Alliance::give_retirement_notice(Origin::signed(2)));
assert_ok!(Alliance::give_retirement_notice(RuntimeOrigin::signed(2)));
assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
// join alliance and reserve funds
assert_eq!(Balances::free_balance(9), 40);
assert_ok!(Alliance::join_alliance(Origin::signed(9)));
assert_ok!(Alliance::join_alliance(RuntimeOrigin::signed(9)));
assert_eq!(Alliance::deposit_of(9), Some(25));
assert_eq!(Balances::free_balance(9), 15);
assert!(Alliance::is_member_of(&9, MemberRole::Ally));
// fails without root
assert_noop!(Alliance::disband(Origin::signed(1), Default::default()), BadOrigin);
assert_noop!(Alliance::disband(RuntimeOrigin::signed(1), Default::default()), BadOrigin);
// bad witness data checks
assert_noop!(
Alliance::disband(Origin::root(), Default::default(),),
Alliance::disband(RuntimeOrigin::root(), Default::default(),),
Error::<Test, ()>::BadWitness
);
assert_noop!(
Alliance::disband(Origin::root(), DisbandWitness::new(1, 1)),
Alliance::disband(RuntimeOrigin::root(), DisbandWitness::new(1, 1)),
Error::<Test, ()>::BadWitness,
);
assert_noop!(
Alliance::disband(Origin::root(), DisbandWitness::new(2, 0)),
Alliance::disband(RuntimeOrigin::root(), DisbandWitness::new(2, 0)),
Error::<Test, ()>::BadWitness,
);
// success call
assert_ok!(Alliance::disband(Origin::root(), DisbandWitness::new(2, 1)));
assert_ok!(Alliance::disband(RuntimeOrigin::root(), DisbandWitness::new(2, 1)));
// assert members disband
assert!(!Alliance::is_member(&1));
@@ -125,7 +128,7 @@ fn disband_works() {
// the Alliance must be set first
assert_noop!(
Alliance::disband(Origin::root(), DisbandWitness::new(100, 100)),
Alliance::disband(RuntimeOrigin::root(), DisbandWitness::new(100, 100)),
Error::<Test, ()>::AllianceNotYetInitialized,
);
})
@@ -138,12 +141,17 @@ fn propose_works() {
// only voting member can propose proposal, 4 is ally not have vote rights
assert_noop!(
Alliance::propose(Origin::signed(4), 3, Box::new(proposal.clone()), proposal_len),
Alliance::propose(
RuntimeOrigin::signed(4),
3,
Box::new(proposal.clone()),
proposal_len
),
Error::<Test, ()>::NoVotingRights
);
assert_ok!(Alliance::propose(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
Box::new(proposal.clone()),
proposal_len
@@ -171,12 +179,12 @@ fn vote_works() {
new_test_ext().execute_with(|| {
let (proposal, proposal_len, hash) = make_remark_proposal(42);
assert_ok!(Alliance::propose(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
Box::new(proposal.clone()),
proposal_len
));
assert_ok!(Alliance::vote(Origin::signed(2), hash, 0, true));
assert_ok!(Alliance::vote(RuntimeOrigin::signed(2), hash, 0, true));
let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
assert_eq!(
@@ -205,21 +213,21 @@ fn veto_works() {
new_test_ext().execute_with(|| {
let (proposal, proposal_len, hash) = make_remark_proposal(42);
assert_ok!(Alliance::propose(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
Box::new(proposal.clone()),
proposal_len
));
// only set_rule/elevate_ally can be veto
assert_noop!(
Alliance::veto(Origin::signed(1), hash),
Alliance::veto(RuntimeOrigin::signed(1), hash),
Error::<Test, ()>::NotVetoableProposal
);
let cid = test_cid();
let (vetoable_proposal, vetoable_proposal_len, vetoable_hash) = make_set_rule_proposal(cid);
assert_ok!(Alliance::propose(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
Box::new(vetoable_proposal.clone()),
vetoable_proposal_len
@@ -227,11 +235,11 @@ fn veto_works() {
// only founder have veto rights, 3 is fellow
assert_noop!(
Alliance::veto(Origin::signed(3), vetoable_hash),
Alliance::veto(RuntimeOrigin::signed(3), vetoable_hash),
Error::<Test, ()>::NotFounder
);
assert_ok!(Alliance::veto(Origin::signed(2), vetoable_hash));
assert_ok!(Alliance::veto(RuntimeOrigin::signed(2), vetoable_hash));
let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
assert_eq!(
System::events(),
@@ -262,15 +270,21 @@ fn close_works() {
let (proposal, proposal_len, hash) = make_remark_proposal(42);
let proposal_weight = proposal.get_dispatch_info().weight;
assert_ok!(Alliance::propose(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
Box::new(proposal.clone()),
proposal_len
));
assert_ok!(Alliance::vote(Origin::signed(1), hash, 0, true));
assert_ok!(Alliance::vote(Origin::signed(2), hash, 0, true));
assert_ok!(Alliance::vote(Origin::signed(3), hash, 0, true));
assert_ok!(Alliance::close(Origin::signed(1), hash, 0, proposal_weight, proposal_len));
assert_ok!(Alliance::vote(RuntimeOrigin::signed(1), hash, 0, true));
assert_ok!(Alliance::vote(RuntimeOrigin::signed(2), hash, 0, true));
assert_ok!(Alliance::vote(RuntimeOrigin::signed(3), hash, 0, true));
assert_ok!(Alliance::close(
RuntimeOrigin::signed(1),
hash,
0,
proposal_weight,
proposal_len
));
let record = |event| EventRecord { phase: Phase::Initialization, event, topics: vec![] };
assert_eq!(
@@ -324,7 +338,7 @@ fn close_works() {
fn set_rule_works() {
new_test_ext().execute_with(|| {
let cid = test_cid();
assert_ok!(Alliance::set_rule(Origin::signed(1), cid.clone()));
assert_ok!(Alliance::set_rule(RuntimeOrigin::signed(1), cid.clone()));
assert_eq!(Alliance::rule(), Some(cid.clone()));
System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::NewRuleSet {
@@ -338,9 +352,9 @@ fn announce_works() {
new_test_ext().execute_with(|| {
let cid = test_cid();
assert_noop!(Alliance::announce(Origin::signed(2), cid.clone()), BadOrigin);
assert_noop!(Alliance::announce(RuntimeOrigin::signed(2), cid.clone()), BadOrigin);
assert_ok!(Alliance::announce(Origin::signed(3), cid.clone()));
assert_ok!(Alliance::announce(RuntimeOrigin::signed(3), cid.clone()));
assert_eq!(Alliance::announcements(), vec![cid.clone()]);
System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::Announced {
@@ -353,7 +367,7 @@ fn announce_works() {
fn remove_announcement_works() {
new_test_ext().execute_with(|| {
let cid = test_cid();
assert_ok!(Alliance::announce(Origin::signed(3), cid.clone()));
assert_ok!(Alliance::announce(RuntimeOrigin::signed(3), cid.clone()));
assert_eq!(Alliance::announcements(), vec![cid.clone()]);
System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::Announced {
announcement: cid.clone(),
@@ -361,7 +375,7 @@ fn remove_announcement_works() {
System::set_block_number(2);
assert_ok!(Alliance::remove_announcement(Origin::signed(3), cid.clone()));
assert_ok!(Alliance::remove_announcement(RuntimeOrigin::signed(3), cid.clone()));
assert_eq!(Alliance::announcements(), vec![]);
System::assert_last_event(mock::RuntimeEvent::Alliance(
crate::Event::AnnouncementRemoved { announcement: cid },
@@ -373,46 +387,52 @@ fn remove_announcement_works() {
fn join_alliance_works() {
new_test_ext().execute_with(|| {
// check already member
assert_noop!(Alliance::join_alliance(Origin::signed(1)), Error::<Test, ()>::AlreadyMember);
assert_noop!(
Alliance::join_alliance(RuntimeOrigin::signed(1)),
Error::<Test, ()>::AlreadyMember
);
// check already listed as unscrupulous
assert_ok!(Alliance::add_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(4)]
));
assert_noop!(
Alliance::join_alliance(Origin::signed(4)),
Alliance::join_alliance(RuntimeOrigin::signed(4)),
Error::<Test, ()>::AccountNonGrata
);
assert_ok!(Alliance::remove_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(4)]
));
// check deposit funds
assert_noop!(
Alliance::join_alliance(Origin::signed(5)),
Alliance::join_alliance(RuntimeOrigin::signed(5)),
Error::<Test, ()>::InsufficientFunds
);
// success to submit
assert_ok!(Alliance::join_alliance(Origin::signed(4)));
assert_ok!(Alliance::join_alliance(RuntimeOrigin::signed(4)));
assert_eq!(Alliance::deposit_of(4), Some(25));
assert_eq!(Alliance::members(MemberRole::Ally), vec![4]);
// check already member
assert_noop!(Alliance::join_alliance(Origin::signed(4)), Error::<Test, ()>::AlreadyMember);
assert_noop!(
Alliance::join_alliance(RuntimeOrigin::signed(4)),
Error::<Test, ()>::AlreadyMember
);
// check missing identity judgement
#[cfg(not(feature = "runtime-benchmarks"))]
assert_noop!(
Alliance::join_alliance(Origin::signed(6)),
Alliance::join_alliance(RuntimeOrigin::signed(6)),
Error::<Test, ()>::WithoutGoodIdentityJudgement
);
// check missing identity info
#[cfg(not(feature = "runtime-benchmarks"))]
assert_noop!(
Alliance::join_alliance(Origin::signed(7)),
Alliance::join_alliance(RuntimeOrigin::signed(7)),
Error::<Test, ()>::WithoutIdentityDisplayAndWebsite
);
});
@@ -423,51 +443,51 @@ fn nominate_ally_works() {
new_test_ext().execute_with(|| {
// check already member
assert_noop!(
Alliance::nominate_ally(Origin::signed(1), 2),
Alliance::nominate_ally(RuntimeOrigin::signed(1), 2),
Error::<Test, ()>::AlreadyMember
);
// only voting member(founder/fellow) have nominate right
assert_noop!(
Alliance::nominate_ally(Origin::signed(5), 4),
Alliance::nominate_ally(RuntimeOrigin::signed(5), 4),
Error::<Test, ()>::NoVotingRights
);
// check already listed as unscrupulous
assert_ok!(Alliance::add_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(4)]
));
assert_noop!(
Alliance::nominate_ally(Origin::signed(1), 4),
Alliance::nominate_ally(RuntimeOrigin::signed(1), 4),
Error::<Test, ()>::AccountNonGrata
);
assert_ok!(Alliance::remove_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(4)]
));
// success to nominate
assert_ok!(Alliance::nominate_ally(Origin::signed(1), 4));
assert_ok!(Alliance::nominate_ally(RuntimeOrigin::signed(1), 4));
assert_eq!(Alliance::deposit_of(4), None);
assert_eq!(Alliance::members(MemberRole::Ally), vec![4]);
// check already member
assert_noop!(
Alliance::nominate_ally(Origin::signed(1), 4),
Alliance::nominate_ally(RuntimeOrigin::signed(1), 4),
Error::<Test, ()>::AlreadyMember
);
// check missing identity judgement
#[cfg(not(feature = "runtime-benchmarks"))]
assert_noop!(
Alliance::join_alliance(Origin::signed(6)),
Alliance::join_alliance(RuntimeOrigin::signed(6)),
Error::<Test, ()>::WithoutGoodIdentityJudgement
);
// check missing identity info
#[cfg(not(feature = "runtime-benchmarks"))]
assert_noop!(
Alliance::join_alliance(Origin::signed(7)),
Alliance::join_alliance(RuntimeOrigin::signed(7)),
Error::<Test, ()>::WithoutIdentityDisplayAndWebsite
);
});
@@ -476,13 +496,16 @@ fn nominate_ally_works() {
#[test]
fn elevate_ally_works() {
new_test_ext().execute_with(|| {
assert_noop!(Alliance::elevate_ally(Origin::signed(2), 4), Error::<Test, ()>::NotAlly);
assert_noop!(
Alliance::elevate_ally(RuntimeOrigin::signed(2), 4),
Error::<Test, ()>::NotAlly
);
assert_ok!(Alliance::join_alliance(Origin::signed(4)));
assert_ok!(Alliance::join_alliance(RuntimeOrigin::signed(4)));
assert_eq!(Alliance::members(MemberRole::Ally), vec![4]);
assert_eq!(Alliance::members(MemberRole::Fellow), vec![3]);
assert_ok!(Alliance::elevate_ally(Origin::signed(2), 4));
assert_ok!(Alliance::elevate_ally(RuntimeOrigin::signed(2), 4));
assert_eq!(Alliance::members(MemberRole::Ally), Vec::<u64>::new());
assert_eq!(Alliance::members(MemberRole::Fellow), vec![3, 4]);
});
@@ -492,12 +515,12 @@ fn elevate_ally_works() {
fn give_retirement_notice_work() {
new_test_ext().execute_with(|| {
assert_noop!(
Alliance::give_retirement_notice(Origin::signed(4)),
Alliance::give_retirement_notice(RuntimeOrigin::signed(4)),
Error::<Test, ()>::NotMember
);
assert_eq!(Alliance::members(MemberRole::Fellow), vec![3]);
assert_ok!(Alliance::give_retirement_notice(Origin::signed(3)));
assert_ok!(Alliance::give_retirement_notice(RuntimeOrigin::signed(3)));
assert_eq!(Alliance::members(MemberRole::Fellow), Vec::<u64>::new());
assert_eq!(Alliance::members(MemberRole::Retiring), vec![3]);
System::assert_last_event(mock::RuntimeEvent::Alliance(
@@ -505,7 +528,7 @@ fn give_retirement_notice_work() {
));
assert_noop!(
Alliance::give_retirement_notice(Origin::signed(3)),
Alliance::give_retirement_notice(RuntimeOrigin::signed(3)),
Error::<Test, ()>::AlreadyRetiring
);
});
@@ -515,23 +538,23 @@ fn give_retirement_notice_work() {
fn retire_works() {
new_test_ext().execute_with(|| {
assert_noop!(
Alliance::retire(Origin::signed(2)),
Alliance::retire(RuntimeOrigin::signed(2)),
Error::<Test, ()>::RetirementNoticeNotGiven
);
assert_noop!(
Alliance::retire(Origin::signed(4)),
Alliance::retire(RuntimeOrigin::signed(4)),
Error::<Test, ()>::RetirementNoticeNotGiven
);
assert_eq!(Alliance::members(MemberRole::Fellow), vec![3]);
assert_ok!(Alliance::give_retirement_notice(Origin::signed(3)));
assert_ok!(Alliance::give_retirement_notice(RuntimeOrigin::signed(3)));
assert_noop!(
Alliance::retire(Origin::signed(3)),
Alliance::retire(RuntimeOrigin::signed(3)),
Error::<Test, ()>::RetirementPeriodNotPassed
);
System::set_block_number(System::block_number() + RetirementPeriod::get());
assert_ok!(Alliance::retire(Origin::signed(3)));
assert_ok!(Alliance::retire(RuntimeOrigin::signed(3)));
assert_eq!(Alliance::members(MemberRole::Fellow), Vec::<u64>::new());
System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::MemberRetired {
member: (3),
@@ -541,11 +564,11 @@ fn retire_works() {
// Move time on:
System::set_block_number(System::block_number() + RetirementPeriod::get());
assert_powerless(Origin::signed(3));
assert_powerless(RuntimeOrigin::signed(3));
});
}
fn assert_powerless(user: Origin) {
fn assert_powerless(user: RuntimeOrigin) {
//vote / veto with a valid propsal
let cid = test_cid();
let (proposal, _, _) = make_kick_member_proposal(42);
@@ -578,13 +601,16 @@ fn assert_powerless(user: Origin) {
#[test]
fn kick_member_works() {
new_test_ext().execute_with(|| {
assert_noop!(Alliance::kick_member(Origin::signed(4), 4), BadOrigin);
assert_noop!(Alliance::kick_member(RuntimeOrigin::signed(4), 4), BadOrigin);
assert_noop!(Alliance::kick_member(Origin::signed(2), 4), Error::<Test, ()>::NotMember);
assert_noop!(
Alliance::kick_member(RuntimeOrigin::signed(2), 4),
Error::<Test, ()>::NotMember
);
<DepositOf<Test, ()>>::insert(2, 25);
assert_eq!(Alliance::members(MemberRole::Founder), vec![1, 2]);
assert_ok!(Alliance::kick_member(Origin::signed(2), 2));
assert_ok!(Alliance::kick_member(RuntimeOrigin::signed(2), 2));
assert_eq!(Alliance::members(MemberRole::Founder), vec![1]);
assert_eq!(<DepositOf<Test, ()>>::get(2), None);
System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::MemberKicked {
@@ -597,10 +623,10 @@ fn kick_member_works() {
#[test]
fn add_unscrupulous_items_works() {
new_test_ext().execute_with(|| {
assert_noop!(Alliance::add_unscrupulous_items(Origin::signed(2), vec![]), BadOrigin);
assert_noop!(Alliance::add_unscrupulous_items(RuntimeOrigin::signed(2), vec![]), BadOrigin);
assert_ok!(Alliance::add_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![
UnscrupulousItem::AccountId(3),
UnscrupulousItem::Website("abc".as_bytes().to_vec().try_into().unwrap())
@@ -611,7 +637,7 @@ fn add_unscrupulous_items_works() {
assert_noop!(
Alliance::add_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(3)]
),
Error::<Test, ()>::AlreadyUnscrupulous
@@ -622,23 +648,26 @@ fn add_unscrupulous_items_works() {
#[test]
fn remove_unscrupulous_items_works() {
new_test_ext().execute_with(|| {
assert_noop!(Alliance::remove_unscrupulous_items(Origin::signed(2), vec![]), BadOrigin);
assert_noop!(
Alliance::remove_unscrupulous_items(RuntimeOrigin::signed(2), vec![]),
BadOrigin
);
assert_noop!(
Alliance::remove_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(3)]
),
Error::<Test, ()>::NotListedAsUnscrupulous
);
assert_ok!(Alliance::add_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(3)]
));
assert_eq!(Alliance::unscrupulous_accounts(), vec![3]);
assert_ok!(Alliance::remove_unscrupulous_items(
Origin::signed(3),
RuntimeOrigin::signed(3),
vec![UnscrupulousItem::AccountId(3)]
));
assert_eq!(Alliance::unscrupulous_accounts(), Vec::<u64>::new());