Skip to content

Commit 92a53c9

Browse files
committed
consensus/ethash: rename utcNow to unixNow
1 parent 91af7b8 commit 92a53c9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

consensus/ethash/consensus.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,16 @@ func (ethash *Ethash) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
126126

127127
// Create a task channel and spawn the verifiers
128128
var (
129-
inputs = make(chan int)
130-
done = make(chan int, workers)
131-
errors = make([]error, len(headers))
132-
abort = make(chan struct{})
133-
utcNow = time.Now().Unix()
129+
inputs = make(chan int)
130+
done = make(chan int, workers)
131+
errors = make([]error, len(headers))
132+
abort = make(chan struct{})
133+
unixNow = time.Now().Unix()
134134
)
135135
for i := 0; i < workers; i++ {
136136
go func() {
137137
for index := range inputs {
138-
errors[index] = ethash.verifyHeaderWorker(chain, headers, seals, index, utcNow)
138+
errors[index] = ethash.verifyHeaderWorker(chain, headers, seals, index, unixNow)
139139
done <- index
140140
}
141141
}()
@@ -171,7 +171,7 @@ func (ethash *Ethash) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
171171
return abort, errorsOut
172172
}
173173

174-
func (ethash *Ethash) verifyHeaderWorker(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool, index int, utcNow int64) error {
174+
func (ethash *Ethash) verifyHeaderWorker(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool, index int, unixNow int64) error {
175175
var parent *types.Header
176176
if index == 0 {
177177
parent = chain.GetHeader(headers[0].ParentHash, headers[0].Number.Uint64()-1)
@@ -181,7 +181,7 @@ func (ethash *Ethash) verifyHeaderWorker(chain consensus.ChainHeaderReader, head
181181
if parent == nil {
182182
return consensus.ErrUnknownAncestor
183183
}
184-
return ethash.verifyHeader(chain, headers[index], parent, false, seals[index], utcNow)
184+
return ethash.verifyHeader(chain, headers[index], parent, false, seals[index], unixNow)
185185
}
186186

187187
// VerifyUncles verifies that the given block's uncles conform to the consensus
@@ -242,14 +242,14 @@ func (ethash *Ethash) VerifyUncles(chain consensus.ChainReader, block *types.Blo
242242
// verifyHeader checks whether a header conforms to the consensus rules of the
243243
// stock Ethereum ethash engine.
244244
// See YP section 4.3.4. "Block Header Validity"
245-
func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header, uncle bool, seal bool, utcNow int64) error {
245+
func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header, uncle bool, seal bool, unixNow int64) error {
246246
// Ensure that the header's extra-data section is of a reasonable size
247247
if uint64(len(header.Extra)) > params.MaximumExtraDataSize {
248248
return fmt.Errorf("extra-data too long: %d > %d", len(header.Extra), params.MaximumExtraDataSize)
249249
}
250250
// Verify the header's timestamp
251251
if !uncle {
252-
if header.Time > uint64(utcNow+allowedFutureBlockTimeSeconds) {
252+
if header.Time > uint64(unixNow+allowedFutureBlockTimeSeconds) {
253253
return consensus.ErrFutureBlock
254254
}
255255
}

0 commit comments

Comments
 (0)