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
+37 -34
View File
@@ -59,19 +59,19 @@ pub mod pallet {
+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
/// Required origin for adding a member (though can always be Root).
type AddOrigin: EnsureOrigin<Self::Origin>;
type AddOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// Required origin for removing a member (though can always be Root).
type RemoveOrigin: EnsureOrigin<Self::Origin>;
type RemoveOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// Required origin for adding and removing a member in a single action.
type SwapOrigin: EnsureOrigin<Self::Origin>;
type SwapOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// Required origin for resetting membership.
type ResetOrigin: EnsureOrigin<Self::Origin>;
type ResetOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// Required origin for setting or resetting the prime member.
type PrimeOrigin: EnsureOrigin<Self::Origin>;
type PrimeOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// The receiver of the signal for when the membership has been initialized. This happens
/// pre-genesis and will usually be the same as `MembershipChanged`. If you need to do
@@ -543,7 +543,7 @@ mod tests {
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
type Origin = Origin;
type RuntimeOrigin = RuntimeOrigin;
type Index = u64;
type BlockNumber = u64;
type Hash = H256;
@@ -647,13 +647,16 @@ mod tests {
#[test]
fn prime_member_works() {
new_test_ext().execute_with(|| {
assert_noop!(Membership::set_prime(Origin::signed(4), 20), BadOrigin);
assert_noop!(Membership::set_prime(Origin::signed(5), 15), Error::<Test, _>::NotMember);
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
assert_noop!(Membership::set_prime(RuntimeOrigin::signed(4), 20), BadOrigin);
assert_noop!(
Membership::set_prime(RuntimeOrigin::signed(5), 15),
Error::<Test, _>::NotMember
);
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 20));
assert_eq!(Membership::prime(), Some(20));
assert_eq!(PRIME.with(|m| *m.borrow()), Membership::prime());
assert_ok!(Membership::clear_prime(Origin::signed(5)));
assert_ok!(Membership::clear_prime(RuntimeOrigin::signed(5)));
assert_eq!(Membership::prime(), None);
assert_eq!(PRIME.with(|m| *m.borrow()), Membership::prime());
});
@@ -662,12 +665,12 @@ mod tests {
#[test]
fn add_member_works() {
new_test_ext().execute_with(|| {
assert_noop!(Membership::add_member(Origin::signed(5), 15), BadOrigin);
assert_noop!(Membership::add_member(RuntimeOrigin::signed(5), 15), BadOrigin);
assert_noop!(
Membership::add_member(Origin::signed(1), 10),
Membership::add_member(RuntimeOrigin::signed(1), 10),
Error::<Test, _>::AlreadyMember
);
assert_ok!(Membership::add_member(Origin::signed(1), 15));
assert_ok!(Membership::add_member(RuntimeOrigin::signed(1), 15));
assert_eq!(Membership::members(), vec![10, 15, 20, 30]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
});
@@ -676,13 +679,13 @@ mod tests {
#[test]
fn remove_member_works() {
new_test_ext().execute_with(|| {
assert_noop!(Membership::remove_member(Origin::signed(5), 20), BadOrigin);
assert_noop!(Membership::remove_member(RuntimeOrigin::signed(5), 20), BadOrigin);
assert_noop!(
Membership::remove_member(Origin::signed(2), 15),
Membership::remove_member(RuntimeOrigin::signed(2), 15),
Error::<Test, _>::NotMember
);
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
assert_ok!(Membership::remove_member(Origin::signed(2), 20));
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 20));
assert_ok!(Membership::remove_member(RuntimeOrigin::signed(2), 20));
assert_eq!(Membership::members(), vec![10, 30]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
assert_eq!(Membership::prime(), None);
@@ -693,24 +696,24 @@ mod tests {
#[test]
fn swap_member_works() {
new_test_ext().execute_with(|| {
assert_noop!(Membership::swap_member(Origin::signed(5), 10, 25), BadOrigin);
assert_noop!(Membership::swap_member(RuntimeOrigin::signed(5), 10, 25), BadOrigin);
assert_noop!(
Membership::swap_member(Origin::signed(3), 15, 25),
Membership::swap_member(RuntimeOrigin::signed(3), 15, 25),
Error::<Test, _>::NotMember
);
assert_noop!(
Membership::swap_member(Origin::signed(3), 10, 30),
Membership::swap_member(RuntimeOrigin::signed(3), 10, 30),
Error::<Test, _>::AlreadyMember
);
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
assert_ok!(Membership::swap_member(Origin::signed(3), 20, 20));
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 20));
assert_ok!(Membership::swap_member(RuntimeOrigin::signed(3), 20, 20));
assert_eq!(Membership::members(), vec![10, 20, 30]);
assert_eq!(Membership::prime(), Some(20));
assert_eq!(PRIME.with(|m| *m.borrow()), Membership::prime());
assert_ok!(Membership::set_prime(Origin::signed(5), 10));
assert_ok!(Membership::swap_member(Origin::signed(3), 10, 25));
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 10));
assert_ok!(Membership::swap_member(RuntimeOrigin::signed(3), 10, 25));
assert_eq!(Membership::members(), vec![20, 25, 30]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
assert_eq!(Membership::prime(), None);
@@ -721,7 +724,7 @@ mod tests {
#[test]
fn swap_member_works_that_does_not_change_order() {
new_test_ext().execute_with(|| {
assert_ok!(Membership::swap_member(Origin::signed(3), 10, 5));
assert_ok!(Membership::swap_member(RuntimeOrigin::signed(3), 10, 5));
assert_eq!(Membership::members(), vec![5, 20, 30]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
});
@@ -730,16 +733,16 @@ mod tests {
#[test]
fn change_key_works() {
new_test_ext().execute_with(|| {
assert_ok!(Membership::set_prime(Origin::signed(5), 10));
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 10));
assert_noop!(
Membership::change_key(Origin::signed(3), 25),
Membership::change_key(RuntimeOrigin::signed(3), 25),
Error::<Test, _>::NotMember
);
assert_noop!(
Membership::change_key(Origin::signed(10), 20),
Membership::change_key(RuntimeOrigin::signed(10), 20),
Error::<Test, _>::AlreadyMember
);
assert_ok!(Membership::change_key(Origin::signed(10), 40));
assert_ok!(Membership::change_key(RuntimeOrigin::signed(10), 40));
assert_eq!(Membership::members(), vec![20, 30, 40]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
assert_eq!(Membership::prime(), Some(40));
@@ -750,7 +753,7 @@ mod tests {
#[test]
fn change_key_works_that_does_not_change_order() {
new_test_ext().execute_with(|| {
assert_ok!(Membership::change_key(Origin::signed(10), 5));
assert_ok!(Membership::change_key(RuntimeOrigin::signed(10), 5));
assert_eq!(Membership::members(), vec![5, 20, 30]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
});
@@ -759,19 +762,19 @@ mod tests {
#[test]
fn reset_members_works() {
new_test_ext().execute_with(|| {
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
assert_ok!(Membership::set_prime(RuntimeOrigin::signed(5), 20));
assert_noop!(
Membership::reset_members(Origin::signed(1), bounded_vec![20, 40, 30]),
Membership::reset_members(RuntimeOrigin::signed(1), bounded_vec![20, 40, 30]),
BadOrigin
);
assert_ok!(Membership::reset_members(Origin::signed(4), vec![20, 40, 30]));
assert_ok!(Membership::reset_members(RuntimeOrigin::signed(4), vec![20, 40, 30]));
assert_eq!(Membership::members(), vec![20, 30, 40]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
assert_eq!(Membership::prime(), Some(20));
assert_eq!(PRIME.with(|m| *m.borrow()), Membership::prime());
assert_ok!(Membership::reset_members(Origin::signed(4), vec![10, 40, 30]));
assert_ok!(Membership::reset_members(RuntimeOrigin::signed(4), vec![10, 40, 30]));
assert_eq!(Membership::members(), vec![10, 30, 40]);
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members().to_vec());
assert_eq!(Membership::prime(), None);