diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
| commit | e13c6739804604849c7e43d27b073e68fba58191 (patch) | |
| tree | b3471931b63210a4d107875dffd6572bcd96239e /core | |
| parent | 965c9babe336cfa8d5c740d5356acbc5f9ba4a72 (diff) | |
| parent | 5f35e6778f10d9e2c6418beff7ed201be80448c4 (diff) | |
| download | dexon-e13c6739804604849c7e43d27b073e68fba58191.tar dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.gz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.bz2 dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.lz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.xz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.zst dexon-e13c6739804604849c7e43d27b073e68fba58191.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_manager.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 060805428..4bf9e9aed 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -38,8 +38,8 @@ func CalcDifficulty(block, parent *types.Header) *big.Int { diff.Sub(parent.Difficulty, adjust) } - if diff.Cmp(GenesisDiff) < 0 { - return GenesisDiff + if diff.Cmp(min) < 0 { + return min } return diff |