diff --git a/api/api_full.go b/api/api_full.go index a1b9a8215..57f7b121a 100644 --- a/api/api_full.go +++ b/api/api_full.go @@ -167,6 +167,7 @@ type FileRef struct { type MinerSectors struct { Sset uint64 + Pset uint64 } type Import struct { diff --git a/cmd/lotus-storage-miner/info.go b/cmd/lotus-storage-miner/info.go index 1fafc6426..d725c0871 100644 --- a/cmd/lotus-storage-miner/info.go +++ b/cmd/lotus-storage-miner/info.go @@ -6,10 +6,7 @@ import ( "gopkg.in/urfave/cli.v2" - "github.com/filecoin-project/specs-actors/actors/builtin/power" - "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" lcli "github.com/filecoin-project/lotus/cli" sealing "github.com/filecoin-project/storage-fsm" @@ -91,7 +88,7 @@ var infoCmd = &cli.Command{ fmt.Printf("\tCommit: %d\n", wstat.CommitWait) fmt.Printf("\tUnseal: %d\n", wstat.UnsealWait)*/ - ps, err := api.StateMinerPostState(ctx, maddr, types.EmptyTSK) + /*ps, err := api.StateMinerPostState(ctx, maddr, types.EmptyTSK) if err != nil { return err } @@ -113,7 +110,7 @@ var infoCmd = &cli.Command{ fmt.Printf("\tConsecutive Failures: %d\n", ps.NumConsecutiveFailures) } else { fmt.Printf("Proving Period: Not Proving\n") - } + }*/ sinfo, err := sectorsInfo(ctx, nodeApi) if err != nil { diff --git a/cmd/lotus-storage-miner/sectors.go b/cmd/lotus-storage-miner/sectors.go index 1c8656846..97165cbb1 100644 --- a/cmd/lotus-storage-miner/sectors.go +++ b/cmd/lotus-storage-miner/sectors.go @@ -142,7 +142,7 @@ var sectorsListCmd = &cli.Command{ provingIDs[info.ID] = struct{}{} } - sset, err := fullApi.StateMinerSectors(ctx, maddr, types.EmptyTSK) + sset, err := fullApi.StateMinerSectors(ctx, maddr, nil, types.EmptyTSK) if err != nil { return err } diff --git a/go.mod b/go.mod index 2d5d2e78f..94aedd1f1 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/filecoin-project/sector-storage v0.0.0-20200411000242-61616264b16d github.com/filecoin-project/specs-actors v0.0.0-20200415170224-54c7b2a42e71 github.com/filecoin-project/specs-storage v0.0.0-20200410185809-9fbaaa08f275 - github.com/filecoin-project/storage-fsm v0.0.0-20200413200947-069c3b2468ca + github.com/filecoin-project/storage-fsm v0.0.0-20200415180041-afc45d4b6e8b github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 github.com/google/uuid v1.1.1 github.com/gorilla/mux v1.7.4 @@ -116,5 +116,3 @@ replace github.com/golangci/golangci-lint => github.com/golangci/golangci-lint v replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi replace github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0 - -replace github.com/filecoin-project/storage-fsm => /home/magik6k/gohack/github.com/filecoin-project/storage-fsm diff --git a/go.sum b/go.sum index f4c419b41..665009bdd 100644 --- a/go.sum +++ b/go.sum @@ -190,6 +190,8 @@ github.com/filecoin-project/specs-storage v0.0.0-20200410185809-9fbaaa08f275 h1: github.com/filecoin-project/specs-storage v0.0.0-20200410185809-9fbaaa08f275/go.mod h1:xJ1/xl9+8zZeSSSFmDC3Wr6uusCTxyYPI0VeNVSFmPE= github.com/filecoin-project/storage-fsm v0.0.0-20200413200947-069c3b2468ca h1:TejufIAWDpEVqFUCszDpgOEzXBWuTVltsDQL/3F8Jxo= github.com/filecoin-project/storage-fsm v0.0.0-20200413200947-069c3b2468ca/go.mod h1:jbcbdJW0RogwlQ+dCpgIgC8HIVq6x/aXn31/RGOHvN0= +github.com/filecoin-project/storage-fsm v0.0.0-20200415180041-afc45d4b6e8b h1:YQrc/AZsHiNQFfSVjFwTkuNa+8m4wj6xzeGPoQ3Uwro= +github.com/filecoin-project/storage-fsm v0.0.0-20200415180041-afc45d4b6e8b/go.mod h1:mJtW2Y2qIbZErBoc1MmgVKMFiNHWZ2qqeH6Hl3fHFWU= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 h1:EzDjxMg43q1tA2c0MV3tNbaontnHLplHyFF6M5KiVP0=