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

Merge pull request #4559 from filecoin-project/fix/beyond-genesis

Browse Source 
Fix random test failures
This commit is contained in:
Łukasz Magiera 2020-10-23 19:52:10 +02:00 committed by GitHub
commit 8124fe98c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chain/sync.go
View File

@ -1396,6 +1396,11 @@ loop:
} }
base := blockSet[len(blockSet)-1] base := blockSet[len(blockSet)-1]
if base.Equals(known) {
blockSet = blockSet[:len(blockSet)-1]
base = blockSet[len(blockSet)-1]
}
if base.IsChildOf(known) { if base.IsChildOf(known) {
// common case: receiving blocks that are building on top of our best tipset // common case: receiving blocks that are building on top of our best tipset
return blockSet, nil return blockSet, nil

2
miner/miner.go
View File

@ -280,7 +280,7 @@ minerLoop:
m.minedBlockHeights.Add(blkKey, true) m.minedBlockHeights.Add(blkKey, true)
if err := m.api.SyncSubmitBlock(ctx, b); err != nil { if err := m.api.SyncSubmitBlock(ctx, b); err != nil {
log.Errorf("failed to submit newly mined block: %s", err) log.Errorf("failed to submit newly mined block: %+v", err)
} }
} else { } else {
base.NullRounds++ base.NullRounds++