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

fix wallet import from a file

Browse Source
This commit is contained in:
whyrusleeping 2019-11-12 12:00:40 -08:00
parent 036bc578ae
commit 2472f62ba0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/wallet.go
View File

@ -201,24 +201,24 @@ var walletImport = &cli.Command{
defer closer() defer closer()
ctx := ReqContext(cctx) ctx := ReqContext(cctx)
var data []byte var hexdata []byte
if !cctx.Args().Present() || cctx.Args().First() == "-" { if !cctx.Args().Present() || cctx.Args().First() == "-" {
indata, err := ioutil.ReadAll(os.Stdin) indata, err := ioutil.ReadAll(os.Stdin)
if err != nil { if err != nil {
return err return err
} }
dec, err := hex.DecodeString(strings.TrimSpace(string(indata))) hexdata = indata
if err != nil {
return err
}
data = dec
} else { } else {
fdata, err := ioutil.ReadFile(cctx.Args().First()) fdata, err := ioutil.ReadFile(cctx.Args().First())
if err != nil { if err != nil {
return err return err
} }
data = fdata hexdata = fdata
}
data, err := hex.DecodeString(strings.TrimSpace(string(hexdata)))
if err != nil {
return err
} }
var ki types.KeyInfo var ki types.KeyInfo