pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 09:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

BREAKING: Rename Origin (#12258)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/multisig/src/tests.rs
+103 -99
View File
@@ -57,7 +57,7 @@ impl frame_system::Config for Test {
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
type Origin = Origin;
type RuntimeOrigin = RuntimeOrigin;
type Index = u64;
type BlockNumber = u64;
type Hash = H256;
@@ -138,15 +138,15 @@ fn call_transfer(dest: u64, value: u64) -> RuntimeCall {
fn multisig_deposit_is_taken_and_returned() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -158,7 +158,7 @@ fn multisig_deposit_is_taken_and_returned() {
assert_eq!(Balances::reserved_balance(1), 3);
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -175,16 +175,16 @@ fn multisig_deposit_is_taken_and_returned() {
fn multisig_deposit_is_taken_and_returned_with_call_storage() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -196,7 +196,7 @@ fn multisig_deposit_is_taken_and_returned_with_call_storage() {
assert_eq!(Balances::reserved_balance(1), 5);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -212,9 +212,9 @@ fn multisig_deposit_is_taken_and_returned_with_call_storage() {
fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
@@ -222,7 +222,7 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
let hash = blake2_256(&data);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -233,7 +233,7 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
assert_eq!(Balances::reserved_balance(1), 4);
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -247,7 +247,7 @@ fn multisig_deposit_is_taken_and_returned_with_alt_call_storage() {
assert_eq!(Balances::reserved_balance(1), 4);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
3,
vec![1, 2],
Some(now()),
@@ -267,7 +267,7 @@ fn cancel_multisig_returns_deposit() {
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -275,7 +275,7 @@ fn cancel_multisig_returns_deposit() {
Weight::zero()
));
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -284,7 +284,7 @@ fn cancel_multisig_returns_deposit() {
));
assert_eq!(Balances::free_balance(1), 6);
assert_eq!(Balances::reserved_balance(1), 4);
assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash));
assert_ok!(Multisig::cancel_as_multi(RuntimeOrigin::signed(1), 3, vec![2, 3], now(), hash));
assert_eq!(Balances::free_balance(1), 10);
assert_eq!(Balances::reserved_balance(1), 0);
});
@@ -294,16 +294,16 @@ fn cancel_multisig_returns_deposit() {
fn timepoint_checking_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_noop!(
Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -314,7 +314,7 @@ fn timepoint_checking_works() {
);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -324,7 +324,7 @@ fn timepoint_checking_works() {
assert_noop!(
Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
None,
@@ -337,7 +337,7 @@ fn timepoint_checking_works() {
let later = Timepoint { index: 1, ..now() };
assert_noop!(
Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(later),
@@ -354,16 +354,16 @@ fn timepoint_checking_works() {
fn multisig_2_of_3_works_with_call_storing() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -374,7 +374,7 @@ fn multisig_2_of_3_works_with_call_storing() {
assert_eq!(Balances::free_balance(6), 0);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -389,16 +389,16 @@ fn multisig_2_of_3_works_with_call_storing() {
fn multisig_2_of_3_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -408,7 +408,7 @@ fn multisig_2_of_3_works() {
assert_eq!(Balances::free_balance(6), 0);
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -424,16 +424,16 @@ fn multisig_2_of_3_works() {
fn multisig_3_of_3_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -441,7 +441,7 @@ fn multisig_3_of_3_works() {
Weight::zero()
));
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -451,7 +451,7 @@ fn multisig_3_of_3_works() {
assert_eq!(Balances::free_balance(6), 0);
assert_ok!(Multisig::as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
3,
vec![1, 2],
Some(now()),
@@ -469,7 +469,7 @@ fn cancel_multisig_works() {
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -477,7 +477,7 @@ fn cancel_multisig_works() {
Weight::zero()
));
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -485,10 +485,10 @@ fn cancel_multisig_works() {
Weight::zero()
));
assert_noop!(
Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash),
Multisig::cancel_as_multi(RuntimeOrigin::signed(2), 3, vec![1, 3], now(), hash),
Error::<Test>::NotOwner,
);
assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash),);
assert_ok!(Multisig::cancel_as_multi(RuntimeOrigin::signed(1), 3, vec![2, 3], now(), hash),);
});
}
@@ -498,7 +498,7 @@ fn cancel_multisig_with_call_storage_works() {
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -508,7 +508,7 @@ fn cancel_multisig_with_call_storage_works() {
));
assert_eq!(Balances::free_balance(1), 4);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -516,10 +516,10 @@ fn cancel_multisig_with_call_storage_works() {
Weight::zero()
));
assert_noop!(
Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash),
Multisig::cancel_as_multi(RuntimeOrigin::signed(2), 3, vec![1, 3], now(), hash),
Error::<Test>::NotOwner,
);
assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash),);
assert_ok!(Multisig::cancel_as_multi(RuntimeOrigin::signed(1), 3, vec![2, 3], now(), hash),);
assert_eq!(Balances::free_balance(1), 10);
});
}
@@ -530,7 +530,7 @@ fn cancel_multisig_with_alt_call_storage_works() {
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -539,7 +539,7 @@ fn cancel_multisig_with_alt_call_storage_works() {
));
assert_eq!(Balances::free_balance(1), 6);
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -548,7 +548,7 @@ fn cancel_multisig_with_alt_call_storage_works() {
Weight::zero()
));
assert_eq!(Balances::free_balance(2), 8);
assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash));
assert_ok!(Multisig::cancel_as_multi(RuntimeOrigin::signed(1), 3, vec![2, 3], now(), hash));
assert_eq!(Balances::free_balance(1), 10);
assert_eq!(Balances::free_balance(2), 10);
});
@@ -558,15 +558,15 @@ fn cancel_multisig_with_alt_call_storage_works() {
fn multisig_2_of_3_as_multi_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -577,7 +577,7 @@ fn multisig_2_of_3_as_multi_works() {
assert_eq!(Balances::free_balance(6), 0);
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -593,9 +593,9 @@ fn multisig_2_of_3_as_multi_works() {
fn multisig_2_of_3_as_multi_with_many_calls_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call1 = call_transfer(6, 10);
let call1_weight = call1.get_dispatch_info().weight;
@@ -605,7 +605,7 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
let data2 = call2.encode();
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -614,7 +614,7 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
Weight::zero()
));
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
None,
@@ -623,7 +623,7 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
Weight::zero()
));
assert_ok!(Multisig::as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
2,
vec![1, 2],
Some(now()),
@@ -632,7 +632,7 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
call1_weight
));
assert_ok!(Multisig::as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
2,
vec![1, 2],
Some(now()),
@@ -650,16 +650,16 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
fn multisig_2_of_3_cannot_reissue_same_call() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 10);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -668,7 +668,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
Weight::zero()
));
assert_ok!(Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -679,7 +679,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
assert_eq!(Balances::free_balance(multi), 5);
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -688,7 +688,7 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
Weight::zero()
));
assert_ok!(Multisig::as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
2,
vec![1, 2],
Some(now()),
@@ -717,7 +717,7 @@ fn minimum_threshold_check_works() {
let call = call_transfer(6, 15).encode();
assert_noop!(
Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
0,
vec![2],
None,
@@ -729,7 +729,7 @@ fn minimum_threshold_check_works() {
);
assert_noop!(
Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
1,
vec![2],
None,
@@ -748,7 +748,7 @@ fn too_many_signatories_fails() {
let call = call_transfer(6, 15).encode();
assert_noop!(
Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3, 4],
None,
@@ -767,7 +767,7 @@ fn duplicate_approvals_are_ignored() {
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -776,7 +776,7 @@ fn duplicate_approvals_are_ignored() {
));
assert_noop!(
Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
Some(now()),
@@ -786,7 +786,7 @@ fn duplicate_approvals_are_ignored() {
Error::<Test>::AlreadyApproved,
);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -795,7 +795,7 @@ fn duplicate_approvals_are_ignored() {
));
assert_noop!(
Multisig::approve_as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
2,
vec![1, 2],
Some(now()),
@@ -811,15 +811,15 @@ fn duplicate_approvals_are_ignored() {
fn multisig_1_of_3_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 1);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15).encode();
let hash = blake2_256(&call);
assert_noop!(
Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
1,
vec![2, 3],
None,
@@ -830,7 +830,7 @@ fn multisig_1_of_3_works() {
);
assert_noop!(
Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
1,
vec![2, 3],
None,
@@ -841,7 +841,11 @@ fn multisig_1_of_3_works() {
Error::<Test>::MinimumThreshold,
);
let boxed_call = Box::new(call_transfer(6, 15));
assert_ok!(Multisig::as_multi_threshold_1(Origin::signed(1), vec![2, 3], boxed_call));
assert_ok!(Multisig::as_multi_threshold_1(
RuntimeOrigin::signed(1),
vec![2, 3],
boxed_call
));
assert_eq!(Balances::free_balance(6), 15);
});
@@ -852,7 +856,7 @@ fn multisig_filters() {
new_test_ext().execute_with(|| {
let call = Box::new(RuntimeCall::System(frame_system::Call::set_code { code: vec![] }));
assert_noop!(
Multisig::as_multi_threshold_1(Origin::signed(1), vec![2], call.clone()),
Multisig::as_multi_threshold_1(RuntimeOrigin::signed(1), vec![2], call.clone()),
DispatchError::from(frame_system::Error::<Test>::CallFiltered),
);
});
@@ -862,14 +866,14 @@ fn multisig_filters() {
fn weight_check_works() {
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let data = call.encode();
assert_ok!(Multisig::as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
2,
vec![2, 3],
None,
@@ -881,7 +885,7 @@ fn weight_check_works() {
assert_noop!(
Multisig::as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
2,
vec![1, 3],
Some(now()),
@@ -901,16 +905,16 @@ fn multisig_handles_no_preimage_after_all_approve() {
// the call will go through.
new_test_ext().execute_with(|| {
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
assert_ok!(Balances::transfer(Origin::signed(1), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
let call = call_transfer(6, 15);
let call_weight = call.get_dispatch_info().weight;
let data = call.encode();
let hash = blake2_256(&data);
assert_ok!(Multisig::approve_as_multi(
Origin::signed(1),
RuntimeOrigin::signed(1),
3,
vec![2, 3],
None,
@@ -918,7 +922,7 @@ fn multisig_handles_no_preimage_after_all_approve() {
Weight::zero()
));
assert_ok!(Multisig::approve_as_multi(
Origin::signed(2),
RuntimeOrigin::signed(2),
3,
vec![1, 3],
Some(now()),
@@ -926,7 +930,7 @@ fn multisig_handles_no_preimage_after_all_approve() {
Weight::zero()
));
assert_ok!(Multisig::approve_as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
3,
vec![1, 2],
Some(now()),
@@ -936,7 +940,7 @@ fn multisig_handles_no_preimage_after_all_approve() {
assert_eq!(Balances::free_balance(6), 0);
assert_ok!(Multisig::as_multi(
Origin::signed(3),
RuntimeOrigin::signed(3),
3,
vec![1, 2],
Some(now()),