add RuntimeSubsystems API method; use it in lotus-miner info

node/builder_miner.go

@@ -72,7 +72,7 @@ func ConfigStorageMiner(c interface{}) Option {
 	return Options(
 		ConfigCommon(&cfg.Common, enableLibp2pNode),
 
-		Override(new(api.MinerSubsystems), modules.ExtractEnabledMinerSubsystems(cfg.Subsystems)),
+		Override(new([]api.MinerSubsystem), modules.AddMinerSubsystems(cfg.Subsystems)),
 		Override(new(stores.LocalStorage), From(new(repo.LockedRepo))),
 		Override(new(*stores.Local), modules.LocalStorage),
 		Override(new(*stores.Remote), modules.RemoteStorage),
@@ -216,6 +216,7 @@ func StorageMiner(out *api.StorageMiner, subsystemsCfg config.MinerSubsystemConf
 
 		func(s *Settings) error {
 			resAPI := &impl.StorageMinerAPI{}
+
 			s.invokes[ExtractApiKey] = fx.Populate(resAPI)
 			*out = resAPI
 			return nil

node/impl/storminer.go

@@ -23,8 +23,8 @@ import (
 	"github.com/filecoin-project/go-address"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-fil-markets/piecestore"
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	retrievalmarket "github.com/filecoin-project/go-fil-markets/retrievalmarket"
+	storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 
 	sectorstorage "github.com/filecoin-project/lotus/extern/sector-storage"
@@ -48,11 +48,11 @@ import (
 type StorageMinerAPI struct {
 	fx.In
 
+	Subsystems api.MinerSubsystems
+
 	api.Common
 	api.Net
 
-	EnabledSubsystems api.MinerSubsystems
-
 	Full        api.FullNode
 	LocalStore  *stores.Local
 	RemoteStore *stores.Remote
@@ -706,7 +706,7 @@ func (sm *StorageMinerAPI) ComputeProof(ctx context.Context, ssi []builtin.Secto
 }
 
 func (sm *StorageMinerAPI) RuntimeSubsystems(context.Context) (res api.MinerSubsystems, err error) {
-	return sm.EnabledSubsystems, nil
+	return sm.Subsystems, nil
 }
 
 var _ api.StorageMiner = &StorageMinerAPI{}

node/modules/storageminer.go

@@ -1008,18 +1008,19 @@ func mutateCfg(r repo.LockedRepo, mutator func(*config.StorageMiner)) error {
 	return multierr.Combine(typeErr, setConfigErr)
 }
 
-func ExtractEnabledMinerSubsystems(cfg config.MinerSubsystemConfig) (res api.MinerSubsystems) {
+func AddMinerSubsystems(cfg config.MinerSubsystemConfig) (res api.MinerSubsystems) {
 	if cfg.EnableMining {
-		res = append(res, api.SubsystemMining)
+		res = append(res, api.MiningSubsystem)
 	}
 	if cfg.EnableSealing {
-		res = append(res, api.SubsystemSealing)
+		res = append(res, api.SealingSubsystem)
 	}
 	if cfg.EnableSectorStorage {
-		res = append(res, api.SubsystemSectorStorage)
+		res = append(res, api.SectorStorageSubsystem)
 	}
 	if cfg.EnableMarkets {
-		res = append(res, api.SubsystemMarkets)
+		res = append(res, api.MarketsSubsystem)
 	}
-	return res
+
+	return
 }