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

max/min incorrect

Browse Source
This commit is contained in:
Gav Wood 2016-06-24 11:40:25 +02:00
parent bca9e1f31a
commit 84ce5af2b0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/ethereum/ethash.rs
View File

@ -122,7 +122,7 @@ impl Engine for Ethash {
} else if gas_limit > gas_ceil_target { } else if gas_limit > gas_ceil_target {
max(gas_ceil_target, gas_limit - gas_limit / bound_divisor + 1.into()) max(gas_ceil_target, gas_limit - gas_limit / bound_divisor + 1.into())
} else { } else {
max(gas_ceil_target, min(gas_ceil_target,
max(gas_floor_target, max(gas_floor_target,
gas_limit - gas_limit / bound_divisor + 1.into() + gas_limit - gas_limit / bound_divisor + 1.into() +
(header.gas_used * 6.into() / 5.into()) / bound_divisor)) (header.gas_used * 6.into() / 5.into()) / bound_divisor))