Fix rebase issues.
This commit is contained in:
parent
5555d39ea9
commit
00a500ef3c
|
@ -549,7 +549,7 @@ proc pickPasswordAndSaveWallet(rng: var BrHmacDrbgContext,
|
||||||
"installation and can be changed at any time."
|
"installation and can be changed at any time."
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
let password =
|
var password =
|
||||||
block:
|
block:
|
||||||
let prompt = "Please enter a password: "
|
let prompt = "Please enter a password: "
|
||||||
let confirm = "Please repeat the password: "
|
let confirm = "Please repeat the password: "
|
||||||
|
@ -600,12 +600,10 @@ proc pickPasswordAndSaveWallet(rng: var BrHmacDrbgContext,
|
||||||
let status = saveWallet(wallet, outWalletFile)
|
let status = saveWallet(wallet, outWalletFile)
|
||||||
if status.isErr:
|
if status.isErr:
|
||||||
burnMem(password)
|
burnMem(password)
|
||||||
burnMem(confirmedPassword)
|
|
||||||
return err("failure to create wallet file due to " & status.error)
|
return err("failure to create wallet file due to " & status.error)
|
||||||
|
|
||||||
info "Wallet file written", path = outWalletFile
|
info "Wallet file written", path = outWalletFile
|
||||||
burnMem(password)
|
burnMem(password)
|
||||||
burnMem(confirmedPassword)
|
|
||||||
return ok WalletPathPair(wallet: wallet, path: outWalletFile)
|
return ok WalletPathPair(wallet: wallet, path: outWalletFile)
|
||||||
|
|
||||||
proc createWalletInteractively*(
|
proc createWalletInteractively*(
|
||||||
|
|
Loading…
Reference in New Issue