Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests for staking module #212

Merged
merged 11 commits into from
Jan 6, 2020
Merged

tests for staking module #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
110865a
fix nominating_and_rewards_should_work()
readlnh Dec 31, 2019
53f57ea
fix reward_destination_works() tests
readlnh Jan 2, 2020
0c88397
fix nominators_also_get_slashed tests
readlnh Jan 3, 2020
e58145e
add doc about bond_help_in_ring and bond_help_in_kton
readlnh Jan 3, 2020
cccd44f
fix validator_payment_prefs_work test
readlnh Jan 3, 2020
88362da
delete test that doesn't need
readlnh Jan 3, 2020
30bb581
change bond_extra_and_withdraw_unbonded_automatically_works(need fix)
readlnh Jan 3, 2020
71ecce6
split bond_extra_and_withdraw_unbonded_works test into two tests
readlnh Jan 4, 2020
ffd2577
add compute_power
readlnh Jan 4, 2020
9751511
slot_stake_is_least_staked_validator_and_exposure_defines_maximum_pun…
readlnh Jan 4, 2020
4fb160c
slashing_performed_according_exposure update(need discuss)
readlnh Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions srml/staking/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ impl<T: Trait> Module<T> {
ledger
}

// TODO: doc
// update the ledger while bonding ring and compute the kton should return
fn bond_helper_in_ring(
stash: &T::AccountId,
controller: &T::AccountId,
Expand Down Expand Up @@ -1217,7 +1217,7 @@ impl<T: Trait> Module<T> {
Self::update_ledger(&controller, &mut ledger, StakingBalances::RingBalance(value));
}

// TODO: doc
// update the ledger while bonding controller with kton
fn bond_helper_in_kton(
controller: &T::AccountId,
value: KtonBalance<T>,
Expand Down
13 changes: 13 additions & 0 deletions srml/staking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,19 @@ pub fn current_total_payout_for_duration(duration: u64) -> Balance {
).0
}

pub fn compute_power(ring_amount: u128, kton_amount: u128) -> Power {
fn calc_power<S: rstd::convert::TryInto<u128>>(active: S, pool: S) -> Power {
const HALF_POWER_COUNT: u128 = 1_000_000_000 / 2;

Perquintill::from_rational_approximation(
active.saturated_into::<Power>(),
pool.saturated_into::<Power>().max(1),
) * HALF_POWER_COUNT
}

calc_power(ring_amount, Staking::ring_pool()) + calc_power(kton_amount, Staking::kton_pool())
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate with power_of to some extend.

pub fn reward_all_elected() {
let rewards = <Module<Test>>::current_elected()
.iter()
Expand Down
Loading