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
+1 -1
View File
@@ -77,7 +77,7 @@ benchmarks! {
set_target {
let origin = T::AdminOrigin::successful_origin();
}: _<T::Origin>(origin, Default::default())
}: _<T::RuntimeOrigin>(origin, Default::default())
verify {}
thaw {
+1 -1
View File
@@ -116,7 +116,7 @@ pub mod pallet {
+ MaxEncodedLen;
/// Origin required for setting the target proportion to be under gilt.
type AdminOrigin: EnsureOrigin<Self::Origin>;
type AdminOrigin: EnsureOrigin<Self::RuntimeOrigin>;
/// Unbalanced handler to account for funds created (in case of a higher total issuance over
/// freezing period).
+1 -1
View File
@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
type BlockWeights = ();
type BlockLength = ();
type Origin = Origin;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type Index = u64;
type BlockNumber = u64;
+82 -76
View File
@@ -49,8 +49,8 @@ fn set_target_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
let e = DispatchError::BadOrigin;
assert_noop!(Gilt::set_target(Origin::signed(2), Perquintill::from_percent(50)), e);
assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(50)));
assert_noop!(Gilt::set_target(RuntimeOrigin::signed(2), Perquintill::from_percent(50)), e);
assert_ok!(Gilt::set_target(RuntimeOrigin::signed(1), Perquintill::from_percent(50)));
assert_eq!(
ActiveTotal::<Test>::get(),
@@ -68,13 +68,19 @@ fn set_target_works() {
fn place_bid_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_noop!(Gilt::place_bid(Origin::signed(1), 1, 2), Error::<Test>::AmountTooSmall);
assert_noop!(
Gilt::place_bid(Origin::signed(1), 101, 2),
Gilt::place_bid(RuntimeOrigin::signed(1), 1, 2),
Error::<Test>::AmountTooSmall
);
assert_noop!(
Gilt::place_bid(RuntimeOrigin::signed(1), 101, 2),
BalancesError::<Test>::InsufficientBalance
);
assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 4), Error::<Test>::DurationTooBig);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_noop!(
Gilt::place_bid(RuntimeOrigin::signed(1), 10, 4),
Error::<Test>::DurationTooBig
);
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_eq!(Balances::reserved_balance(1), 10);
assert_eq!(Queues::<Test>::get(2), vec![GiltBid { amount: 10, who: 1 }]);
assert_eq!(QueueTotals::<Test>::get(), vec![(0, 0), (1, 10), (0, 0)]);
@@ -85,16 +91,16 @@ fn place_bid_works() {
fn place_bid_queuing_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 20, 2));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(1), 5, 2));
assert_noop!(Gilt::place_bid(Origin::signed(1), 5, 2), Error::<Test>::BidTooLow);
assert_ok!(Gilt::place_bid(Origin::signed(1), 15, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 20, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 5, 2));
assert_noop!(Gilt::place_bid(RuntimeOrigin::signed(1), 5, 2), Error::<Test>::BidTooLow);
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 15, 2));
assert_eq!(Balances::reserved_balance(1), 45);
assert_ok!(Gilt::place_bid(Origin::signed(1), 25, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 25, 2));
assert_eq!(Balances::reserved_balance(1), 60);
assert_noop!(Gilt::place_bid(Origin::signed(1), 10, 2), Error::<Test>::BidTooLow);
assert_noop!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2), Error::<Test>::BidTooLow);
assert_eq!(
Queues::<Test>::get(2),
vec![
@@ -111,11 +117,11 @@ fn place_bid_queuing_works() {
fn place_bid_fails_when_queue_full() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(3), 10, 2));
assert_noop!(Gilt::place_bid(Origin::signed(4), 10, 2), Error::<Test>::BidTooLow);
assert_ok!(Gilt::place_bid(Origin::signed(4), 10, 3));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(3), 10, 2));
assert_noop!(Gilt::place_bid(RuntimeOrigin::signed(4), 10, 2), Error::<Test>::BidTooLow);
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(4), 10, 3));
});
}
@@ -123,11 +129,11 @@ fn place_bid_fails_when_queue_full() {
fn multiple_place_bids_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 3));
assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 3));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 10, 2));
assert_eq!(Balances::reserved_balance(1), 40);
assert_eq!(Balances::reserved_balance(2), 10);
@@ -149,9 +155,9 @@ fn multiple_place_bids_works() {
fn retract_single_item_queue_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::retract_bid(Origin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::retract_bid(RuntimeOrigin::signed(1), 10, 1));
assert_eq!(Balances::reserved_balance(1), 10);
assert_eq!(Queues::<Test>::get(1), vec![]);
@@ -164,12 +170,12 @@ fn retract_single_item_queue_works() {
fn retract_with_other_and_duplicate_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(Origin::signed(2), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 10, 2));
assert_ok!(Gilt::retract_bid(Origin::signed(1), 10, 2));
assert_ok!(Gilt::retract_bid(RuntimeOrigin::signed(1), 10, 2));
assert_eq!(Balances::reserved_balance(1), 20);
assert_eq!(Balances::reserved_balance(2), 10);
assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 10, who: 1 },]);
@@ -185,11 +191,11 @@ fn retract_with_other_and_duplicate_works() {
fn retract_non_existent_item_fails() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_noop!(Gilt::retract_bid(Origin::signed(1), 10, 1), Error::<Test>::NotFound);
assert_ok!(Gilt::place_bid(Origin::signed(1), 10, 1));
assert_noop!(Gilt::retract_bid(Origin::signed(1), 20, 1), Error::<Test>::NotFound);
assert_noop!(Gilt::retract_bid(Origin::signed(1), 10, 2), Error::<Test>::NotFound);
assert_noop!(Gilt::retract_bid(Origin::signed(2), 10, 1), Error::<Test>::NotFound);
assert_noop!(Gilt::retract_bid(RuntimeOrigin::signed(1), 10, 1), Error::<Test>::NotFound);
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 10, 1));
assert_noop!(Gilt::retract_bid(RuntimeOrigin::signed(1), 20, 1), Error::<Test>::NotFound);
assert_noop!(Gilt::retract_bid(RuntimeOrigin::signed(1), 10, 2), Error::<Test>::NotFound);
assert_noop!(Gilt::retract_bid(RuntimeOrigin::signed(2), 10, 1), Error::<Test>::NotFound);
});
}
@@ -197,8 +203,8 @@ fn retract_non_existent_item_fails() {
fn basic_enlarge_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 40, 2));
Gilt::enlarge(40, 2);
// Takes 2/2, then stopped because it reaches its max amount
@@ -228,10 +234,10 @@ fn basic_enlarge_works() {
fn enlarge_respects_bids_limit() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
assert_ok!(Gilt::place_bid(Origin::signed(3), 40, 2));
assert_ok!(Gilt::place_bid(Origin::signed(4), 40, 3));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 40, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(3), 40, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(4), 40, 3));
Gilt::enlarge(100, 2);
// Should have taken 4/3 and 2/2, then stopped because it's only allowed 2.
@@ -269,7 +275,7 @@ fn enlarge_respects_bids_limit() {
fn enlarge_respects_amount_limit_and_will_split() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 80, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 80, 1));
Gilt::enlarge(40, 2);
// Takes 2/2, then stopped because it reaches its max amount
@@ -296,14 +302,14 @@ fn enlarge_respects_amount_limit_and_will_split() {
fn basic_thaw_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
Gilt::enlarge(40, 1);
run_to_block(3);
assert_noop!(Gilt::thaw(Origin::signed(1), 0), Error::<Test>::NotExpired);
assert_noop!(Gilt::thaw(RuntimeOrigin::signed(1), 0), Error::<Test>::NotExpired);
run_to_block(4);
assert_noop!(Gilt::thaw(Origin::signed(1), 1), Error::<Test>::Unknown);
assert_noop!(Gilt::thaw(Origin::signed(2), 0), Error::<Test>::NotOwner);
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_noop!(Gilt::thaw(RuntimeOrigin::signed(1), 1), Error::<Test>::Unknown);
assert_noop!(Gilt::thaw(RuntimeOrigin::signed(2), 0), Error::<Test>::NotOwner);
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
assert_eq!(
ActiveTotal::<Test>::get(),
@@ -324,7 +330,7 @@ fn basic_thaw_works() {
fn thaw_when_issuance_higher_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 100, 1));
Gilt::enlarge(100, 1);
// Everybody else's balances goes up by 50%
@@ -333,7 +339,7 @@ fn thaw_when_issuance_higher_works() {
Balances::make_free_balance_be(&4, 150);
run_to_block(4);
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
assert_eq!(Balances::free_balance(1), 150);
assert_eq!(Balances::reserved_balance(1), 0);
@@ -347,16 +353,16 @@ fn thaw_with_ignored_issuance_works() {
// Give account zero some balance.
Balances::make_free_balance_be(&0, 200);
assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 100, 1));
Gilt::enlarge(100, 1);
// Account zero transfers 50 into everyone else's accounts.
assert_ok!(Balances::transfer(Origin::signed(0), 2, 50));
assert_ok!(Balances::transfer(Origin::signed(0), 3, 50));
assert_ok!(Balances::transfer(Origin::signed(0), 4, 50));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(0), 2, 50));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(0), 3, 50));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(0), 4, 50));
run_to_block(4);
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
// Account zero changes have been ignored.
assert_eq!(Balances::free_balance(1), 150);
@@ -368,7 +374,7 @@ fn thaw_with_ignored_issuance_works() {
fn thaw_when_issuance_lower_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 100, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 100, 1));
Gilt::enlarge(100, 1);
// Everybody else's balances goes down by 25%
@@ -377,7 +383,7 @@ fn thaw_when_issuance_lower_works() {
Balances::make_free_balance_be(&4, 75);
run_to_block(4);
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
assert_eq!(Balances::free_balance(1), 75);
assert_eq!(Balances::reserved_balance(1), 0);
@@ -388,9 +394,9 @@ fn thaw_when_issuance_lower_works() {
fn multiple_thaws_works() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 60, 1));
assert_ok!(Gilt::place_bid(Origin::signed(2), 50, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 60, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 50, 1));
Gilt::enlarge(200, 3);
// Double everyone's free balances.
@@ -399,9 +405,9 @@ fn multiple_thaws_works() {
Balances::make_free_balance_be(&4, 200);
run_to_block(4);
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_ok!(Gilt::thaw(Origin::signed(1), 1));
assert_ok!(Gilt::thaw(Origin::signed(2), 2));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 1));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(2), 2));
assert_eq!(Balances::free_balance(1), 200);
assert_eq!(Balances::free_balance(2), 200);
@@ -412,9 +418,9 @@ fn multiple_thaws_works() {
fn multiple_thaws_works_in_alternative_thaw_order() {
new_test_ext().execute_with(|| {
run_to_block(1);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 60, 1));
assert_ok!(Gilt::place_bid(Origin::signed(2), 50, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 60, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 50, 1));
Gilt::enlarge(200, 3);
// Double everyone's free balances.
@@ -423,9 +429,9 @@ fn multiple_thaws_works_in_alternative_thaw_order() {
Balances::make_free_balance_be(&4, 200);
run_to_block(4);
assert_ok!(Gilt::thaw(Origin::signed(2), 2));
assert_ok!(Gilt::thaw(Origin::signed(1), 1));
assert_ok!(Gilt::thaw(Origin::signed(1), 0));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(2), 2));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 1));
assert_ok!(Gilt::thaw(RuntimeOrigin::signed(1), 0));
assert_eq!(Balances::free_balance(1), 200);
assert_eq!(Balances::free_balance(2), 200);
@@ -436,12 +442,12 @@ fn multiple_thaws_works_in_alternative_thaw_order() {
fn enlargement_to_target_works() {
new_test_ext().execute_with(|| {
run_to_block(2);
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(Origin::signed(1), 40, 2));
assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 2));
assert_ok!(Gilt::place_bid(Origin::signed(2), 40, 3));
assert_ok!(Gilt::place_bid(Origin::signed(3), 40, 3));
assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(40)));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 1));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(1), 40, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 40, 2));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(2), 40, 3));
assert_ok!(Gilt::place_bid(RuntimeOrigin::signed(3), 40, 3));
assert_ok!(Gilt::set_target(RuntimeOrigin::signed(1), Perquintill::from_percent(40)));
run_to_block(3);
assert_eq!(Queues::<Test>::get(1), vec![GiltBid { amount: 40, who: 1 },]);
@@ -540,7 +546,7 @@ fn enlargement_to_target_works() {
);
// Set target a bit higher to use up the remaining bid.
assert_ok!(Gilt::set_target(Origin::signed(1), Perquintill::from_percent(60)));
assert_ok!(Gilt::set_target(RuntimeOrigin::signed(1), Perquintill::from_percent(60)));
run_to_block(10);
// Two new gilts should have been issued to 1 & 2 for 40 each & duration of 2.