more progress

2020-09-15 10:46:44 -07:00
parent 9dad38c9a5
commit 00c6397ec9
4 changed files with 109 additions and 93 deletions
@@ -698,97 +698,28 @@ func (a *StateAPI) StateSectorGetInfo(ctx context.Context, maddr address.Address
 	return stmgr.MinerSectorInfo(ctx, a.StateManager, maddr, n, ts)
 }

-type sectorPartitionCb func(store adt.Store, mas *miner.State, di uint64, pi uint64, part *miner.Partition) error
-
-func (a *StateAPI) sectorPartition(ctx context.Context, maddr address.Address, sectorNumber abi.SectorNumber, tsk types.TipSetKey, cb sectorPartitionCb) error {
-	return a.StateManager.WithParentStateTsk(tsk,
-		a.StateManager.WithActor(maddr,
-			a.StateManager.WithActorState(ctx, func(store adt.Store, mas *miner.State) error {
-				return a.StateManager.WithDeadlines(func(store adt.Store, deadlines *miner.Deadlines) error {
-					err := a.StateManager.WithEachDeadline(func(store adt.Store, di uint64, deadline *miner.Deadline) error {
-						return a.StateManager.WithEachPartition(func(store adt.Store, pi uint64, partition *miner.Partition) error {
-							set, err := partition.Sectors.IsSet(uint64(sectorNumber))
-							if err != nil {
-								return xerrors.Errorf("is set: %w", err)
-							}
-							if set {
-								if err := cb(store, mas, di, pi, partition); err != nil {
-									return err
-								}
-
-								return errBreakForeach
-							}
-							return nil
-						})(store, di, deadline)
-					})(store, deadlines)
-					if err == errBreakForeach {
-						err = nil
-					}
-					return err
-				})(store, mas)
-			})))
-}
-
 func (a *StateAPI) StateSectorExpiration(ctx context.Context, maddr address.Address, sectorNumber abi.SectorNumber, tsk types.TipSetKey) (*api.SectorExpiration, error) {
-	var onTimeEpoch, earlyEpoch abi.ChainEpoch
-
-	err := a.sectorPartition(ctx, maddr, sectorNumber, tsk, func(store adt.Store, mas *miner.State, di uint64, pi uint64, part *miner.Partition) error {
-		quant := mas.QuantSpecForDeadline(di)
-		expirations, err := miner.LoadExpirationQueue(store, part.ExpirationsEpochs, quant)
-		if err != nil {
-			return xerrors.Errorf("loading expiration queue: %w", err)
-		}
-
-		var eset miner.ExpirationSet
-		return expirations.Array.ForEach(&eset, func(epoch int64) error {
-			set, err := eset.OnTimeSectors.IsSet(uint64(sectorNumber))
-			if err != nil {
-				return xerrors.Errorf("checking if sector is in onTime set: %w", err)
-			}
-			if set {
-				onTimeEpoch = abi.ChainEpoch(epoch)
-			}
-
-			set, err = eset.EarlySectors.IsSet(uint64(sectorNumber))
-			if err != nil {
-				return xerrors.Errorf("checking if sector is in early set: %w", err)
-			}
-			if set {
-				earlyEpoch = abi.ChainEpoch(epoch)
-			}
-
-			return nil
-		})
-	})
+	act, err := a.StateManager.LoadActorTsk(ctx, maddr, tsk)
 	if err != nil {
 		return nil, err
 	}
-
-	if onTimeEpoch == 0 {
-		return nil, xerrors.Errorf("expiration for sector %d not found", sectorNumber)
+	mas, err := miner.Load(a.StateManager.ChainStore().Store(ctx), act)
+	if err != nil {
+		return nil, err
 	}
-
-	return &api.SectorExpiration{
-		OnTime: onTimeEpoch,
-		Early:  earlyEpoch,
-	}, nil
+	return mas.GetSectorExpiration(sectorNumber)
 }

 func (a *StateAPI) StateSectorPartition(ctx context.Context, maddr address.Address, sectorNumber abi.SectorNumber, tsk types.TipSetKey) (*api.SectorLocation, error) {
-	var found *api.SectorLocation
-
-	err := a.sectorPartition(ctx, maddr, sectorNumber, tsk, func(store adt.Store, mas *miner.State, di, pi uint64, partition *miner.Partition) error {
-		found = &api.SectorLocation{
-			Deadline:  di,
-			Partition: pi,
-		}
-		return errBreakForeach
-	})
+	act, err := a.StateManager.LoadActorTsk(ctx, maddr, tsk)
 	if err != nil {
 		return nil, err
 	}
-
-	return found, nil
+	mas, err := miner.Load(a.StateManager.ChainStore().Store(ctx), act)
+	if err != nil {
+		return nil, err
+	}
+	return mas.FindSector(sectorNumber)
 }

 func (a *StateAPI) StateListMessages(ctx context.Context, match *types.Message, tsk types.TipSetKey, toheight abi.ChainEpoch) ([]cid.Cid, error) {