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

Resolve proof type when creating new sector

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-06-23 16:07:54 -04:00
parent eb17b2f371
commit 7f75cd71da
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
garbage.go
View File

@ -6,7 +6,6 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
nr "github.com/filecoin-project/storage-fsm/lib/nullreader" nr "github.com/filecoin-project/storage-fsm/lib/nullreader"
@ -46,12 +45,6 @@ func (m *Sealing) PledgeSector() error {
size := abi.PaddedPieceSize(m.sealer.SectorSize()).Unpadded() size := abi.PaddedPieceSize(m.sealer.SectorSize()).Unpadded()
rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize())
if err != nil {
log.Error(err)
return
}
sid, err := m.sc.Next() sid, err := m.sc.Next()
if err != nil { if err != nil {
log.Errorf("%+v", err) log.Errorf("%+v", err)
@ -77,7 +70,7 @@ func (m *Sealing) PledgeSector() error {
} }
} }
if err := m.newSectorCC(sid, rt, ps); err != nil { if err := m.newSectorCC(sid, ps); err != nil {
log.Errorf("%+v", err) log.Errorf("%+v", err)
return return
} }

21
sealing.go
View File

@ -117,12 +117,7 @@ func (m *Sealing) SealPiece(ctx context.Context, size abi.UnpaddedPieceSize, r i
return xerrors.Errorf("adding piece to sector: %w", err) return xerrors.Errorf("adding piece to sector: %w", err)
} }
rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize()) return m.newSector(sectorID, []Piece{
if err != nil {
return xerrors.Errorf("bad sector size: %w", err)
}
return m.newSector(sectorID, rt, []Piece{
{ {
Piece: ppi, Piece: ppi,
DealInfo: &d, DealInfo: &d,
@ -140,7 +135,12 @@ func (m *Sealing) StartPacking(sectorID abi.SectorNumber) error {
} }
// newSector accepts a slice of pieces which will have deals associated with // newSector accepts a slice of pieces which will have deals associated with
func (m *Sealing) newSector(sid abi.SectorNumber, rt abi.RegisteredSealProof, pieces []Piece) error { func (m *Sealing) newSector(sid abi.SectorNumber, pieces []Piece) error {
rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize())
if err != nil {
return xerrors.Errorf("bad sector size: %w", err)
}
log.Infof("Creating sector %d", sid) log.Infof("Creating sector %d", sid)
return m.sectors.Send(uint64(sid), SectorStart{ return m.sectors.Send(uint64(sid), SectorStart{
ID: sid, ID: sid,
@ -150,7 +150,12 @@ func (m *Sealing) newSector(sid abi.SectorNumber, rt abi.RegisteredSealProof, pi
} }
// newSectorCC accepts a slice of pieces with no deal (junk data) // newSectorCC accepts a slice of pieces with no deal (junk data)
func (m *Sealing) newSectorCC(sid abi.SectorNumber, rt abi.RegisteredSealProof, pieces []Piece) error { func (m *Sealing) newSectorCC(sid abi.SectorNumber, pieces []Piece) error {
rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize())
if err != nil {
return xerrors.Errorf("bad sector size: %w", err)
}
log.Infof("Creating CC sector %d", sid) log.Infof("Creating CC sector %d", sid)
return m.sectors.Send(uint64(sid), SectorStartCC{ return m.sectors.Send(uint64(sid), SectorStartCC{
ID: sid, ID: sid,