forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Typos and console cleanup.

Browse source
This commit is contained in:
Derek May 2018-03-16 16:07:01 -07:00
parent 7bcec51f8b
commit e01691d2b5
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
consensus/ethash/consensus.go
View file

@ -359,45 +359,45 @@ func calcDifficultyEGEM(time uint64, parent *types.Header) *big.Int {
bigParentTime.Set(parent.Time) bigParentTime.Set(parent.Time)
if (parent.Number.Cmp(egemRewardSwitchBlockEra2) == 1) { if (parent.Number.Cmp(egemRewardSwitchBlockEra2) == 1) {
if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 {
diff.Add(parent.Difficulty, adjust0) diff.Add(parent.Difficulty, adjust0)
} else { } else {
diff.Sub(parent.Difficulty, adjust0) diff.Sub(parent.Difficulty, adjust0)
} }
if diff.Cmp(params.MinimumDifficulty) < 0 { if diff.Cmp(params.MinimumDifficulty) < 0 {
diff.Set(params.MinimumDifficulty) diff.Set(params.MinimumDifficulty)
} }
return diff return diff
} else if (parent.Number.Cmp(egemRewardSwitchBlockEra1) == 1) { } else if (parent.Number.Cmp(egemRewardSwitchBlockEra1) == 1) {
if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 {
diff.Add(parent.Difficulty, adjust1) diff.Add(parent.Difficulty, adjust1)
} else { } else {
diff.Sub(parent.Difficulty, adjust1) diff.Sub(parent.Difficulty, adjust1)
} }
if diff.Cmp(params.MinimumDifficulty) < 0 { if diff.Cmp(params.MinimumDifficulty) < 0 {
diff.Set(params.MinimumDifficulty) diff.Set(params.MinimumDifficulty)
} }
return diff return diff
} else if (parent.Number.Cmp(egemRewardSwitchBlockEra0) == 1) { } else if (parent.Number.Cmp(egemRewardSwitchBlockEra0) == 1) {
if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 {
diff.Add(parent.Difficulty, adjust2) diff.Add(parent.Difficulty, adjust2)
} else { } else {
diff.Sub(parent.Difficulty, adjust2) diff.Sub(parent.Difficulty, adjust2)
} }
if diff.Cmp(params.MinimumDifficulty) < 0 { if diff.Cmp(params.MinimumDifficulty) < 0 {
diff.Set(params.MinimumDifficulty) diff.Set(params.MinimumDifficulty)
} }
return diff return diff
} else { } else {
if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 { if bigTime.Sub(bigTime, bigParentTime).Cmp(params.DurationLimit) < 0 {
diff.Add(parent.Difficulty, adjust3) diff.Add(parent.Difficulty, adjust3)
} else { } else {
diff.Sub(parent.Difficulty, adjust3) diff.Sub(parent.Difficulty, adjust3)
} }
if diff.Cmp(params.MinimumDifficulty) < 0 { if diff.Cmp(params.MinimumDifficulty) < 0 {
diff.Set(params.MinimumDifficulty) diff.Set(params.MinimumDifficulty)
} }
return diff return diff
} }
} }

2
params/config.go
View file

@ -154,7 +154,7 @@ func (c *ChainConfig) String() string {
default: default:
engine = "unknown" 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.ChainId,
c.HomesteadBlock, c.HomesteadBlock,
c.DAOForkBlock, c.DAOForkBlock,