Skip to content

avoid reiterate all the pools #305

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

Merged
merged 2 commits into from
Oct 21, 2020
Merged

avoid reiterate all the pools #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06e10a3
avoid reiterate all the pools
xlc Oct 21, 2020
58635ba
fix test
xlc Oct 21, 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: 3 additions & 1 deletion rewards/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,14 @@ decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {

fn on_initialize(now: T::BlockNumber) -> Weight {
let mut count = 0;
T::Handler::accumulate_reward(now, | pool, reward_to_accumulate | {
if !reward_to_accumulate.is_zero() {
count += 1;
Pools::<T>::mutate(pool, | pool_info | pool_info.total_rewards = pool_info.total_rewards.saturating_add(reward_to_accumulate));
}
});
T::WeightInfo::on_initialize(Pools::<T>::iter().count() as u32)
T::WeightInfo::on_initialize(count)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rewards/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl RewardHandler<AccountId, BlockNumber> for Handler {

fn accumulate_reward(
now: BlockNumber,
callback: impl Fn(Self::PoolId, Self::Balance),
mut callback: impl FnMut(Self::PoolId, Self::Balance),
) -> Vec<(Self::CurrencyId, Self::Balance)> {
if now % 2 == 0 {
let mut total_accumulated_rewards = 0;
Expand Down
2 changes: 1 addition & 1 deletion traits/src/rewards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub trait RewardHandler<AccountId, BlockNumber> {
/// Accumulate rewards
fn accumulate_reward(
now: BlockNumber,
callback: impl Fn(Self::PoolId, Self::Balance),
callback: impl FnMut(Self::PoolId, Self::Balance),
) -> Vec<(Self::CurrencyId, Self::Balance)>;

/// Payout the reward to `who`
Expand Down