Merge pull request #9454 from filecoin-project/gstuart/migration-test
test: Add invariance checks to v17 migration test
This commit is contained in:
Aayush Rajasekaran
GitHub
commit
8755c98894
@ -584,7 +584,7 @@ func fromV{{.v}}SectorOnChainInfo(v{{.v}} miner{{.v}}.SectorOnChainInfo) SectorO
|
||||
}
|
||||
|
||||
func fromV{{.v}}SectorPreCommitOnChainInfo(v{{.v}} miner{{.v}}.SectorPreCommitOnChainInfo) minertypes.SectorPreCommitOnChainInfo {
|
||||
return minertypes.SectorPreCommitOnChainInfo{
|
||||
{{if (le .v 8)}}return minertypes.SectorPreCommitOnChainInfo{
|
||||
Info: minertypes.SectorPreCommitInfo{
|
||||
SealProof: v{{.v}}.Info.SealProof,
|
||||
SectorNumber: v{{.v}}.Info.SectorNumber,
|
||||
@ -596,7 +596,7 @@ func fromV{{.v}}SectorPreCommitOnChainInfo(v{{.v}} miner{{.v}}.SectorPreCommitOn
|
||||
},
|
||||
PreCommitDeposit: v{{.v}}.PreCommitDeposit,
|
||||
PreCommitEpoch: v{{.v}}.PreCommitEpoch,
|
||||
}
|
||||
}{{else}}return v{{.v}}{{end}}
|
||||
}
|
||||
|
||||
func (s *state{{.v}}) GetState() interface{} {
|
||||
|
||||
@ -546,19 +546,7 @@ func fromV9SectorOnChainInfo(v9 miner9.SectorOnChainInfo) SectorOnChainInfo {
|
||||
}
|
||||
|
||||
func fromV9SectorPreCommitOnChainInfo(v9 miner9.SectorPreCommitOnChainInfo) minertypes.SectorPreCommitOnChainInfo {
|
||||
return minertypes.SectorPreCommitOnChainInfo{
|
||||
Info: minertypes.SectorPreCommitInfo{
|
||||
SealProof: v9.Info.SealProof,
|
||||
SectorNumber: v9.Info.SectorNumber,
|
||||
SealedCID: v9.Info.SealedCID,
|
||||
SealRandEpoch: v9.Info.SealRandEpoch,
|
||||
DealIDs: v9.Info.DealIDs,
|
||||
Expiration: v9.Info.Expiration,
|
||||
UnsealedCid: nil,
|
||||
},
|
||||
PreCommitDeposit: v9.PreCommitDeposit,
|
||||
PreCommitEpoch: v9.PreCommitEpoch,
|
||||
}
|
||||
return v9
|
||||
}
|
||||
|
||||
func (s *state9) GetState() interface{} {
|
||||
|
||||
@ -8,15 +8,29 @@ import (
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
"github.com/urfave/cli/v2"
|
||||
cbg "github.com/whyrusleeping/cbor-gen"
|
||||
"golang.org/x/xerrors"
|
||||
|
||||
ffi "github.com/filecoin-project/filecoin-ffi"
|
||||
"github.com/filecoin-project/go-address"
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
actorstypes "github.com/filecoin-project/go-state-types/actors"
|
||||
"github.com/filecoin-project/go-state-types/builtin"
|
||||
market8 "github.com/filecoin-project/go-state-types/builtin/v8/market"
|
||||
adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
|
||||
market9 "github.com/filecoin-project/go-state-types/builtin/v9/market"
|
||||
miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
|
||||
adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
|
||||
verifreg9 "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
|
||||
"github.com/filecoin-project/specs-actors/v7/actors/migration/nv15"
|
||||
|
||||
"github.com/filecoin-project/lotus/blockstore"
|
||||
"github.com/filecoin-project/lotus/chain/actors"
|
||||
"github.com/filecoin-project/lotus/chain/actors/adt"
|
||||
lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin"
|
||||
"github.com/filecoin-project/lotus/chain/actors/builtin/datacap"
|
||||
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
|
||||
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
|
||||
"github.com/filecoin-project/lotus/chain/actors/builtin/verifreg"
|
||||
"github.com/filecoin-project/lotus/chain/consensus/filcns"
|
||||
"github.com/filecoin-project/lotus/chain/state"
|
||||
@ -132,7 +146,12 @@ var migrationsCmd = &cli.Command{
|
||||
|
||||
fmt.Println("new cid", newCid2)
|
||||
|
||||
err = checkStateInvariants(ctx, blk.ParentStateRoot, newCid2, bs)
|
||||
if newCid1 != newCid2 {
|
||||
return xerrors.Errorf("got different results with and without the cache: %s, %s", newCid1,
|
||||
newCid2)
|
||||
}
|
||||
|
||||
err = checkStateInvariants(ctx, blk.ParentStateRoot, newCid1, bs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -141,15 +160,44 @@ var migrationsCmd = &cli.Command{
|
||||
},
|
||||
}
|
||||
|
||||
func checkStateInvariants(ctx context.Context, oldStateRoot cid.Cid, newStateRoot cid.Cid, bs blockstore.Blockstore) error {
|
||||
func checkStateInvariants(ctx context.Context, v8StateRoot cid.Cid, v9StateRoot cid.Cid, bs blockstore.Blockstore) error {
|
||||
actorStore := store.ActorStore(ctx, blockstore.NewTieredBstore(bs, blockstore.NewMemorySync()))
|
||||
|
||||
verifregDatacaps, err := getVerifreg8Datacaps(ctx, oldStateRoot, actorStore)
|
||||
stateTreeV8, err := state.LoadStateTree(actorStore, v8StateRoot)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
newDatacaps, err := getDatacap9Datacaps(ctx, newStateRoot, actorStore)
|
||||
stateTreeV9, err := state.LoadStateTree(actorStore, v9StateRoot)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = checkDatacaps(stateTreeV8, stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = checkPendingVerifiedDeals(stateTreeV8, stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = checkAllMinersUnsealedCID(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkDatacaps(stateTreeV8 *state.StateTree, stateTreeV9 *state.StateTree, actorStore adt.Store) error {
|
||||
verifregDatacaps, err := getVerifreg8Datacaps(stateTreeV8, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
newDatacaps, err := getDatacap9Datacaps(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -171,24 +219,14 @@ func checkStateInvariants(ctx context.Context, oldStateRoot cid.Cid, newStateRoo
|
||||
return nil
|
||||
}
|
||||
|
||||
func getVerifreg8Datacaps(ctx context.Context, v8StateRoot cid.Cid, actorStore adt.Store) (map[address.Address]abi.StoragePower, error) {
|
||||
stateTreeV8, err := state.LoadStateTree(actorStore, v8StateRoot)
|
||||
func getVerifreg8Datacaps(stateTreeV8 *state.StateTree, actorStore adt.Store) (map[address.Address]abi.StoragePower, error) {
|
||||
verifregStateV8, err := getVerifregActorV8(stateTreeV8, actorStore)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
verifregV8, err := stateTreeV8.GetActor(verifreg.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
verifregV8State, err := verifreg.Load(actorStore, verifregV8)
|
||||
if err = actorStore.Get(ctx, verifregV8.Head, &verifregV8State); err != nil {
|
||||
return nil, xerrors.Errorf("failed to get verifreg actor state: %w", err)
|
||||
}
|
||||
|
||||
var verifregDatacaps = make(map[address.Address]abi.StoragePower)
|
||||
err = verifregV8State.ForEachClient(func(addr address.Address, dcap abi.StoragePower) error {
|
||||
err = verifregStateV8.ForEachClient(func(addr address.Address, dcap abi.StoragePower) error {
|
||||
verifregDatacaps[addr] = dcap
|
||||
return nil
|
||||
})
|
||||
@ -199,24 +237,14 @@ func getVerifreg8Datacaps(ctx context.Context, v8StateRoot cid.Cid, actorStore a
|
||||
return verifregDatacaps, nil
|
||||
}
|
||||
|
||||
func getDatacap9Datacaps(ctx context.Context, v9StateRoot cid.Cid, actorStore adt.Store) (map[address.Address]abi.StoragePower, error) {
|
||||
stateTreeV9, err := state.LoadStateTree(actorStore, v9StateRoot)
|
||||
func getDatacap9Datacaps(stateTreeV9 *state.StateTree, actorStore adt.Store) (map[address.Address]abi.StoragePower, error) {
|
||||
datacapStateV9, err := getDatacapActorV9(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
datacapV9, err := stateTreeV9.GetActor(datacap.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
datacapV9State, err := datacap.Load(actorStore, datacapV9)
|
||||
if err = actorStore.Get(ctx, datacapV9.Head, &datacapV9State); err != nil {
|
||||
return nil, xerrors.Errorf("failed to get verifreg actor state: %w", err)
|
||||
return nil, xerrors.Errorf("failed to get datacap actor state: %w", err)
|
||||
}
|
||||
|
||||
var datacaps = make(map[address.Address]abi.StoragePower)
|
||||
err = datacapV9State.ForEachClient(func(addr address.Address, dcap abi.StoragePower) error {
|
||||
err = datacapStateV9.ForEachClient(func(addr address.Address, dcap abi.StoragePower) error {
|
||||
datacaps[addr] = dcap
|
||||
return nil
|
||||
})
|
||||
@ -226,3 +254,370 @@ func getDatacap9Datacaps(ctx context.Context, v9StateRoot cid.Cid, actorStore ad
|
||||
|
||||
return datacaps, nil
|
||||
}
|
||||
|
||||
func checkPendingVerifiedDeals(stateTreeV8 *state.StateTree, stateTreeV9 *state.StateTree, actorStore adt.Store) error {
|
||||
marketActorV9, err := getMarketActorV9(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
verifregActorV9, err := getVerifregActorV9(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
verifregStateV9, err := getVerifregStateV9(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
marketStateV8, err := getMarketStateV8(stateTreeV8, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
marketStateV9, err := getMarketStateV9(stateTreeV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pendingProposalsV8, err := adt8.AsSet(actorStore, marketStateV8.PendingProposals, builtin.DefaultHamtBitwidth)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("failed to load pending proposals: %w", err)
|
||||
}
|
||||
|
||||
dealProposalsV8, err := market8.AsDealProposalArray(actorStore, marketStateV8.Proposals)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("failed to get proposals: %w", err)
|
||||
}
|
||||
|
||||
var numPendingVerifiedDeals = 0
|
||||
var proposal market8.DealProposal
|
||||
err = dealProposalsV8.ForEach(&proposal, func(dealID int64) error {
|
||||
// If not verified, do nothing
|
||||
if !proposal.VerifiedDeal {
|
||||
return nil
|
||||
}
|
||||
|
||||
pcid, err := proposal.Cid()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
isPending, err := pendingProposalsV8.Has(abi.CidKey(pcid))
|
||||
if err != nil {
|
||||
return xerrors.Errorf("failed to check pending: %w", err)
|
||||
}
|
||||
|
||||
// Nothing to do for not-pending deals
|
||||
if !isPending {
|
||||
return nil
|
||||
}
|
||||
|
||||
numPendingVerifiedDeals++
|
||||
// Checks if allocation ID is in market map
|
||||
allocationId, err := marketActorV9.GetAllocationIdForPendingDeal(abi.DealID(dealID))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Checks if allocation is in verifreg
|
||||
allocation, found, err := verifregActorV9.GetAllocation(proposal.Client, allocationId)
|
||||
if !found {
|
||||
return xerrors.Errorf("allocation %d not found for address %s", allocationId, proposal.Client)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = compareProposalToAllocation(proposal, *allocation)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("Pending Verified deals in market v8: %d\n", numPendingVerifiedDeals)
|
||||
|
||||
numAllocationIds, err := countAllocationIds(actorStore, marketStateV9)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Printf("Allocation IDs in market v9: %d\n", numAllocationIds)
|
||||
|
||||
if numAllocationIds != numPendingVerifiedDeals {
|
||||
return xerrors.Errorf("number of allocation IDsf: %d did not match the number of pending verified deals: %d", numAllocationIds, numPendingVerifiedDeals)
|
||||
}
|
||||
|
||||
numAllocations, err := countAllocations(verifregStateV9, actorStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Printf("Allocations in verifreg v9: %d\n", numAllocations)
|
||||
|
||||
if numAllocations != numPendingVerifiedDeals {
|
||||
return xerrors.Errorf("number of allocations: %d did not match the number of pending verified deals: %d", numAllocations, numPendingVerifiedDeals)
|
||||
}
|
||||
|
||||
nextAllocationId := int(verifregStateV9.NextAllocationId)
|
||||
fmt.Printf("Next Allocation ID: %d\n", nextAllocationId)
|
||||
|
||||
if numAllocations+1 != nextAllocationId {
|
||||
return xerrors.Errorf("number of allocations + 1: %d did not match the next allocation ID: %d", numAllocations+1, nextAllocationId)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func compareProposalToAllocation(prop market8.DealProposal, alloc verifreg9.Allocation) error {
|
||||
if prop.PieceCID != alloc.Data {
|
||||
return xerrors.Errorf("piece cid mismatch between proposal and allocation: %s, %s", prop.PieceCID, alloc.Data)
|
||||
}
|
||||
|
||||
proposalClientID, err := address.IDFromAddress(prop.Client)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("couldnt get ID from address")
|
||||
}
|
||||
if proposalClientID != uint64(alloc.Client) {
|
||||
return xerrors.Errorf("client id mismatch between proposal and allocation: %s, %s", proposalClientID, alloc.Client)
|
||||
}
|
||||
|
||||
proposalProviderID, err := address.IDFromAddress(prop.Provider)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("couldnt get ID from address")
|
||||
}
|
||||
if proposalProviderID != uint64(alloc.Provider) {
|
||||
return xerrors.Errorf("provider id mismatch between proposal and allocation: %s, %s", proposalProviderID, alloc.Provider)
|
||||
}
|
||||
|
||||
if prop.PieceSize != alloc.Size {
|
||||
return xerrors.Errorf("piece size mismatch between proposal and allocation: %s, %s", prop.PieceSize, alloc.Size)
|
||||
}
|
||||
|
||||
// TODO: fix
|
||||
//if alloc.TermMax != 540*builtin.EpochsInDay {
|
||||
// return xerrors.Errorf("allocation term should be 540 days. Got %d epochs", alloc.TermMax)
|
||||
//}
|
||||
|
||||
if prop.EndEpoch-prop.StartEpoch != alloc.TermMin {
|
||||
return xerrors.Errorf("allocation term mismatch between proposal and allocation: %d, %d", prop.EndEpoch-prop.StartEpoch, alloc.TermMin)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func getMarketStateV8(stateTreeV8 *state.StateTree, actorStore adt.Store) (market8.State, error) {
|
||||
marketV8, err := stateTreeV8.GetActor(market.Address)
|
||||
if err != nil {
|
||||
return market8.State{}, err
|
||||
}
|
||||
|
||||
var marketStateV8 market8.State
|
||||
if err = actorStore.Get(actorStore.Context(), marketV8.Head, &marketStateV8); err != nil {
|
||||
return market8.State{}, xerrors.Errorf("failed to get market actor state: %w", err)
|
||||
}
|
||||
|
||||
return marketStateV8, nil
|
||||
}
|
||||
|
||||
func getMarketStateV9(stateTreeV9 *state.StateTree, actorStore adt.Store) (market9.State, error) {
|
||||
marketV9, err := stateTreeV9.GetActor(market.Address)
|
||||
if err != nil {
|
||||
return market9.State{}, err
|
||||
}
|
||||
|
||||
var marketStateV9 market9.State
|
||||
if err = actorStore.Get(actorStore.Context(), marketV9.Head, &marketStateV9); err != nil {
|
||||
return market9.State{}, xerrors.Errorf("failed to get market actor state: %w", err)
|
||||
}
|
||||
|
||||
return marketStateV9, nil
|
||||
}
|
||||
|
||||
func getMarketActorV9(stateTreeV9 *state.StateTree, actorStore adt.Store) (market.State, error) {
|
||||
marketV9, err := stateTreeV9.GetActor(market.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return market.Load(actorStore, marketV9)
|
||||
}
|
||||
|
||||
func getVerifregActorV8(stateTreeV8 *state.StateTree, actorStore adt.Store) (verifreg.State, error) {
|
||||
verifregV8, err := stateTreeV8.GetActor(verifreg.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return verifreg.Load(actorStore, verifregV8)
|
||||
}
|
||||
|
||||
func getVerifregActorV9(stateTreeV9 *state.StateTree, actorStore adt.Store) (verifreg.State, error) {
|
||||
verifregV9, err := stateTreeV9.GetActor(verifreg.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return verifreg.Load(actorStore, verifregV9)
|
||||
}
|
||||
|
||||
func getVerifregStateV9(stateTreeV9 *state.StateTree, actorStore adt.Store) (verifreg9.State, error) {
|
||||
verifregV9, err := stateTreeV9.GetActor(verifreg.Address)
|
||||
if err != nil {
|
||||
return verifreg9.State{}, err
|
||||
}
|
||||
|
||||
var verifregStateV9 verifreg9.State
|
||||
if err = actorStore.Get(actorStore.Context(), verifregV9.Head, &verifregStateV9); err != nil {
|
||||
return verifreg9.State{}, xerrors.Errorf("failed to get verifreg actor state: %w", err)
|
||||
}
|
||||
|
||||
return verifregStateV9, nil
|
||||
}
|
||||
|
||||
func getDatacapActorV9(stateTreeV9 *state.StateTree, actorStore adt.Store) (datacap.State, error) {
|
||||
datacapV9, err := stateTreeV9.GetActor(datacap.Address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return datacap.Load(actorStore, datacapV9)
|
||||
}
|
||||
|
||||
func checkAllMinersUnsealedCID(stateTreeV9 *state.StateTree, store adt.Store) error {
|
||||
return stateTreeV9.ForEach(func(addr address.Address, actor *types.Actor) error {
|
||||
if !lbuiltin.IsStorageMinerActor(actor.Code) {
|
||||
return nil // no need to check
|
||||
}
|
||||
|
||||
err := checkMinerUnsealedCID(actor, stateTreeV9, store)
|
||||
if err != nil {
|
||||
fmt.Println("failure for miner ", addr)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func checkMinerUnsealedCID(act *types.Actor, stateTreeV9 *state.StateTree, store adt.Store) error {
|
||||
minerCodeCid, found := actors.GetActorCodeID(actorstypes.Version9, actors.MinerKey)
|
||||
if !found {
|
||||
return xerrors.Errorf("could not find code cid for miner actor")
|
||||
}
|
||||
if minerCodeCid != act.Code {
|
||||
return nil // no need to check
|
||||
}
|
||||
|
||||
marketActorV9, err := getMarketActorV9(stateTreeV9, store)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
dealProposals, err := marketActorV9.Proposals()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m, err := miner.Load(store, act)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = m.ForEachPrecommittedSector(func(info miner9.SectorPreCommitOnChainInfo) error {
|
||||
dealIDs := info.Info.DealIDs
|
||||
|
||||
if len(dealIDs) == 0 {
|
||||
return nil // Nothing to check here
|
||||
}
|
||||
|
||||
pieceCids := make([]abi.PieceInfo, len(dealIDs))
|
||||
for i, dealId := range dealIDs {
|
||||
dealProposal, found, err := dealProposals.Get(dealId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !found {
|
||||
return nil
|
||||
}
|
||||
|
||||
pieceCids[i] = abi.PieceInfo{
|
||||
Size: dealProposal.PieceSize,
|
||||
PieceCID: dealProposal.PieceCID,
|
||||
}
|
||||
}
|
||||
|
||||
if len(pieceCids) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
if info.Info.UnsealedCid == nil {
|
||||
return xerrors.Errorf("nil unsealed CID for sector with deals")
|
||||
}
|
||||
|
||||
pieceCID, err := ffi.GenerateUnsealedCID(abi.RegisteredSealProof_StackedDrg64GiBV1_1, pieceCids)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if pieceCID != *info.Info.UnsealedCid {
|
||||
return xerrors.Errorf("calculated piece CID %s did not match unsealed CID in precommitted sector info: %s", pieceCID, *info.Info.UnsealedCid)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func countAllocations(verifregState verifreg9.State, store adt.Store) (int, error) {
|
||||
var count = 0
|
||||
|
||||
actorToHamtMap, err := adt9.AsMap(store, verifregState.Allocations, builtin.DefaultHamtBitwidth)
|
||||
if err != nil {
|
||||
return 0, xerrors.Errorf("couldn't get outer map: %x", err)
|
||||
}
|
||||
|
||||
var innerHamtCid cbg.CborCid
|
||||
err = actorToHamtMap.ForEach(&innerHamtCid, func(key string) error {
|
||||
innerMap, err := adt9.AsMap(store, cid.Cid(innerHamtCid), builtin.DefaultHamtBitwidth)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("couldn't get outer map: %x", err)
|
||||
}
|
||||
|
||||
var allocation verifreg9.Allocation
|
||||
err = innerMap.ForEach(&allocation, func(key string) error {
|
||||
count++
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return xerrors.Errorf("couldn't iterate over inner map: %x", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return 0, xerrors.Errorf("couldn't iterate over outer map: %x", err)
|
||||
}
|
||||
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func countAllocationIds(store adt.Store, marketState market9.State) (int, error) {
|
||||
allocationIds, err := adt9.AsMap(store, marketState.PendingDealAllocationIds, builtin.DefaultHamtBitwidth)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
var numAllocationIds int
|
||||
_ = allocationIds.ForEach(nil, func(key string) error {
|
||||
numAllocationIds++
|
||||
return nil
|
||||
})
|
||||
|
||||
return numAllocationIds, nil
|
||||
}
|
||||
|
||||
@ -194,4 +194,7 @@ func TestGetAllocationForPendingDeal(t *testing.T) {
|
||||
for _, alloc := range allocations {
|
||||
require.Equal(t, alloc, *allocation)
|
||||
}
|
||||
|
||||
marketDeal, err := api.StateMarketStorageDeal(ctx, dealIds[0], types.EmptyTSK)
|
||||
require.Equal(t, marketDeal.State.SectorStartEpoch, abi.ChainEpoch(-1))
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user