diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 21:16:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:16:05 +0800 |
| commit | 4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (patch) | |
| tree | 0f64daac335200ce6fd45d6ee9f62dabc0fb1887 /core/chain_makers.go | |
| parent | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (diff) | |
| parent | 009d2fe2d650b1a92e28f0decbf5f7fa628779e9 (diff) | |
| download | go-tangerine-1.8.24.tar go-tangerine-1.8.24.tar.gz go-tangerine-1.8.24.tar.bz2 go-tangerine-1.8.24.tar.lz go-tangerine-1.8.24.tar.xz go-tangerine-1.8.24.tar.zst go-tangerine-1.8.24.zip | |
Merge pull request #19370 from karalabe/geth-1.8.24v1.8.24
Backport PR for the v1.8.24 maintenance release
Diffstat (limited to 'core/chain_makers.go')
| -rw-r--r-- | core/chain_makers.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/chain_makers.go b/core/chain_makers.go index 0b5a3d184..d563d85ee 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -149,12 +149,12 @@ func (b *BlockGen) PrevBlock(index int) *types.Block { // associated difficulty. It's useful to test scenarios where forking is not // tied to chain length directly. func (b *BlockGen) OffsetTime(seconds int64) { - b.header.Time.Add(b.header.Time, big.NewInt(seconds)) - if b.header.Time.Cmp(b.parent.Header().Time) <= 0 { + b.header.Time += uint64(seconds) + if b.header.Time <= b.parent.Header().Time { panic("block time out of range") } chainreader := &fakeChainReader{config: b.config} - b.header.Difficulty = b.engine.CalcDifficulty(chainreader, b.header.Time.Uint64(), b.parent.Header()) + b.header.Difficulty = b.engine.CalcDifficulty(chainreader, b.header.Time, b.parent.Header()) } // GenerateChain creates a chain of n blocks. The first block's @@ -225,20 +225,20 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse } func makeHeader(chain consensus.ChainReader, parent *types.Block, state *state.StateDB, engine consensus.Engine) *types.Header { - var time *big.Int - if parent.Time() == nil { - time = big.NewInt(10) + var time uint64 + if parent.Time() == 0 { + time = 10 } else { - time = new(big.Int).Add(parent.Time(), big.NewInt(10)) // block time is fixed at 10 seconds + time = parent.Time() + 10 // block time is fixed at 10 seconds } return &types.Header{ Root: state.IntermediateRoot(chain.Config().IsEIP158(parent.Number())), ParentHash: parent.Hash(), Coinbase: parent.Coinbase(), - Difficulty: engine.CalcDifficulty(chain, time.Uint64(), &types.Header{ + Difficulty: engine.CalcDifficulty(chain, time, &types.Header{ Number: parent.Number(), - Time: new(big.Int).Sub(time, big.NewInt(10)), + Time: time - 10, Difficulty: parent.Difficulty(), UncleHash: parent.UncleHash(), }), |