cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #307 from filecoin-project/fix/sleep-until-timestamp

Browse Source 
don't sleep if no block mined
This commit is contained in:
Łukasz Magiera 2019-10-09 11:24:41 +02:00 committed by GitHub
commit e7b49403b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
miner/miner.go
View File

@ -145,6 +145,8 @@ func (m *Miner) mine(ctx context.Context) {
return return
default: default:
} }
// Sleep a small amount in order to wait for other blocks to arrive
if err := m.waitFunc(ctx); err != nil { if err := m.waitFunc(ctx); err != nil {
log.Error(err) log.Error(err)
return return
@ -164,15 +166,18 @@ func (m *Miner) mine(ctx context.Context) {
continue continue
} }
if b != nil {
btime := time.Unix(int64(b.Header.Timestamp), 0) btime := time.Unix(int64(b.Header.Timestamp), 0)
if time.Now().Before(btime) { if time.Now().Before(btime) {
time.Sleep(time.Until(btime)) time.Sleep(time.Until(btime))
} }
if b != nil {
if err := m.api.ChainSubmitBlock(ctx, b); err != nil { if err := m.api.ChainSubmitBlock(ctx, b); err != nil {
log.Errorf("failed to submit newly mined block: %s", err) log.Errorf("failed to submit newly mined block: %s", err)
} }
} else {
nextRound := time.Unix(int64(base.ts.MinTimestamp()+uint64(build.BlockDelay*len(base.tickets))), 0)
time.Sleep(time.Until(nextRound))
} }
} }
} }