From c7508a051266a3f689af8d91f476128bb121c883 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Fri, 28 Feb 2020 18:02:40 -0800 Subject: [PATCH] self review fixes --- chain/gen/gen.go | 7 +++--- chain/market/fundmgr.go | 4 +--- chain/vm/syscalls.go | 1 - cmd/lotus-seed/main.go | 34 ++++++------------------------ markets/storageadapter/client.go | 4 ---- markets/storageadapter/provider.go | 6 ------ 6 files changed, 11 insertions(+), 45 deletions(-) diff --git a/chain/gen/gen.go b/chain/gen/gen.go index c9104b168..1fecbacba 100644 --- a/chain/gen/gen.go +++ b/chain/gen/gen.go @@ -572,12 +572,11 @@ func IsRoundWinner(ctx context.Context, ts *types.TipSet, round int64, miner add return nil, nil } - if pset[0].Info.Info.RegisteredProof == 0 { - panic("registered proof coming from proving set is 0") - } - var sinfos []abi.SectorInfo for _, s := range pset { + if s.Info.Info.RegisteredProof == 0 { + return nil, xerrors.Errorf("sector %d in proving set had registered type of zero", s.ID) + } sinfos = append(sinfos, abi.SectorInfo{ SectorNumber: s.ID, SealedCID: s.Info.Info.SealedCID, diff --git a/chain/market/fundmgr.go b/chain/market/fundmgr.go index 88096b5ab..76f0c795c 100644 --- a/chain/market/fundmgr.go +++ b/chain/market/fundmgr.go @@ -35,7 +35,6 @@ func NewFundMgr(sm *stmgr.StateManager, mpool full.MpoolAPI) *FundMgr { } func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr, wallet address.Address, amt types.BigInt) error { - log.Error("ensure available: ", addr, amt) fm.lk.Lock() avail, ok := fm.available[addr] if !ok { @@ -81,8 +80,7 @@ func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr, wallet address.Add _, r, err := fm.sm.WaitForMessage(ctx, smsg.Cid()) if err != nil { - log.Error("waiting for message: ", err) - return err + return xerrors.Errorf("failed waiting for market AddBalance message: %w", err) } if r.ExitCode != 0 { diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go index 7c64bcb82..8d22d74dd 100644 --- a/chain/vm/syscalls.go +++ b/chain/vm/syscalls.go @@ -76,7 +76,6 @@ func (ss *syscallShim) VerifyConsensusFault(a, b []byte) error { } func (ss *syscallShim) VerifyPoSt(proof abi.PoStVerifyInfo) error { - //VerifyFallbackPost(ctx context.Context, sectorSize abi.SectorSize, sectorInfo SortedPublicSectorInfo, challengeSeed []byte, proof []byte, candidates []EPostCandidate, proverID address.Address, faults uint64) (bool, error) ok, err := ss.verifier.VerifyFallbackPost(context.TODO(), proof) if err != nil { return err diff --git a/cmd/lotus-seed/main.go b/cmd/lotus-seed/main.go index 46445f1f0..2096ac0ff 100644 --- a/cmd/lotus-seed/main.go +++ b/cmd/lotus-seed/main.go @@ -21,6 +21,7 @@ import ( "github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi/big" + lapi "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/cmd/lotus-seed/seed" @@ -119,7 +120,7 @@ var preSealCmd = &cli.Command{ } } - rp, err := registeredProofFromSsize(c.Uint64("sector-size")) + rp, _, err := lapi.ProofTypeFromSectorSize(abi.SectorSize(c.Uint64("sector-size"))) if err != nil { return err } @@ -221,20 +222,15 @@ var aggregateSectorDirsCmd = &cli.Command{ ssize := abi.SectorSize(cctx.Uint64("sector-size")) - rp, err := registeredProofFromSsize(cctx.Uint64("sector-size")) - if err != nil { - return err - } - - sp, err := rp.RegisteredSealProof() + ppt, spt, err := lapi.ProofTypeFromSectorSize(abi.SectorSize(cctx.Uint64("sector-size"))) if err != nil { return err } agsb, err := sectorbuilder.New(§orbuilder.Config{ Miner: maddr, - SealProofType: sp, - PoStProofType: rp, + SealProofType: spt, + PoStProofType: ppt, Paths: sectorbuilder.SimplePath(destdir), WorkerThreads: 2, }, namespace.Wrap(agmds, datastore.NewKey("/sectorbuilder"))) @@ -295,8 +291,8 @@ var aggregateSectorDirsCmd = &cli.Command{ sb, err := sectorbuilder.New(§orbuilder.Config{ Miner: maddr, - SealProofType: sp, - PoStProofType: rp, + SealProofType: spt, + PoStProofType: ppt, Paths: sectorbuilder.SimplePath(dir), WorkerThreads: 2, }, namespace.Wrap(mds, datastore.NewKey("/sectorbuilder"))) @@ -336,19 +332,3 @@ func mergeGenMiners(a, b genesis.Miner) genesis.Miner { Sectors: append(a.Sectors, b.Sectors...), } } - -func registeredProofFromSsize(ssize uint64) (abi.RegisteredProof, error) { - // TODO: this should be provided to us by something lower down... - switch ssize { - case 2 << 10: - return abi.RegisteredProof_StackedDRG2KiBPoSt, nil - case 32 << 30: - return abi.RegisteredProof_StackedDRG32GiBPoSt, nil - case 8 << 20: - return abi.RegisteredProof_StackedDRG8MiBPoSt, nil - case 512 << 20: - return abi.RegisteredProof_StackedDRG512MiBPoSt, nil - default: - return 0, fmt.Errorf("unsupported sector size: %d", ssize) - } -} diff --git a/markets/storageadapter/client.go b/markets/storageadapter/client.go index 438265d70..9e99b0128 100644 --- a/markets/storageadapter/client.go +++ b/markets/storageadapter/client.go @@ -292,7 +292,6 @@ func (c *ClientNodeAdapter) OnDealSectorCommitted(ctx context.Context, provider for _, did := range params.DealIDs { if did == abi.DealID(dealId) { - log.Error("FOUND OUR SECTOR!", params.SectorNumber) sectorNumber = params.SectorNumber sectorFound = true return false, nil @@ -301,12 +300,10 @@ func (c *ClientNodeAdapter) OnDealSectorCommitted(ctx context.Context, provider return false, nil case builtin.MethodsMiner.ProveCommitSector: - log.Errorf("Look! a prove commit!") var params miner.ProveCommitSectorParams if err := params.UnmarshalCBOR(bytes.NewReader(msg.Params)); err != nil { return false, xerrors.Errorf("failed to unmarshal prove commit sector params: %w", err) } - log.Warn("prove commit: ", params.SectorNumber, sectorFound, sectorNumber) if !sectorFound { return false, nil @@ -316,7 +313,6 @@ func (c *ClientNodeAdapter) OnDealSectorCommitted(ctx context.Context, provider return false, nil } - log.Warn("getting out of here") return true, nil default: return false, nil diff --git a/markets/storageadapter/provider.go b/markets/storageadapter/provider.go index 95900dcc0..55ded4553 100644 --- a/markets/storageadapter/provider.go +++ b/markets/storageadapter/provider.go @@ -219,7 +219,6 @@ func (n *ProviderNodeAdapter) LocatePieceForDealWithinSector(ctx context.Context } func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provider address.Address, dealID uint64, cb storagemarket.DealSectorCommittedCallback) error { - log.Errorf("ON DEAL SECTOR COMMITTED", provider, dealID) checkFunc := func(ts *types.TipSet) (done bool, more bool, err error) { sd, err := n.StateMarketStorageDeal(ctx, abi.DealID(dealID), ts.Key()) @@ -237,7 +236,6 @@ func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provide } called := func(msg *types.Message, rec *types.MessageReceipt, ts *types.TipSet, curH abi.ChainEpoch) (more bool, err error) { - log.Errorf("CAllled callllllback") defer func() { if err != nil { cb(xerrors.Errorf("handling applied event: %w", err)) @@ -288,7 +286,6 @@ func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provide for _, did := range params.DealIDs { if did == abi.DealID(dealID) { - log.Error("FOUND OUR SECTOR!", params.SectorNumber) sectorNumber = params.SectorNumber sectorFound = true return false, nil @@ -297,12 +294,10 @@ func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provide return false, nil case builtin.MethodsMiner.ProveCommitSector: - log.Errorf("Look! a prove commit!") var params miner.ProveCommitSectorParams if err := params.UnmarshalCBOR(bytes.NewReader(msg.Params)); err != nil { return false, xerrors.Errorf("failed to unmarshal prove commit sector params: %w", err) } - log.Warn("prove commit: ", params.SectorNumber, sectorFound, sectorNumber) if !sectorFound { return false, nil @@ -312,7 +307,6 @@ func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provide return false, nil } - log.Warn("getting out of here") return true, nil default: return false, nil