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

update imports and path

Browse Source
This commit is contained in:
wanghui 2019-11-16 14:47:04 +08:00
parent c9714b1708
commit ba889391b5
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,16 @@
package main package main
import ( import (
"os"
"context" "context"
"crypto/rand" "crypto/rand"
"os"
"github.com/ipfs/go-datastore"
"github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/mitchellh/go-homedir"
"golang.org/x/xerrors"
"gopkg.in/urfave/cli.v2"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
@ -12,11 +19,6 @@ import (
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/ipfs/go-datastore"
"github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"golang.org/x/xerrors"
"gopkg.in/urfave/cli.v2"
) )
var initCmd = &cli.Command{ var initCmd = &cli.Command{
@ -102,18 +104,14 @@ var initCmd = &cli.Command{
return err return err
} }
lr, err := r.Lock(repo.StorageMiner) if err := storageMinerInit(ctx, cctx, api, r); err != nil {
log.Errorf("Failed to initialize lotus-storage-miner: %+v", err)
path, err := homedir.Expand(repoPath)
if err != nil { if err != nil {
return err return err
} }
log.Infof("Cleaning up %s after attempt...", path)
if err := storageMinerInit(ctx, cctx, api, lr); err != nil { if err := os.RemoveAll(path); err != nil {
log.Errorf("Failed to initialize lotus-storage-miner: %+v", err)
log.Infof("Cleaning up %s after attempt...", lr.Path())
if err := lr.Close(); err != nil {
log.Errorf("Failed to close storage repo: %s", err)
}
if err := os.RemoveAll(lr.Path()); err != nil {
log.Errorf("Failed to clean up failed storage repo: %s", err) log.Errorf("Failed to clean up failed storage repo: %s", err)
} }
return xerrors.Errorf("Storage-miner init failed") return xerrors.Errorf("Storage-miner init failed")
@ -121,15 +119,18 @@ var initCmd = &cli.Command{
// TODO: Point to setting storage price, maybe do it interactively or something // TODO: Point to setting storage price, maybe do it interactively or something
log.Info("Storage miner successfully created, you can now start it with 'lotus-storage-miner run'") log.Info("Storage miner successfully created, you can now start it with 'lotus-storage-miner run'")
if err := lr.Close(); err != nil {
log.Errorf("Failed to close storage repo: %s", err)
}
return nil return nil
}, },
} }
func storageMinerInit(ctx context.Context, cctx *cli.Context, api api.FullNode, lr repo.LockedRepo) error { func storageMinerInit(ctx context.Context, cctx *cli.Context, api api.FullNode, r repo.Repo) error {
lr, err := r.Lock(repo.StorageMiner)
if err != nil {
return err
}
defer lr.Close()
log.Info("Initializing libp2p identity") log.Info("Initializing libp2p identity")
p2pSk, err := makeHostKey(lr) p2pSk, err := makeHostKey(lr)