Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 12:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix spurious change added by git merge

Browse source
This commit is contained in:
Ignotus Peverell 2019-01-14 20:19:17 +00:00
parent 224a26faed
commit 6bb611a2f0
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/consensus.rs
View file

@ -62,7 +62,7 @@ pub const COINBASE_MATURITY: u64 = DAY_HEIGHT;
/// function of block height (time). Starts at 90% losing a percent /// function of block height (time). Starts at 90% losing a percent
/// approximately every week. Represented as an integer between 0 and 100. /// approximately every week. Represented as an integer between 0 and 100.
pub fn secondary_pow_ratio(height: u64) -> u64 { pub fn secondary_pow_ratio(height: u64) -> u64 {
90u64.saturating_add(height / (2 * YEAR_HEIGHT / 90)) 90u64.saturating_sub(height / (2 * YEAR_HEIGHT / 90))
} }
/// The AR scale damping factor to use. Dependent on block height /// The AR scale damping factor to use. Dependent on block height