pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 22:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Balances Pallet for decl_error! (#4405)

Browse Source 
* Update balances for `decl_error!`

* Update for new `decl_error`

* Fix staking tests

* Use `ok_or` over `match`
This commit is contained in:
Shawn Tabrizi
2019-12-20 00:23:20 +01:00
committed by GitHub
parent dfe87ec61e
commit 4fffe19c28
5 changed files with 120 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/staking/src/lib.rs
+1 -1
View File
@@ -784,7 +784,7 @@ decl_event!(
);
decl_error! {
/// Error for the stacking module.
/// Error for the staking module.
pub enum Error for Module<T: Trait> {
/// Not a controller account.
NotController,
substrate/frame/staking/src/tests.rs
+36 -6
View File
@@ -20,7 +20,11 @@ use super::*;
use mock::*;
use sp_runtime::{assert_eq_error_rate, traits::{OnInitialize, BadOrigin}};
use sp_staking::offence::OffenceDetails;
use frame_support::{assert_ok, assert_noop, traits::{Currency, ReservableCurrency}};
use frame_support::{
assert_ok, assert_noop,
traits::{Currency, ReservableCurrency},
dispatch::DispatchError,
};
use substrate_test_utils::assert_eq_uvec;
#[test]
@@ -32,7 +36,11 @@ fn force_unstake_works() {
// Cant transfer
assert_noop!(
Balances::transfer(Origin::signed(11), 1, 10),
"account liquidity restrictions prevent withdrawal"
DispatchError::Module {
index: 0,
error: 1,
message: Some("LiquidityRestrictions"),
}
);
// Force unstake requires root.
assert_noop!(Staking::force_unstake(Origin::signed(11), 11), BadOrigin);
@@ -326,7 +334,14 @@ fn staking_should_work() {
Some(StakingLedger { stash: 3, total: 1500, active: 1500, unlocking: vec![] })
);
// e.g. it cannot spend more than 500 that it has free from the total 2000
assert_noop!(Balances::reserve(&3, 501), "account liquidity restrictions prevent withdrawal");
assert_noop!(
Balances::reserve(&3, 501),
DispatchError::Module {
index: 0,
error: 1,
message: Some("LiquidityRestrictions"),
}
);
assert_ok!(Balances::reserve(&3, 409));
});
}
@@ -817,7 +832,11 @@ fn cannot_transfer_staked_balance() {
// Confirm account 11 cannot transfer as a result
assert_noop!(
Balances::transfer(Origin::signed(11), 20, 1),
"account liquidity restrictions prevent withdrawal",
DispatchError::Module {
index: 0,
error: 1,
message: Some("LiquidityRestrictions"),
}
);
// Give account 11 extra free balance
@@ -842,7 +861,11 @@ fn cannot_transfer_staked_balance_2() {
// Confirm account 21 can transfer at most 1000
assert_noop!(
Balances::transfer(Origin::signed(21), 20, 1001),
"account liquidity restrictions prevent withdrawal",
DispatchError::Module {
index: 0,
error: 1,
message: Some("LiquidityRestrictions"),
}
);
assert_ok!(Balances::transfer(Origin::signed(21), 20, 1000));
});
@@ -859,7 +882,14 @@ fn cannot_reserve_staked_balance() {
// Confirm account 11 (via controller 10) is totally staked
assert_eq!(Staking::stakers(&11).own, 1000);
// Confirm account 11 cannot transfer as a result
assert_noop!(Balances::reserve(&11, 1), "account liquidity restrictions prevent withdrawal");
assert_noop!(
Balances::reserve(&11, 1),
DispatchError::Module {
index: 0,
error: 1,
message: Some("LiquidityRestrictions"),
}
);
// Give account 11 extra free balance
let _ = Balances::make_free_balance_be(&11, 10000);