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

Merge pull request #11550 from filecoin-project/fix/worker-multipart-post-err

Browse Source 
fix: wdpost: fix vanilla proof indexes
This commit is contained in:
Andrew Jackson (Ajax) 2024-01-04 07:42:30 -08:00 committed by GitHub
commit 1d75af73fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/sealer/worker_local.go
View File

@ -664,7 +664,7 @@ func (l *LocalWorker) GenerateWindowPoStAdv(ctx context.Context, ppt abi.Registe
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(len(sectors)) wg.Add(len(sectors))
vproofs := make([][]byte, 0, len(sectors)) vproofs := make([][]byte, len(sectors))
for i, s := range sectors { for i, s := range sectors {
if l.challengeThrottle != nil { if l.challengeThrottle != nil {
@ -702,8 +702,7 @@ func (l *LocalWorker) GenerateWindowPoStAdv(ctx context.Context, ppt abi.Registe
return return
} }
//vproofs[i] = vanilla // todo substitutes?? vproofs[i] = vanilla
vproofs = append(vproofs, vanilla)
}(i, s) }(i, s)
} }
wg.Wait() wg.Wait()
@ -717,6 +716,22 @@ func (l *LocalWorker) GenerateWindowPoStAdv(ctx context.Context, ppt abi.Registe
return storiface.WindowPoStResult{Skipped: skipped}, nil return storiface.WindowPoStResult{Skipped: skipped}, nil
} }
// compact skipped sectors
var skippedSoFar int
for i := range vproofs {
if len(vproofs[i]) == 0 {
skippedSoFar++
continue
}
if skippedSoFar > 0 {
vproofs[i-skippedSoFar] = vproofs[i]
}
}
vproofs = vproofs[:len(vproofs)-skippedSoFar]
// compute the PoSt!
res, err := sb.GenerateWindowPoStWithVanilla(ctx, ppt, mid, randomness, vproofs, partitionIdx) res, err := sb.GenerateWindowPoStWithVanilla(ctx, ppt, mid, randomness, vproofs, partitionIdx)
r := storiface.WindowPoStResult{ r := storiface.WindowPoStResult{
PoStProofs: res, PoStProofs: res,