cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

api, nodeApi to minerApi

Browse Source
This commit is contained in:
Geoff Stuart 2022-09-14 14:51:18 -04:00
parent 308cef950b
commit fb0633453a
9 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/lotus-miner/actor.go
View File

@ -81,7 +81,7 @@ var actorSetAddrsCmd = &cli.Command{
return fmt.Errorf("unset can only be used with no arguments")
}
nodeAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -112,7 +112,7 @@ var actorSetAddrsCmd = &cli.Command{
addrs = append(addrs, maddrNop2p.Bytes())
}
maddr, err := nodeAPI.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -177,7 +177,7 @@ var actorSetPeeridCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -196,7 +196,7 @@ var actorSetPeeridCmd = &cli.Command{
return fmt.Errorf("failed to parse input as a peerId: %w", err)
}
maddr, err := nodeAPI.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -258,7 +258,7 @@ var actorWithdrawCmd = &cli.Command{
amount = abi.TokenAmount(f)
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -274,9 +274,9 @@ var actorWithdrawCmd = &cli.Command{
var res cid.Cid
if cctx.IsSet("beneficiary") {
res, err = nodeApi.BeneficiaryWithdrawBalance(ctx, amount)
res, err = minerApi.BeneficiaryWithdrawBalance(ctx, amount)
} else {
res, err = nodeApi.ActorWithdrawBalance(ctx, amount)
res, err = minerApi.ActorWithdrawBalance(ctx, amount)
}
if err != nil {
return err
@ -326,7 +326,7 @@ var actorRepayDebtCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -340,7 +340,7 @@ var actorRepayDebtCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -441,7 +441,7 @@ var actorControlList = &cli.Command{
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -473,7 +473,7 @@ var actorControlList = &cli.Command{
tablewriter.Col("balance"),
)
ac, err := nodeApi.ActorAddressConfig(ctx)
ac, err := minerApi.ActorAddressConfig(ctx)
if err != nil {
return err
}
@ -610,7 +610,7 @@ var actorControlSet = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -624,7 +624,7 @@ var actorControlSet = &cli.Command{
ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -826,7 +826,7 @@ var actorProposeChangeWorker = &cli.Command{
return fmt.Errorf("must pass address of new worker address")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -850,7 +850,7 @@ var actorProposeChangeWorker = &cli.Command{
return err
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -941,7 +941,7 @@ var actorConfirmChangeWorker = &cli.Command{
return fmt.Errorf("must pass address of new worker address")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -965,7 +965,7 @@ var actorConfirmChangeWorker = &cli.Command{
return err
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -1056,7 +1056,7 @@ var actorCompactAllocatedCmd = &cli.Command{
return fmt.Errorf("must pass address of new owner address")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1070,7 +1070,7 @@ var actorCompactAllocatedCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}

4
cmd/lotus-miner/info_all.go
View File

@ -16,7 +16,7 @@ var infoAllCmd = &cli.Command{
Name: "all",
Usage: "dump all related miner info",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -220,7 +220,7 @@ var infoAllCmd = &cli.Command{
// Very Very Verbose info
fmt.Println("\n#: Per Sector Info")
list, err := nodeApi.SectorsList(ctx)
list, err := minerApi.SectorsList(ctx)
if err != nil {
fmt.Println("ERROR: ", err)
}

4
cmd/lotus-miner/main.go
View File

@ -177,13 +177,13 @@ func getActorAddress(ctx context.Context, cctx *cli.Context) (maddr address.Addr
return
}
nodeAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return address.Undef, err
}
defer closer()
maddr, err = nodeAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return maddr, xerrors.Errorf("getting actor address: %w", err)
}

16
cmd/lotus-miner/proving.go
View File

@ -476,7 +476,7 @@ var provingCheckProvableCmd = &cli.Command{
}
defer closer()
sapi, scloser, err := lcli.GetStorageMinerAPI(cctx)
minerApi, scloser, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -484,7 +484,7 @@ var provingCheckProvableCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
addr, err := sapi.ActorAddress(ctx)
addr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -510,7 +510,7 @@ var provingCheckProvableCmd = &cli.Command{
var filter map[abi.SectorID]struct{}
if cctx.IsSet("storage-id") {
sl, err := sapi.StorageList(ctx)
sl, err := minerApi.StorageList(ctx)
if err != nil {
return err
}
@ -582,7 +582,7 @@ var provingCheckProvableCmd = &cli.Command{
})
}
bad, err := sapi.CheckProvable(ctx, info.WindowPoStProofType, tocheck, cctx.Bool("slow"))
bad, err := minerApi.CheckProvable(ctx, info.WindowPoStProofType, tocheck, cctx.Bool("slow"))
if err != nil {
return err
}
@ -625,7 +625,7 @@ It will not send any messages to the chain.`,
return xerrors.Errorf("could not parse deadline index: %w", err)
}
sapi, scloser, err := lcli.GetStorageMinerAPI(cctx)
minerApi, scloser, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -634,7 +634,7 @@ It will not send any messages to the chain.`,
ctx := lcli.ReqContext(cctx)
start := time.Now()
res, err := sapi.ComputeWindowPoSt(ctx, dlIdx, types.EmptyTSK)
res, err := minerApi.ComputeWindowPoSt(ctx, dlIdx, types.EmptyTSK)
fmt.Printf("Took %s\n", time.Now().Sub(start))
if err != nil {
return err
@ -675,7 +675,7 @@ var provingRecoverFaultsCmd = &cli.Command{
sectors = append(sectors, abi.SectorNumber(s))
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -689,7 +689,7 @@ var provingRecoverFaultsCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
msgs, err := nodeApi.RecoverFault(ctx, sectors)
msgs, err := minerApi.RecoverFault(ctx, sectors)
if err != nil {
return err
}

26
cmd/lotus-miner/sealing.go
View File

@ -57,7 +57,7 @@ func workersCmd(sealing bool) *cli.Command {
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -65,7 +65,7 @@ func workersCmd(sealing bool) *cli.Command {
ctx := lcli.ReqContext(cctx)
stats, err := nodeApi.WorkerStats(ctx)
stats, err := minerApi.WorkerStats(ctx)
if err != nil {
return err
}
@ -233,7 +233,7 @@ var sealingJobsCmd = &cli.Command{
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -241,7 +241,7 @@ var sealingJobsCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
jobs, err := nodeApi.WorkerJobs(ctx)
jobs, err := minerApi.WorkerJobs(ctx)
if err != nil {
return xerrors.Errorf("getting worker jobs: %w", err)
}
@ -275,7 +275,7 @@ var sealingJobsCmd = &cli.Command{
workerHostnames := map[uuid.UUID]string{}
wst, err := nodeApi.WorkerStats(ctx)
wst, err := minerApi.WorkerStats(ctx)
if err != nil {
return xerrors.Errorf("getting worker stats: %w", err)
}
@ -337,7 +337,7 @@ var sealingSchedDiagCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -345,7 +345,7 @@ var sealingSchedDiagCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
st, err := nodeApi.SealingSchedDiag(ctx, cctx.Bool("force-sched"))
st, err := minerApi.SealingSchedDiag(ctx, cctx.Bool("force-sched"))
if err != nil {
return err
}
@ -376,7 +376,7 @@ var sealingAbortCmd = &cli.Command{
return xerrors.Errorf("expected 1 argument")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -385,14 +385,14 @@ var sealingAbortCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
if cctx.Bool("sched") {
err = nodeApi.SealingRemoveRequest(ctx, uuid.Must(uuid.Parse(cctx.Args().First())))
err = minerApi.SealingRemoveRequest(ctx, uuid.Must(uuid.Parse(cctx.Args().First())))
if err != nil {
return xerrors.Errorf("Failed to removed the request with UUID %s: %w", cctx.Args().First(), err)
}
return nil
}
jobs, err := nodeApi.WorkerJobs(ctx)
jobs, err := minerApi.WorkerJobs(ctx)
if err != nil {
return xerrors.Errorf("getting worker jobs: %w", err)
}
@ -415,7 +415,7 @@ var sealingAbortCmd = &cli.Command{
fmt.Printf("aborting job %s, task %s, sector %d, running on host %s\n", job.ID.String(), job.Task.Short(), job.Sector.Number, job.Hostname)
return nodeApi.SealingAbort(ctx, job.ID)
return minerApi.SealingAbort(ctx, job.ID)
},
}
@ -434,7 +434,7 @@ var sealingDataCidCmd = &cli.Command{
return xerrors.Errorf("expected 1 or 2 arguments")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -500,7 +500,7 @@ var sealingDataCidCmd = &cli.Command{
psize = padreader.PaddedSize(sz).Padded()
}
pc, err := nodeApi.ComputeDataCid(ctx, psize.Unpadded(), r)
pc, err := minerApi.ComputeDataCid(ctx, psize.Unpadded(), r)
if err != nil {
return xerrors.Errorf("computing data CID: %w", err)
}

100
cmd/lotus-miner/sectors.go
View File

@ -69,14 +69,14 @@ var sectorsPledgeCmd = &cli.Command{
Name: "pledge",
Usage: "store random data in a sector",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
id, err := nodeApi.PledgeSector(ctx)
id, err := minerApi.PledgeSector(ctx)
if err != nil {
return err
}
@ -113,7 +113,7 @@ var sectorsStatusCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -130,7 +130,7 @@ var sectorsStatusCmd = &cli.Command{
}
onChainInfo := cctx.Bool("on-chain-info")
status, err := nodeApi.SectorsStatus(ctx, abi.SectorNumber(id), onChainInfo)
status, err := minerApi.SectorsStatus(ctx, abi.SectorNumber(id), onChainInfo)
if err != nil {
return err
}
@ -318,7 +318,7 @@ var sectorsListCmd = &cli.Command{
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -359,16 +359,16 @@ var sectorsListCmd = &cli.Command{
}
if len(states) == 0 {
list, err = nodeApi.SectorsList(ctx)
list, err = minerApi.SectorsList(ctx)
} else {
list, err = nodeApi.SectorsListInStates(ctx, states)
list, err = minerApi.SectorsListInStates(ctx, states)
}
if err != nil {
return err
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -418,7 +418,7 @@ var sectorsListCmd = &cli.Command{
fast := cctx.Bool("fast")
for _, s := range list {
st, err := nodeApi.SectorsStatus(ctx, s, !fast)
st, err := minerApi.SectorsStatus(ctx, s, !fast)
if err != nil {
tw.Write(map[string]interface{}{
"ID": s,
@ -1372,7 +1372,7 @@ var sectorsTerminateCmd = &cli.Command{
if !cctx.Bool("really-do-it") {
return xerrors.Errorf("pass --really-do-it to confirm this action")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1387,7 +1387,7 @@ var sectorsTerminateCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
return nodeApi.SectorTerminate(ctx, abi.SectorNumber(id))
return minerApi.SectorTerminate(ctx, abi.SectorNumber(id))
},
}
@ -1395,14 +1395,14 @@ var sectorsTerminateFlushCmd = &cli.Command{
Name: "flush",
Usage: "Send a terminate message if there are sectors queued for termination",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
mcid, err := nodeApi.SectorTerminateFlush(ctx)
mcid, err := minerApi.SectorTerminateFlush(ctx)
if err != nil {
return err
}
@ -1421,7 +1421,7 @@ var sectorsTerminatePendingCmd = &cli.Command{
Name: "pending",
Usage: "List sector numbers of sectors pending termination",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1433,12 +1433,12 @@ var sectorsTerminatePendingCmd = &cli.Command{
defer nCloser()
ctx := lcli.ReqContext(cctx)
pending, err := nodeApi.SectorTerminatePending(ctx)
pending, err := minerAPI.SectorTerminatePending(ctx)
if err != nil {
return err
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerAPI.ActorAddress(ctx)
if err != nil {
return err
}
@ -1482,7 +1482,7 @@ var sectorsRemoveCmd = &cli.Command{
if !cctx.Bool("really-do-it") {
return xerrors.Errorf("this is a command for advanced users, only use it if you are sure of what you are doing")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1497,7 +1497,7 @@ var sectorsRemoveCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
return nodeApi.SectorRemove(ctx, abi.SectorNumber(id))
return minerAPI.SectorRemove(ctx, abi.SectorNumber(id))
},
}
@ -1510,7 +1510,7 @@ var sectorsSnapUpCmd = &cli.Command{
return lcli.ShowHelp(cctx, xerrors.Errorf("must pass sector number"))
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1535,7 +1535,7 @@ var sectorsSnapUpCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
return nodeApi.SectorMarkForUpgrade(ctx, abi.SectorNumber(id), true)
return minerAPI.SectorMarkForUpgrade(ctx, abi.SectorNumber(id), true)
},
}
@ -1560,7 +1560,7 @@ var sectorsSnapAbortCmd = &cli.Command{
return fmt.Errorf("--really-do-it must be specified for this action to have an effect; you have been warned")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1572,7 +1572,7 @@ var sectorsSnapAbortCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
return nodeApi.SectorAbortUpgrade(ctx, abi.SectorNumber(id))
return minerAPI.SectorAbortUpgrade(ctx, abi.SectorNumber(id))
},
}
@ -1581,7 +1581,7 @@ var sectorsStartSealCmd = &cli.Command{
Usage: "Manually start sealing a sector (filling any unused space with junk)",
ArgsUsage: "<sectorNum>",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1596,7 +1596,7 @@ var sectorsStartSealCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
return nodeApi.SectorStartSealing(ctx, abi.SectorNumber(id))
return minerAPI.SectorStartSealing(ctx, abi.SectorNumber(id))
},
}
@ -1605,7 +1605,7 @@ var sectorsSealDelayCmd = &cli.Command{
Usage: "Set the time, in minutes, that a new sector waits for deals before sealing starts",
ArgsUsage: "<minutes>",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1622,7 +1622,7 @@ var sectorsSealDelayCmd = &cli.Command{
delay := hs * uint64(time.Minute)
return nodeApi.SectorSetSealDelay(ctx, time.Duration(delay))
return minerAPI.SectorSetSealDelay(ctx, time.Duration(delay))
},
}
@ -1708,7 +1708,7 @@ var sectorsUpdateCmd = &cli.Command{
if !cctx.Bool("really-do-it") {
return xerrors.Errorf("this is a command for advanced users, only use it if you are sure of what you are doing")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1723,7 +1723,7 @@ var sectorsUpdateCmd = &cli.Command{
return xerrors.Errorf("could not parse sector number: %w", err)
}
_, err = nodeApi.SectorsStatus(ctx, abi.SectorNumber(id), false)
_, err = minerAPI.SectorsStatus(ctx, abi.SectorNumber(id), false)
if err != nil {
return xerrors.Errorf("sector %d not found, could not change state", id)
}
@ -1737,7 +1737,7 @@ var sectorsUpdateCmd = &cli.Command{
return nil
}
return nodeApi.SectorsUpdate(ctx, abi.SectorNumber(id), api.SectorState(cctx.Args().Get(1)))
return minerAPI.SectorsUpdate(ctx, abi.SectorNumber(id), api.SectorState(cctx.Args().Get(1)))
},
}
@ -1765,7 +1765,7 @@ var sectorsExpiredCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1805,7 +1805,7 @@ var sectorsExpiredCmd = &cli.Command{
return xerrors.Errorf("getting lookback tipset: %w", err)
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerAPI.ActorAddress(ctx)
if err != nil {
return xerrors.Errorf("getting actor address: %w", err)
}
@ -1813,7 +1813,7 @@ var sectorsExpiredCmd = &cli.Command{
// toCheck is a working bitfield which will only contain terminated sectors
toCheck := bitfield.New()
{
sectors, err := nodeApi.SectorsList(ctx)
sectors, err := minerAPI.SectorsList(ctx)
if err != nil {
return xerrors.Errorf("getting sector list: %w", err)
}
@ -1890,7 +1890,7 @@ var sectorsExpiredCmd = &cli.Command{
err = toCheck.ForEach(func(u uint64) error {
s := abi.SectorNumber(u)
st, err := nodeApi.SectorsStatus(ctx, s, true)
st, err := minerAPI.SectorsStatus(ctx, s, true)
if err != nil {
fmt.Printf("%d:\tError getting status: %s\n", u, err)
return nil
@ -1933,7 +1933,7 @@ var sectorsExpiredCmd = &cli.Command{
for _, number := range toRemove {
fmt.Printf("Removing sector\t%s:\t", color.YellowString("%d", number))
err := nodeApi.SectorRemove(ctx, number)
err := minerAPI.SectorRemove(ctx, number)
if err != nil {
color.Red("ERROR: %s\n", err.Error())
} else {
@ -1965,7 +1965,7 @@ var sectorsBatchingPendingCommit = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -1973,7 +1973,7 @@ var sectorsBatchingPendingCommit = &cli.Command{
ctx := lcli.ReqContext(cctx)
if cctx.Bool("publish-now") {
res, err := api.SectorCommitFlush(ctx)
res, err := minerAPI.SectorCommitFlush(ctx)
if err != nil {
return xerrors.Errorf("flush: %w", err)
}
@ -2000,7 +2000,7 @@ var sectorsBatchingPendingCommit = &cli.Command{
return nil
}
pending, err := api.SectorCommitPending(ctx)
pending, err := minerAPI.SectorCommitPending(ctx)
if err != nil {
return xerrors.Errorf("getting pending deals: %w", err)
}
@ -2027,7 +2027,7 @@ var sectorsBatchingPendingPreCommit = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -2035,7 +2035,7 @@ var sectorsBatchingPendingPreCommit = &cli.Command{
ctx := lcli.ReqContext(cctx)
if cctx.Bool("publish-now") {
res, err := api.SectorPreCommitFlush(ctx)
res, err := minerAPI.SectorPreCommitFlush(ctx)
if err != nil {
return xerrors.Errorf("flush: %w", err)
}
@ -2058,7 +2058,7 @@ var sectorsBatchingPendingPreCommit = &cli.Command{
return nil
}
pending, err := api.SectorPreCommitPending(ctx)
pending, err := minerAPI.SectorPreCommitPending(ctx)
if err != nil {
return xerrors.Errorf("getting pending deals: %w", err)
}
@ -2079,14 +2079,14 @@ var sectorsRefreshPieceMatchingCmd = &cli.Command{
Name: "match-pending-pieces",
Usage: "force a refreshed match of pending pieces to open sectors without manually waiting for more deals",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
if err := nodeApi.SectorMatchPendingPiecesToOpenSectors(ctx); err != nil {
if err := minerAPI.SectorMatchPendingPiecesToOpenSectors(ctx); err != nil {
return err
}
@ -2219,14 +2219,14 @@ var sectorsNumbersInfoCmd = &cli.Command{
Name: "info",
Usage: "view sector assigner state",
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
am, err := api.SectorNumAssignerMeta(ctx)
am, err := minerAPI.SectorNumAssignerMeta(ctx)
if err != nil {
return err
}
@ -2253,14 +2253,14 @@ var sectorsNumbersReservationsCmd = &cli.Command{
Name: "reservations",
Usage: "list sector number reservations",
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
rs, err := api.SectorNumReservations(ctx)
rs, err := minerAPI.SectorNumReservations(ctx)
if err != nil {
return err
}
@ -2303,7 +2303,7 @@ var sectorsNumbersReserveCmd = &cli.Command{
},
ArgsUsage: "[reservation name] [reserved ranges]",
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -2319,7 +2319,7 @@ var sectorsNumbersReserveCmd = &cli.Command{
return xerrors.Errorf("parsing ranges: %w", err)
}
return api.SectorNumReserve(ctx, cctx.Args().First(), bf, cctx.Bool("force"))
return minerAPI.SectorNumReserve(ctx, cctx.Args().First(), bf, cctx.Bool("force"))
},
}
@ -2328,7 +2328,7 @@ var sectorsNumbersFreeCmd = &cli.Command{
Usage: "remove sector number reservations",
ArgsUsage: "[reservation name]",
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -2339,6 +2339,6 @@ var sectorsNumbersFreeCmd = &cli.Command{
return xerrors.Errorf("expected 1 argument: [reservation name]")
}
return api.SectorNumFree(ctx, cctx.Args().First())
return minerAPI.SectorNumFree(ctx, cctx.Args().First())
},
}

62
cmd/lotus-miner/storage.go
View File

@ -109,7 +109,7 @@ over time
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -172,7 +172,7 @@ over time
}
}
return nodeApi.StorageAddLocal(ctx, p)
return minerApi.StorageAddLocal(ctx, p)
},
}
@ -186,7 +186,7 @@ var storageDetachCmd = &cli.Command{
},
ArgsUsage: "[path]",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -206,7 +206,7 @@ var storageDetachCmd = &cli.Command{
return xerrors.Errorf("pass --really-do-it to execute the action")
}
return nodeApi.StorageDetachLocal(ctx, p)
return minerApi.StorageDetachLocal(ctx, p)
},
}
@ -228,7 +228,7 @@ var storageRedeclareCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -241,11 +241,11 @@ var storageRedeclareCmd = &cli.Command{
if cctx.IsSet("id") {
id := storiface.ID(cctx.String("id"))
return nodeApi.StorageRedeclareLocal(ctx, &id, cctx.Bool("drop-missing"))
return minerApi.StorageRedeclareLocal(ctx, &id, cctx.Bool("drop-missing"))
}
if cctx.Bool("all") {
return nodeApi.StorageRedeclareLocal(ctx, nil, cctx.Bool("drop-missing"))
return minerApi.StorageRedeclareLocal(ctx, nil, cctx.Bool("drop-missing"))
}
return xerrors.Errorf("either --all or --id must be specified")
@ -270,19 +270,19 @@ var storageListCmd = &cli.Command{
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
st, err := nodeApi.StorageList(ctx)
st, err := minerApi.StorageList(ctx)
if err != nil {
return err
}
local, err := nodeApi.StorageLocal(ctx)
local, err := minerApi.StorageLocal(ctx)
if err != nil {
return err
}
@ -295,7 +295,7 @@ var storageListCmd = &cli.Command{
sorted := make([]fsInfo, 0, len(st))
for id, decls := range st {
st, err := nodeApi.StorageStat(ctx, id)
st, err := minerApi.StorageStat(ctx, id)
if err != nil {
sorted = append(sorted, fsInfo{ID: id, sectors: decls})
continue
@ -325,7 +325,7 @@ var storageListCmd = &cli.Command{
fmt.Printf("%s:\n", s.ID)
pingStart := time.Now()
st, err := nodeApi.StorageStat(ctx, s.ID)
st, err := minerApi.StorageStat(ctx, s.ID)
if err != nil {
fmt.Printf("\t%s: %s:\n", color.RedString("Error"), err)
continue
@ -398,7 +398,7 @@ var storageListCmd = &cli.Command{
color.BlueString("Caches: %d", cnt[2]),
types.SizeStr(types.NewInt(uint64(st.Reserved))))
si, err := nodeApi.StorageInfo(ctx, s.ID)
si, err := minerApi.StorageInfo(ctx, s.ID)
if err != nil {
return err
}
@ -469,14 +469,14 @@ var storageFindCmd = &cli.Command{
Usage: "find sector in the storage system",
ArgsUsage: "[sector number]",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
ma, err := nodeApi.ActorAddress(ctx)
ma, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -500,27 +500,27 @@ var storageFindCmd = &cli.Command{
Number: abi.SectorNumber(snum),
}
u, err := nodeApi.StorageFindSector(ctx, sid, storiface.FTUnsealed, 0, false)
u, err := minerApi.StorageFindSector(ctx, sid, storiface.FTUnsealed, 0, false)
if err != nil {
return xerrors.Errorf("finding unsealed: %w", err)
}
s, err := nodeApi.StorageFindSector(ctx, sid, storiface.FTSealed, 0, false)
s, err := minerApi.StorageFindSector(ctx, sid, storiface.FTSealed, 0, false)
if err != nil {
return xerrors.Errorf("finding sealed: %w", err)
}
c, err := nodeApi.StorageFindSector(ctx, sid, storiface.FTCache, 0, false)
c, err := minerApi.StorageFindSector(ctx, sid, storiface.FTCache, 0, false)
if err != nil {
return xerrors.Errorf("finding cache: %w", err)
}
us, err := nodeApi.StorageFindSector(ctx, sid, storiface.FTUpdate, 0, false)
us, err := minerApi.StorageFindSector(ctx, sid, storiface.FTUpdate, 0, false)
if err != nil {
return xerrors.Errorf("finding sealed: %w", err)
}
uc, err := nodeApi.StorageFindSector(ctx, sid, storiface.FTUpdateCache, 0, false)
uc, err := minerApi.StorageFindSector(ctx, sid, storiface.FTUpdateCache, 0, false)
if err != nil {
return xerrors.Errorf("finding cache: %w", err)
}
@ -582,7 +582,7 @@ var storageFindCmd = &cli.Command{
sts.updatecache = true
}
local, err := nodeApi.StorageLocal(ctx)
local, err := minerApi.StorageLocal(ctx)
if err != nil {
return err
}
@ -644,7 +644,7 @@ var storageListSectorsCmd = &cli.Command{
color.NoColor = !cctx.Bool("color")
}
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -658,12 +658,12 @@ var storageListSectorsCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
sectors, err := nodeApi.SectorsList(ctx)
sectors, err := minerApi.SectorsList(ctx)
if err != nil {
return xerrors.Errorf("listing sectors: %w", err)
}
maddr, err := nodeApi.ActorAddress(ctx)
maddr, err := minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -706,7 +706,7 @@ var storageListSectorsCmd = &cli.Command{
var list []entry
for _, sector := range sectors {
st, err := nodeApi.SectorsStatus(ctx, sector, false)
st, err := minerApi.SectorsStatus(ctx, sector, false)
if err != nil {
return xerrors.Errorf("getting sector status for sector %d: %w", sector, err)
}
@ -716,7 +716,7 @@ var storageListSectorsCmd = &cli.Command{
}
for _, ft := range storiface.PathTypes {
si, err := nodeApi.StorageFindSector(ctx, sid(sector), ft, mi.SectorSize, false)
si, err := minerApi.StorageFindSector(ctx, sid(sector), ft, mi.SectorSize, false)
if err != nil {
return xerrors.Errorf("find sector %d: %w", sector, err)
}
@ -869,7 +869,7 @@ var storageCleanupCmd = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
@ -884,7 +884,7 @@ var storageCleanupCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
if cctx.Bool("removed") {
if err := cleanupRemovedSectorData(ctx, api, napi); err != nil {
if err := cleanupRemovedSectorData(ctx, minerAPI, napi); err != nil {
return err
}
}
@ -962,20 +962,20 @@ var storageLocks = &cli.Command{
Name: "locks",
Usage: "show active sector locks",
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetStorageMinerAPI(cctx)
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
ctx := lcli.ReqContext(cctx)
locks, err := api.StorageGetLocks(ctx)
locks, err := minerAPI.StorageGetLocks(ctx)
if err != nil {
return err
}
for _, lock := range locks.Locks {
st, err := api.SectorsStatus(ctx, lock.Sector.Number, false)
st, err := minerAPI.SectorsStatus(ctx, lock.Sector.Number, false)
if err != nil {
return xerrors.Errorf("getting sector status(%d): %w", lock.Sector.Number, err)
}

24
cmd/lotus-shed/actor.go
View File

@ -74,13 +74,13 @@ var actorWithdrawCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -233,13 +233,13 @@ var actorSetOwnerCmd = &cli.Command{
}
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -339,13 +339,13 @@ var actorControlList = &cli.Command{
ctx := lcli.ReqContext(cctx)
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -448,13 +448,13 @@ var actorControlSet = &cli.Command{
ctx := lcli.ReqContext(cctx)
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -590,13 +590,13 @@ var actorProposeChangeWorker = &cli.Command{
}
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -720,13 +720,13 @@ var actorConfirmChangeWorker = &cli.Command{
}
if maddr.Empty() {
minerAPI, closer, err := lcli.GetStorageMinerAPI(cctx)
minerApi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
maddr, err = minerAPI.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}

8
cmd/lotus-shed/sectors.go
View File

@ -90,13 +90,13 @@ var terminateSectorCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
if maddr.Empty() {
api, acloser, err := lcli.GetStorageMinerAPI(cctx)
minerApi, acloser, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer acloser()
maddr, err = api.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}
@ -222,13 +222,13 @@ var terminateSectorPenaltyEstimationCmd = &cli.Command{
ctx := lcli.ReqContext(cctx)
if maddr.Empty() {
api, acloser, err := lcli.GetStorageMinerAPI(cctx)
minerApi, acloser, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer acloser()
maddr, err = api.ActorAddress(ctx)
maddr, err = minerApi.ActorAddress(ctx)
if err != nil {
return err
}