Wip fixing a thing

api/test/deals.go

@@ -12,7 +12,6 @@ import (
 	logging "github.com/ipfs/go-log"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/address"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/impl"
@@ -21,8 +20,6 @@ import (
 func TestDealFlow(t *testing.T, b APIBuilder) {
 	os.Setenv("BELLMAN_NO_GPU", "1")
 
-	build.SectorSizes = []uint64{1024}
-
 	logging.SetAllLoggers(logging.LevelInfo)
 	ctx := context.Background()
 	n, sn := b(t, 1, []int{0})
@@ -39,7 +36,7 @@ func TestDealFlow(t *testing.T, b APIBuilder) {
 	}
 	time.Sleep(time.Second)
 
-	r := io.LimitReader(rand.New(rand.NewSource(17)), 257)
+	r := io.LimitReader(rand.New(rand.NewSource(17)), 9000000)
 	fcid, err := client.ClientImportLocal(ctx, r)
 	if err != nil {
 		t.Fatal(err)
@@ -65,7 +62,7 @@ func TestDealFlow(t *testing.T, b APIBuilder) {
 			}
 		}
 	}()
-	deal, err := client.ClientStartDeal(ctx, fcid, maddr, types.NewInt(400), 100)
+	deal, err := client.ClientStartDeal(ctx, fcid, maddr, types.NewInt(40000000), 100)
 	if err != nil {
 		t.Fatal(err)
 	}

lib/sectorbuilder/files.go

@@ -19,13 +19,13 @@ func (sb *SectorBuilder) stagedSectorPath(sectorID uint64) string {
 }
 
 func (sb *SectorBuilder) stagedSectorFile(sectorID uint64) (*os.File, error) {
-	return os.OpenFile(sb.stagedSectorPath(sectorID), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+	return os.OpenFile(sb.stagedSectorPath(sectorID), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
 }
 
 func (sb *SectorBuilder) sealedSectorPath(sectorID uint64) (string, error) {
 	path := filepath.Join(sb.sealedDir, sb.sectorName(sectorID))
 
-	e, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0644)
+	e, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
 	if err != nil {
 		return "", err
 	}

lib/sectorbuilder/sectorbuilder.go

@@ -182,17 +182,33 @@ func (sb *SectorBuilder) SealPreCommit(sectorID uint64, ticket SealTicket, piece
 		return RawSealPreCommitOutput{}, err
 	}
 
-	return sectorbuilder.StandaloneSealPreCommit(
+	var sum uint64
+	for _, piece := range pieces {
+		sum += piece.Size
+	}
+	ussize := UserBytesForSectorSize(sb.ssize)
+	if sum != ussize {
+		return RawSealPreCommitOutput{}, xerrors.Errorf("aggregated piece sizes don't match sector size: %d != %d (%d)", sum, ussize, int64(ussize - sum))
+	}
+
+	stagedPath := sb.stagedSectorPath(sectorID)
+
+	rspco, err := sectorbuilder.StandaloneSealPreCommit(
 		sb.ssize,
 		PoRepProofPartitions,
 		cacheDir,
-		sb.stagedSectorPath(sectorID),
+		stagedPath,
 		sealedPath,
 		sectorID,
 		addressToProverID(sb.Miner),
 		ticket.TicketBytes,
 		pieces,
 	)
+	if err != nil {
+		return RawSealPreCommitOutput{}, xerrors.Errorf("presealing sector %d (%s): %w", sectorID, stagedPath, err)
+	}
+
+	return rspco, nil
 }
 
 func (sb *SectorBuilder) SealCommit(sectorID uint64, ticket SealTicket, seed SealSeed, pieces []PublicPieceInfo, pieceKeys []string, rspco RawSealPreCommitOutput) (proof []byte, err error) {

storage/garbage.go

@@ -18,6 +18,10 @@ import (
 
 // TODO: expected sector ID
 func (m *Miner) storeGarbage(ctx context.Context, sectorID uint64, sizes ...uint64) ([]Piece, error) {
+	if len(sizes) == 0 {
+		return nil, nil
+	}
+
 	deals := make([]actors.StorageDeal, len(sizes))
 	for i, size := range sizes {
 		commP, err := sectorbuilder.GeneratePieceCommitment(io.LimitReader(rand.New(rand.NewSource(42)), int64(size)), size)