From eb17b2f3717a0b1af73cae7126a02f4719323cb6 Mon Sep 17 00:00:00 2001
From: Aayush Rajasekaran <arajasek94@gmail.com>
Date: Tue, 23 Jun 2020 15:59:57 -0400
Subject: [PATCH] Add a state for waiting on deals, and events for new deals
 and start packing

---
 fsm.go          |  7 ++++++-
 fsm_events.go   | 12 ++++++++++++
 sealing.go      |  5 +++++
 sector_state.go |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/fsm.go b/fsm.go
index 228f36c1c..ff9ca4d9b 100644
--- a/fsm.go
+++ b/fsm.go
@@ -35,9 +35,14 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
 	// Sealing
 
 	UndefinedSectorState: planOne(
-		on(SectorStart{}, Packing),
+		on(SectorStart{}, Empty),
 		on(SectorStartCC{}, Packing),
 	),
+	Empty: planOne(on(SectorAddPiece{}, WaitDeals)),
+	WaitDeals: planOne(
+		on(SectorAddPiece{}, WaitDeals),
+		on(SectorStartPacking{}, Packing),
+	),
 	Packing: planOne(on(SectorPacked{}, PreCommit1)),
 	PreCommit1: planOne(
 		on(SectorPreCommit1{}, PreCommit2),
diff --git a/fsm_events.go b/fsm_events.go
index cdd62867e..a128f7c36 100644
--- a/fsm_events.go
+++ b/fsm_events.go
@@ -71,6 +71,18 @@ func (evt SectorStartCC) apply(state *SectorInfo) {
 	state.SectorType = evt.SectorType
 }
 
+type SectorAddPiece struct {
+	NewPiece Piece
+}
+
+func (evt SectorAddPiece) apply(state *SectorInfo) {
+	state.Pieces = append(state.Pieces, evt.NewPiece)
+}
+
+type SectorStartPacking struct{}
+
+func (evt SectorStartPacking) apply(*SectorInfo) {}
+
 type SectorPacked struct{ FillerPieces []abi.PieceInfo }
 
 func (evt SectorPacked) apply(state *SectorInfo) {
diff --git a/sealing.go b/sealing.go
index 2e13e8206..e4124a16b 100644
--- a/sealing.go
+++ b/sealing.go
@@ -134,6 +134,11 @@ func (m *Sealing) Remove(ctx context.Context, sid abi.SectorNumber) error {
 	return m.sectors.Send(uint64(sid), SectorRemove{})
 }
 
+func (m *Sealing) StartPacking(sectorID abi.SectorNumber) error {
+	log.Infof("Starting packing sector %d", sectorID)
+	return m.sectors.Send(uint64(sectorID), SectorStartPacking{})
+}
+
 // 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 {
 	log.Infof("Creating sector %d", sid)
diff --git a/sector_state.go b/sector_state.go
index 63058cd6c..f2801c9fc 100644
--- a/sector_state.go
+++ b/sector_state.go
@@ -7,6 +7,7 @@ const (
 
 	// happy path
 	Empty          SectorState = "Empty"
+	WaitDeals      SectorState = "WaitDeals"     // waiting for more pieces (deals) to be added to the sector
 	Packing        SectorState = "Packing"       // sector not in sealStore, and not on chain
 	PreCommit1     SectorState = "PreCommit1"    // do PreCommit1
 	PreCommit2     SectorState = "PreCommit2"    // do PreCommit1