mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 11:07:56 +00:00
Stored call in multisig (#6319)
* Stored call in multisig * Docs. * Benchmarks. * Fix * Update frame/multisig/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * patch benchmarks * Minor grumbles. * Update as_multi weight * Fixes and refactoring. * Split out threshold=1 and opaquify Call. * Compiles, tests pass, weights are broken * Update benchmarks, add working tests * Add benchmark to threshold 1, add event too * suppress warning for now * @xlc improvment nit * Update weight and tests * Test for weight check * Fix line width * one more line width error * Apply suggestions from code review Co-authored-by: Alexander Popiak <alexander.popiak@parity.io> * fix merge * more @apopiak feedback * Multisig handles no preimage * Optimize return weight after dispatch * Error on failed deposit. Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
This commit is contained in:
Gavin Wood
@@ -156,24 +156,79 @@ fn multisig_deposit_is_taken_and_returned() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, call.clone()));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15));
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
let data = call.encode();
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
|
||||
assert_eq!(Balances::free_balance(1), 2);
|
||||
assert_eq!(Balances::reserved_balance(1), 3);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), call));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
|
||||
assert_eq!(Balances::free_balance(1), 5);
|
||||
assert_eq!(Balances::reserved_balance(1), 0);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
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));
|
||||
|
||||
let call = Call::Balances(BalancesCall::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), 2, vec![2, 3], None, data, true, 0));
|
||||
assert_eq!(Balances::free_balance(1), 0);
|
||||
assert_eq!(Balances::reserved_balance(1), 5);
|
||||
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash, call_weight));
|
||||
assert_eq!(Balances::free_balance(1), 5);
|
||||
assert_eq!(Balances::reserved_balance(1), 0);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
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));
|
||||
|
||||
let call = Call::Balances(BalancesCall::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), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_eq!(Balances::free_balance(1), 1);
|
||||
assert_eq!(Balances::reserved_balance(1), 4);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), data, true, 0));
|
||||
assert_eq!(Balances::free_balance(2), 3);
|
||||
assert_eq!(Balances::reserved_balance(2), 2);
|
||||
assert_eq!(Balances::free_balance(1), 1);
|
||||
assert_eq!(Balances::reserved_balance(1), 4);
|
||||
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), hash, call_weight));
|
||||
assert_eq!(Balances::free_balance(1), 5);
|
||||
assert_eq!(Balances::reserved_balance(1), 0);
|
||||
assert_eq!(Balances::free_balance(2), 5);
|
||||
assert_eq!(Balances::reserved_balance(2), 0);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cancel_multisig_returns_deposit() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone()));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone()));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_eq!(Balances::free_balance(1), 6);
|
||||
assert_eq!(Balances::reserved_balance(1), 4);
|
||||
assert_ok!(
|
||||
@@ -192,28 +247,48 @@ fn timepoint_checking_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
|
||||
assert_noop!(
|
||||
Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone()),
|
||||
Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone(), 0),
|
||||
Error::<Test>::UnexpectedTimepoint,
|
||||
);
|
||||
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash, 0));
|
||||
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, call.clone()),
|
||||
Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, call.clone(), false, 0),
|
||||
Error::<Test>::NoTimepoint,
|
||||
);
|
||||
let later = Timepoint { index: 1, .. now() };
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(later), call.clone()),
|
||||
Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(later), call.clone(), false, 0),
|
||||
Error::<Test>::WrongTimepoint,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
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));
|
||||
|
||||
let call = Call::Balances(BalancesCall::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), 2, vec![2, 3], None, data, true, 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash, call_weight));
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multisig_2_of_3_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
@@ -222,12 +297,14 @@ fn multisig_2_of_3_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash));
|
||||
let call = Call::Balances(BalancesCall::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), 2, vec![2, 3], None, hash, 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), call));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
}
|
||||
@@ -240,13 +317,15 @@ fn multisig_3_of_3_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone()));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone()));
|
||||
let call = Call::Balances(BalancesCall::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), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), call));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), data, false, call_weight));
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
}
|
||||
@@ -254,10 +333,10 @@ fn multisig_3_of_3_works() {
|
||||
#[test]
|
||||
fn cancel_multisig_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone()));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone()));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_noop!(
|
||||
Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash.clone()),
|
||||
Error::<Test>::NotOwner,
|
||||
@@ -268,6 +347,40 @@ fn cancel_multisig_works() {
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cancel_multisig_with_call_storage_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 3, vec![2, 3], None, call, true, 0));
|
||||
assert_eq!(Balances::free_balance(1), 4);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_noop!(
|
||||
Multisig::cancel_as_multi(Origin::signed(2), 3, vec![1, 3], now(), hash.clone()),
|
||||
Error::<Test>::NotOwner,
|
||||
);
|
||||
assert_ok!(
|
||||
Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash.clone()),
|
||||
);
|
||||
assert_eq!(Balances::free_balance(1), 10);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cancel_multisig_with_alt_call_storage_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_eq!(Balances::free_balance(1), 6);
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), call, true, 0));
|
||||
assert_eq!(Balances::free_balance(2), 8);
|
||||
assert_ok!(Multisig::cancel_as_multi(Origin::signed(1), 3, vec![2, 3], now(), hash));
|
||||
assert_eq!(Balances::free_balance(1), 10);
|
||||
assert_eq!(Balances::free_balance(2), 10);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multisig_2_of_3_as_multi_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
@@ -276,11 +389,13 @@ fn multisig_2_of_3_as_multi_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, call.clone()));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15));
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
let data = call.encode();
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), call));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, call_weight));
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
}
|
||||
@@ -293,13 +408,17 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call1 = Box::new(Call::Balances(BalancesCall::transfer(6, 10)));
|
||||
let call2 = Box::new(Call::Balances(BalancesCall::transfer(7, 5)));
|
||||
let call1 = Call::Balances(BalancesCall::transfer(6, 10));
|
||||
let call1_weight = call1.get_dispatch_info().weight;
|
||||
let data1 = call1.encode();
|
||||
let call2 = Call::Balances(BalancesCall::transfer(7, 5));
|
||||
let call2_weight = call2.get_dispatch_info().weight;
|
||||
let data2 = call2.encode();
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, call1.clone()));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, call2.clone()));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), call2));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), call1));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data1.clone(), false, 0));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], None, data2.clone(), false, 0));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data1, false, call1_weight));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data2, false, call2_weight));
|
||||
|
||||
assert_eq!(Balances::free_balance(6), 10);
|
||||
assert_eq!(Balances::free_balance(7), 5);
|
||||
@@ -314,26 +433,33 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 10)));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, call.clone()));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), call.clone()));
|
||||
let call = Call::Balances(BalancesCall::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), 2, vec![2, 3], None, data.clone(), false, 0));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data.clone(), false, call_weight));
|
||||
assert_eq!(Balances::free_balance(multi), 5);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, call.clone()));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), call.clone()));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), data.clone(), false, call_weight));
|
||||
|
||||
let err = DispatchError::from(BalancesError::<Test, _>::InsufficientBalance).stripped();
|
||||
expect_event(RawEvent::MultisigExecuted(3, now(), multi, call.using_encoded(blake2_256), Err(err)));
|
||||
expect_event(RawEvent::MultisigExecuted(3, now(), multi, hash, Err(err)));
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn zero_threshold_fails() {
|
||||
fn minimum_threshold_check_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(1), 0, vec![2], None, call),
|
||||
Error::<Test>::ZeroThreshold,
|
||||
Multisig::as_multi(Origin::signed(1), 0, vec![2], None, call.clone(), false, 0),
|
||||
Error::<Test>::MinimumThreshold,
|
||||
);
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(1), 1, vec![2], None, call.clone(), false, 0),
|
||||
Error::<Test>::MinimumThreshold,
|
||||
);
|
||||
});
|
||||
}
|
||||
@@ -341,9 +467,9 @@ fn zero_threshold_fails() {
|
||||
#[test]
|
||||
fn too_many_signatories_fails() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(1), 2, vec![2, 3, 4], None, call.clone()),
|
||||
Multisig::as_multi(Origin::signed(1), 2, vec![2, 3, 4], None, call.clone(), false, 0),
|
||||
Error::<Test>::TooManySignatories,
|
||||
);
|
||||
});
|
||||
@@ -352,17 +478,17 @@ fn too_many_signatories_fails() {
|
||||
#[test]
|
||||
fn duplicate_approvals_are_ignored() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash.clone()));
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_noop!(
|
||||
Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], Some(now()), hash.clone()),
|
||||
Multisig::approve_as_multi(Origin::signed(1), 2, vec![2, 3], Some(now()), hash.clone(), 0),
|
||||
Error::<Test>::AlreadyApproved,
|
||||
);
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone()));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_noop!(
|
||||
Multisig::approve_as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), hash.clone()),
|
||||
Error::<Test>::NoApprovalsNeeded,
|
||||
Multisig::approve_as_multi(Origin::signed(3), 2, vec![1, 2], Some(now()), hash.clone(), 0),
|
||||
Error::<Test>::AlreadyApproved,
|
||||
);
|
||||
});
|
||||
}
|
||||
@@ -375,17 +501,18 @@ fn multisig_1_of_3_works() {
|
||||
assert_ok!(Balances::transfer(Origin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(Origin::signed(3), multi, 5));
|
||||
|
||||
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
let hash = call.using_encoded(blake2_256);
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15)).encode();
|
||||
let hash = blake2_256(&call);
|
||||
assert_noop!(
|
||||
Multisig::approve_as_multi(Origin::signed(1), 1, vec![2, 3], None, hash.clone()),
|
||||
Error::<Test>::NoApprovalsNeeded,
|
||||
Multisig::approve_as_multi(Origin::signed(1), 1, vec![2, 3], None, hash.clone(), 0),
|
||||
Error::<Test>::MinimumThreshold,
|
||||
);
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(4), 1, vec![2, 3], None, call.clone()),
|
||||
BalancesError::<Test, _>::InsufficientBalance,
|
||||
Multisig::as_multi(Origin::signed(1), 1, vec![2, 3], None, call.clone(), false, 0),
|
||||
Error::<Test>::MinimumThreshold,
|
||||
);
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 1, vec![2, 3], None, call));
|
||||
let boxed_call = Box::new(Call::Balances(BalancesCall::transfer(6, 15)));
|
||||
assert_ok!(Multisig::as_multi_threshold_1(Origin::signed(1), vec![2, 3], boxed_call));
|
||||
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
@@ -396,8 +523,52 @@ fn multisig_filters() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::System(frame_system::Call::set_code(vec![])));
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(1), 1, vec![2], None, call.clone()),
|
||||
Multisig::as_multi_threshold_1(Origin::signed(1), vec![2], call.clone()),
|
||||
DispatchError::BadOrigin,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
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));
|
||||
|
||||
let call = Call::Balances(BalancesCall::transfer(6, 15));
|
||||
let data = call.encode();
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(1), 2, vec![2, 3], None, data.clone(), false, 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_noop!(
|
||||
Multisig::as_multi(Origin::signed(2), 2, vec![1, 3], Some(now()), data, false, 0),
|
||||
Error::<Test>::WeightTooLow,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multisig_handles_no_preimage_after_all_approve() {
|
||||
// This test checks the situation where everyone approves a multi-sig, but no-one provides the call data.
|
||||
// In the end, any of the multisig callers can approve again with the call data and 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));
|
||||
|
||||
let call = Call::Balances(BalancesCall::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), 3, vec![2, 3], None, hash.clone(), 0));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(2), 3, vec![1, 3], Some(now()), hash.clone(), 0));
|
||||
assert_ok!(Multisig::approve_as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), hash.clone(), 0));
|
||||
assert_eq!(Balances::free_balance(6), 0);
|
||||
|
||||
assert_ok!(Multisig::as_multi(Origin::signed(3), 3, vec![1, 2], Some(now()), data, false, call_weight));
|
||||
assert_eq!(Balances::free_balance(6), 15);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user