Merge pull request #2317 from filcloud/issue-2304

fix issue 2304: ux improvements

node/builder.go

@@ -108,7 +108,7 @@ const (
 
 	RegisterClientValidatorKey
 
-	// storage miner
+	// miner
 	GetParamsKey
 	HandleDealsKey
 	HandleRetrievalKey
@@ -274,7 +274,7 @@ func Online() Option {
 			Override(new(*market.FundMgr), market.NewFundMgr),
 		),
 
-		// Storage miner
+		// miner
 		ApplyIf(func(s *Settings) bool { return s.nodeType == repo.StorageMiner },
 			Override(new(api.Common), From(new(common.CommonAPI))),
 			Override(new(sectorstorage.StorageAuth), modules.StorageAuth),

node/config/def.go

@@ -25,7 +25,7 @@ type FullNode struct {
 
 // // Common
 
-// StorageMiner is a storage miner config
+// StorageMiner is a miner config
 type StorageMiner struct {
 	Common
 

node/modules/dtypes/miner.go

@@ -27,12 +27,12 @@ type ConsiderOnlineRetrievalDealsConfigFunc func() (bool, error)
 type SetConsiderOnlineRetrievalDealsConfigFunc func(bool) error
 
 // StorageDealPieceCidBlocklistConfigFunc is a function which reads from miner
-// config to obtain a list of CIDs for which the storage miner will not accept
+// config to obtain a list of CIDs for which the miner will not accept
 // storage proposals.
 type StorageDealPieceCidBlocklistConfigFunc func() ([]cid.Cid, error)
 
 // SetStorageDealPieceCidBlocklistConfigFunc is a function which is used to set a
-// list of CIDs for which the storage miner will reject deal proposals.
+// list of CIDs for which the miner will reject deal proposals.
 type SetStorageDealPieceCidBlocklistConfigFunc func([]cid.Cid) error
 
 // ConsiderOfflineStorageDealsConfigFunc is a function which reads from miner

node/modules/dtypes/shutdown.go

@@ -1,5 +1,5 @@
 package dtypes
 
 // ShutdownChan is a channel to which you send a value if you intend to shut
-// down the daemon (or storage miner), including the node and RPC server.
+// down the daemon (or miner), including the node and RPC server.
 type ShutdownChan chan struct{}

node/modules/storageminer.go

@@ -585,7 +585,7 @@ func mutateCfg(r repo.LockedRepo, mutator func(*config.StorageMiner)) error {
 	setConfigErr := r.SetConfig(func(raw interface{}) {
 		cfg, ok := raw.(*config.StorageMiner)
 		if !ok {
-			typeErr = errors.New("expected storage miner config")
+			typeErr = errors.New("expected miner config")
 			return
 		}