gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wrong rpc inflation rate (#14063)

Browse Source 
* Fix wrong inflation calculation in rpc

* Reorder

* Fix test
This commit is contained in:
Ryo Onodera
2020-12-11 16:42:39 +09:00
committed by GitHub
parent 4fba7e6865
commit 09bd412b13
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/rpc.rs
View File

@ -347,13 +347,12 @@ impl JsonRpcRequestProcessor {
let bank = self.bank(None);
let epoch = bank.epoch();
let inflation = bank.inflation();
let year =
(bank.epoch_schedule().get_last_slot_in_epoch(epoch)) as f64 / bank.slots_per_year();
let slot_in_year = bank.slot_in_year_for_inflation();
RpcInflationRate {
total: inflation.total(year),
validator: inflation.validator(year),
foundation: inflation.foundation(year),
total: inflation.total(slot_in_year),
validator: inflation.validator(slot_in_year),
foundation: inflation.foundation(slot_in_year),
epoch,
}
}
@ -3307,12 +3306,11 @@ pub mod tests {
};
let inflation = bank.inflation();
let epoch = bank.epoch();
let year =
(bank.epoch_schedule().get_last_slot_in_epoch(epoch)) as f64 / bank.slots_per_year();
let slot_in_year = bank.slot_in_year_for_inflation();
let expected_inflation_rate = RpcInflationRate {
total: inflation.total(year),
validator: inflation.validator(year),
foundation: inflation.foundation(year),
total: inflation.total(slot_in_year),
validator: inflation.validator(slot_in_year),
foundation: inflation.foundation(slot_in_year),
epoch,
};
assert_eq!(inflation_rate, expected_inflation_rate);