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

Merge pull request #1342 from filecoin-project/fix/miner-init-redux

Browse Source 
Fix/miner init redux
This commit is contained in:
Łukasz Magiera 2020-03-06 23:24:45 +01:00 committed by GitHub
commit d70fe95104
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/lotus-storage-miner/init.go
View File

@ -519,9 +519,10 @@ func configureStorageMiner(ctx context.Context, api lapi.FullNode, addr address.
return nil
}
func createStorageMiner(ctx context.Context, api lapi.FullNode, peerid peer.ID, cctx *cli.Context) (addr address.Address, err error) {
func createStorageMiner(ctx context.Context, api lapi.FullNode, peerid peer.ID, cctx *cli.Context) (address.Address, error) {
log.Info("Creating StorageMarket.CreateStorageMiner message")
var err error
var owner address.Address
if cctx.String("owner") != "" {
owner, err = address.NewFromString(cctx.String("owner"))
@ -595,5 +596,5 @@ func createStorageMiner(ctx context.Context, api lapi.FullNode, peerid peer.ID,
}
log.Infof("New storage miners address is: %s (%s)", retval.IDAddress, retval.RobustAddress)
return addr, nil
return retval.IDAddress, nil
}

2
storage/sealmgr/advmgr/storage.go
View File

@ -58,7 +58,7 @@ func (st *storage) openPath(p string) error {
if err != nil {
if os.IsNotExist(err) {
if err := os.MkdirAll(filepath.Join(p, t.String()), 0755); err != nil {
return xerrors.Errorf("mkdir '%s': %w", filepath.Join(p, t.String()), err)
return xerrors.Errorf("openPath mkdir '%s': %w", filepath.Join(p, t.String()), err)
}
continue