worker api: better grouping

api/api_worker.go

@@ -23,8 +23,8 @@ type WorkerAPI interface {
 
 	storiface.WorkerCalls
 
-	DisableTask(ctx context.Context, tt sealtasks.TaskType) error
+	TaskDisable(ctx context.Context, tt sealtasks.TaskType) error
-	EnableTask(ctx context.Context, tt sealtasks.TaskType) error
+	TaskEnable(ctx context.Context, tt sealtasks.TaskType) error
 
 	// Storage / Other
 	Remove(ctx context.Context, sector abi.SectorID) error

api/apistruct/struct.go

@@ -388,8 +388,8 @@ type WorkerStruct struct {
 		ReadPiece       func(context.Context, io.Writer, storage.SectorRef, storiface.UnpaddedByteIndex, abi.UnpaddedPieceSize) (storiface.CallID, error)                                                             `perm:"admin"`
 		Fetch           func(context.Context, storage.SectorRef, storiface.SectorFileType, storiface.PathType, storiface.AcquireMode) (storiface.CallID, error)                                                       `perm:"admin"`
 
-		DisableTask func(ctx context.Context, tt sealtasks.TaskType) error `perm:"admin"`
+		TaskDisable func(ctx context.Context, tt sealtasks.TaskType) error `perm:"admin"`
-		EnableTask  func(ctx context.Context, tt sealtasks.TaskType) error `perm:"admin"`
+		TaskEnable  func(ctx context.Context, tt sealtasks.TaskType) error `perm:"admin"`
 
 		Remove          func(ctx context.Context, sector abi.SectorID) error `perm:"admin"`
 		StorageAddLocal func(ctx context.Context, path string) error         `perm:"admin"`
@@ -1576,12 +1576,12 @@ func (w *WorkerStruct) Fetch(ctx context.Context, id storage.SectorRef, fileType
 	return w.Internal.Fetch(ctx, id, fileType, ptype, am)
 }
 
-func (w *WorkerStruct) DisableTask(ctx context.Context, tt sealtasks.TaskType) error {
+func (w *WorkerStruct) TaskDisable(ctx context.Context, tt sealtasks.TaskType) error {
-	return w.Internal.DisableTask(ctx, tt)
+	return w.Internal.TaskDisable(ctx, tt)
 }
 
-func (w *WorkerStruct) EnableTask(ctx context.Context, tt sealtasks.TaskType) error {
+func (w *WorkerStruct) TaskEnable(ctx context.Context, tt sealtasks.TaskType) error {
-	return w.Internal.EnableTask(ctx, tt)
+	return w.Internal.TaskEnable(ctx, tt)
 }
 
 func (w *WorkerStruct) Remove(ctx context.Context, sector abi.SectorID) error {

cmd/lotus-seal-worker/tasks.go

@@ -41,14 +41,14 @@ var tasksEnableCmd = &cli.Command{
 	Name:      "enable",
 	Usage:     "Enable a task type",
 	ArgsUsage: "[" + settableStr + "]",
-	Action:    taskAction(api.WorkerAPI.EnableTask),
+	Action:    taskAction(api.WorkerAPI.TaskEnable),
 }
 
 var tasksDisableCmd = &cli.Command{
 	Name:      "disable",
 	Usage:     "Disable a task type",
 	ArgsUsage: "[" + settableStr + "]",
-	Action:    taskAction(api.WorkerAPI.DisableTask),
+	Action:    taskAction(api.WorkerAPI.TaskDisable),
 }
 
 func taskAction(tf func(a api.WorkerAPI, ctx context.Context, tt sealtasks.TaskType) error) func(cctx *cli.Context) error {

documentation/en/api-methods-worker.md

@@ -9,10 +9,6 @@
   * [Version](#Version)
 * [Add](#Add)
   * [AddPiece](#AddPiece)
-* [Disable](#Disable)
-  * [DisableTask](#DisableTask)
-* [Enable](#Enable)
-  * [EnableTask](#EnableTask)
 * [Finalize](#Finalize)
   * [FinalizeSector](#FinalizeSector)
 * [Move](#Move)
@@ -33,6 +29,8 @@
 * [Storage](#Storage)
   * [StorageAddLocal](#StorageAddLocal)
 * [Task](#Task)
+  * [TaskDisable](#TaskDisable)
+  * [TaskEnable](#TaskEnable)
   * [TaskTypes](#TaskTypes)
 * [Unseal](#Unseal)
   * [UnsealPiece](#UnsealPiece)
@@ -185,40 +183,6 @@ Response:
 }
 ```
 
-## Disable
-
-
-### DisableTask
-There are not yet any comments for this method.
-
-Perms: admin
-
-Inputs:
-```json
-[
-  "seal/v0/commit/2"
-]
-```
-
-Response: `{}`
-
-## Enable
-
-
-### EnableTask
-There are not yet any comments for this method.
-
-Perms: admin
-
-Inputs:
-```json
-[
-  "seal/v0/commit/2"
-]
-```
-
-Response: `{}`
-
 ## Finalize
 
 
@@ -540,6 +504,34 @@ Response: `{}`
 ## Task
 
 
+### TaskDisable
+There are not yet any comments for this method.
+
+Perms: admin
+
+Inputs:
+```json
+[
+  "seal/v0/commit/2"
+]
+```
+
+Response: `{}`
+
+### TaskEnable
+There are not yet any comments for this method.
+
+Perms: admin
+
+Inputs:
+```json
+[
+  "seal/v0/commit/2"
+]
+```
+
+Response: `{}`
+
 ### TaskTypes
 TaskType -> Weight
 

extern/sector-storage/worker_local.go

@@ -464,7 +464,7 @@ func (l *LocalWorker) TaskTypes(context.Context) (map[sealtasks.TaskType]struct{
 	return l.acceptTasks, nil
 }
 
-func (l *LocalWorker) DisableTask(ctx context.Context, tt sealtasks.TaskType) error {
+func (l *LocalWorker) TaskDisable(ctx context.Context, tt sealtasks.TaskType) error {
 	l.taskLk.Lock()
 	defer l.taskLk.Unlock()
 
@@ -472,7 +472,7 @@ func (l *LocalWorker) DisableTask(ctx context.Context, tt sealtasks.TaskType) er
 	return nil
 }
 
-func (l *LocalWorker) EnableTask(ctx context.Context, tt sealtasks.TaskType) error {
+func (l *LocalWorker) TaskEnable(ctx context.Context, tt sealtasks.TaskType) error {
 	l.taskLk.Lock()
 	defer l.taskLk.Unlock()