From e01691d2b54b9fd5bb2ffe04c0ce58048006a659 Mon Sep 17 00:00:00 2001 From: Derek May <32908855+riddlez666@users.noreply.github.com> Date: Fri, 16 Mar 2018 16:07:01 -0700 Subject: [PATCH] Typos and console cleanup. --- consensus/ethash/consensus.go | 72 +++++++++++++++++------------------ params/config.go | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 4c0c42c1a7..a9e4afa4c7 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -359,45 +359,45 @@ func calcDifficultyEGEM(time uint64, parent *types.Header) *big.Int { bigParentTime.Set(parent.Time) if (parent.Number.Cmp(egemRewardSwitchBlockEra2) == 1) { - if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { - diff.Add(parent.Difficulty, adjust0) - } else { - diff.Sub(parent.Difficulty, adjust0) - } - if diff.Cmp(params.MinimumDifficulty) < 0 { - diff.Set(params.MinimumDifficulty) - } - return diff + if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { + diff.Add(parent.Difficulty, adjust0) + } else { + diff.Sub(parent.Difficulty, adjust0) + } + if diff.Cmp(params.MinimumDifficulty) < 0 { + diff.Set(params.MinimumDifficulty) + } + return diff } else if (parent.Number.Cmp(egemRewardSwitchBlockEra1) == 1) { - if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { - diff.Add(parent.Difficulty, adjust1) - } else { - diff.Sub(parent.Difficulty, adjust1) - } - if diff.Cmp(params.MinimumDifficulty) < 0 { - diff.Set(params.MinimumDifficulty) - } - return diff + if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { + diff.Add(parent.Difficulty, adjust1) + } else { + diff.Sub(parent.Difficulty, adjust1) + } + if diff.Cmp(params.MinimumDifficulty) < 0 { + diff.Set(params.MinimumDifficulty) + } + return diff } else if (parent.Number.Cmp(egemRewardSwitchBlockEra0) == 1) { - if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { - diff.Add(parent.Difficulty, adjust2) - } else { - diff.Sub(parent.Difficulty, adjust2) - } - if diff.Cmp(params.MinimumDifficulty) < 0 { - diff.Set(params.MinimumDifficulty) - } - return diff + if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { + diff.Add(parent.Difficulty, adjust2) + } else { + diff.Sub(parent.Difficulty, adjust2) + } + if diff.Cmp(params.MinimumDifficulty) < 0 { + diff.Set(params.MinimumDifficulty) + } + return diff } else { - if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { - diff.Add(parent.Difficulty, adjust3) - } else { - diff.Sub(parent.Difficulty, adjust3) - } - if diff.Cmp(params.MinimumDifficulty) < 0 { - diff.Set(params.MinimumDifficulty) - } - return diff + if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { + diff.Add(parent.Difficulty, adjust3) + } else { + diff.Sub(parent.Difficulty, adjust3) + } + if diff.Cmp(params.MinimumDifficulty) < 0 { + diff.Set(params.MinimumDifficulty) + } + return diff } } diff --git a/params/config.go b/params/config.go index b7471dad5d..029ef46ce9 100644 --- a/params/config.go +++ b/params/config.go @@ -154,7 +154,7 @@ func (c *ChainConfig) String() string { default: engine = "unknown" } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Engine: %v}", + return fmt.Sprintf("{ChainID: %v EIP150: %v EIP155: %v EIP158: %v }", c.ChainId, c.HomesteadBlock, c.DAOForkBlock,