grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify code.

Browse Source
This commit is contained in:
Gav Wood 2016-01-28 20:46:33 +01:00
parent a2f4090c05
commit e8b1af27cd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ethereum/ethash.rs
View File

@ -185,14 +185,12 @@ impl Ethash {
else { else {
trace!(target: "ethash", "Calculating difficulty parent.difficulty={}, header.timestamp={}, parent.timestamp={}", parent.difficulty, header.timestamp, parent.timestamp); trace!(target: "ethash", "Calculating difficulty parent.difficulty={}, header.timestamp={}, parent.timestamp={}", parent.difficulty, header.timestamp, parent.timestamp);
//block_diff = parent_diff + parent_diff // 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99) //block_diff = parent_diff + parent_diff // 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99)
if header.timestamp >= parent.timestamp + 10 {
let diff_inc = (header.timestamp - parent.timestamp) / 10; let diff_inc = (header.timestamp - parent.timestamp) / 10;
if diff_inc <= 1 {
parent.difficulty + parent.difficulty / From::from(2048) * From::from(1 - diff_inc)
} else {
parent.difficulty - parent.difficulty / From::from(2048) * From::from(min(diff_inc - 1, 99)) parent.difficulty - parent.difficulty / From::from(2048) * From::from(min(diff_inc - 1, 99))
} }
else {
let minus_diff_inc = if parent.timestamp > header.timestamp {(parent.timestamp - header.timestamp) / 10} else {0};
parent.difficulty + parent.difficulty / From::from(2048) * From::from(minus_diff_inc + 1)
}
}; };
target = max(min_difficulty, target); target = max(min_difficulty, target);
let period = ((parent.number + 1) / EXP_DIFF_PERIOD) as usize; let period = ((parent.number + 1) / EXP_DIFF_PERIOD) as usize;