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

Remove dead commented code

Browse Source
This commit is contained in:
Łukasz Magiera 2020-05-29 19:40:49 +02:00
parent 8b9dbc22e5
commit 9e7eb3feef
1 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ffiwrapper/sealer_cgo.go
View File

@ -385,17 +385,6 @@ func (sb *Sealer) SealPreCommit1(ctx context.Context, sector abi.SectorID, ticke
return nil, xerrors.Errorf("aggregated piece sizes don't match sector size: %d != %d (%d)", sum, ussize, int64(ussize-sum)) return nil, xerrors.Errorf("aggregated piece sizes don't match sector size: %d != %d (%d)", sum, ussize, int64(ussize-sum))
} }
//staged := filepath.Join(paths.Cache, "staged")
/*if err := sb.rewriteAsPadded(paths.Unsealed, staged); err != nil {
return nil, xerrors.Errorf("rewriting sector as padded: %w", err)
}*/
/*defer func() {
if err := os.Remove(staged); err != nil {
log.Warnf("Removing staged sector file(%v): %s", sector, err)
}
}()
*/
// TODO: context cancellation respect // TODO: context cancellation respect
p1o, err := ffi.SealPreCommitPhase1( p1o, err := ffi.SealPreCommitPhase1(
sb.sealProofType, sb.sealProofType,
@ -413,53 +402,6 @@ func (sb *Sealer) SealPreCommit1(ctx context.Context, sector abi.SectorID, ticke
return p1o, nil return p1o, nil
} }
/*
func (sb *Sealer) rewriteAsPadded(unsealed string, staged string) error {
maxPieceSize := abi.PaddedPieceSize(sb.ssize).Unpadded()
pf, err := openPartialFile(maxPieceSize, unsealed)
if err != nil {
return xerrors.Errorf("opening unsealed file: %w", err)
}
upr, err := pf.Reader(0, maxPieceSize)
if err != nil {
pf.Close()
return err
}
st, err := os.OpenFile(staged, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil {
pf.Close()
return xerrors.Errorf("openning staged file: %w", err)
}
// OPTIMIZATION: upr is a file, so it could be passed straight to
// WriteWithAlignment IF it wouldn't care about the trailer
lupr, werr, err := ToReadableFile(io.LimitReader(upr, int64(maxPieceSize)), int64(maxPieceSize))
if err != nil {
return err
}
_, _, _, err = ffi.WriteWithAlignment(sb.sealProofType, lupr, maxPieceSize, st, nil)
if err != nil {
pf.Close()
st.Close()
return xerrors.Errorf("write with alignment: %w", err)
}
if err := st.Close(); err != nil {
pf.Close()
return err
}
if err := pf.Close(); err != nil {
return err
}
return werr()
}*/
func (sb *Sealer) SealPreCommit2(ctx context.Context, sector abi.SectorID, phase1Out storage.PreCommit1Out) (storage.SectorCids, error) { func (sb *Sealer) SealPreCommit2(ctx context.Context, sector abi.SectorID, phase1Out storage.PreCommit1Out) (storage.SectorCids, error) {
paths, done, err := sb.sectors.AcquireSector(ctx, sector, stores.FTSealed|stores.FTCache, 0, true) paths, done, err := sb.sectors.AcquireSector(ctx, sector, stores.FTSealed|stores.FTCache, 0, true)
if err != nil { if err != nil {