diff --git a/cmd/lotus-storage-miner/init.go b/cmd/lotus-storage-miner/init.go index c54794913..9e95feb96 100644 --- a/cmd/lotus-storage-miner/init.go +++ b/cmd/lotus-storage-miner/init.go @@ -123,6 +123,11 @@ var initCmd = &cli.Command{ } if pssb := cctx.String("pre-sealed-sectors"); pssb != "" { + pssb, err := homedir.Expand(pssb) + if err != nil { + return err + } + log.Infof("moving pre-sealed-sectors from %s into newly created storage miner repo", pssb) lr, err := r.Lock(repo.StorageMiner) if err != nil { diff --git a/node/modules/testing/genesis.go b/node/modules/testing/genesis.go index 4f6081c04..f61498e2b 100644 --- a/node/modules/testing/genesis.go +++ b/node/modules/testing/genesis.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/mitchellh/go-homedir" "io" "io/ioutil" "os" @@ -67,11 +68,16 @@ func MakeGenesisMem(out io.Writer, gmc *gen.GenMinerCfg) func(bs dtypes.ChainBlo } } -func MakeGenesis(outFile, preseal string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { +func MakeGenesis(outFile, presealInfo string) func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { return func(bs dtypes.ChainBlockstore, w *wallet.Wallet) modules.Genesis { return func() (*types.BlockHeader, error) { glog.Warn("Generating new random genesis block, note that this SHOULD NOT happen unless you are setting up new network") - fdata, err := ioutil.ReadFile(preseal) + presealInfo, err := homedir.Expand(presealInfo) + if err != nil { + return nil, err + } + + fdata, err := ioutil.ReadFile(presealInfo) if err != nil { return nil, err }