From 6bb611a2f00e3bb7f7a06417971648e80cd8ff51 Mon Sep 17 00:00:00 2001 From: Ignotus Peverell Date: Mon, 14 Jan 2019 20:19:17 +0000 Subject: [PATCH] Fix spurious change added by git merge --- core/src/consensus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/consensus.rs b/core/src/consensus.rs index dc87f578b..a6d0ef841 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -62,7 +62,7 @@ pub const COINBASE_MATURITY: u64 = DAY_HEIGHT; /// function of block height (time). Starts at 90% losing a percent /// approximately every week. Represented as an integer between 0 and 100. 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