Skip to content

Commit 80bcd2f

Browse files
committed
Switch away from deprecated terminal package
1 parent fa41f42 commit 80bcd2f

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ require (
3535
go.etcd.io/bbolt v1.3.5
3636
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
3737
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
38+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
3839
google.golang.org/grpc v1.32.0
3940
google.golang.org/protobuf v1.23.0
4041
)

internal/prompt/prompt.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"decred.org/dcrwallet/v2/errors"
1818
"decred.org/dcrwallet/v2/walletseed"
1919
"github.com/decred/dcrd/hdkeychain/v3"
20-
"golang.org/x/crypto/ssh/terminal"
20+
"golang.org/x/term"
2121
)
2222

2323
// ProvideSeed is used to prompt for the wallet seed which maybe required during
@@ -53,7 +53,7 @@ func ProvidePrivPassphrase() ([]byte, error) {
5353
prompt := "Enter the private passphrase of your wallet: "
5454
for {
5555
fmt.Print(prompt)
56-
pass, err := terminal.ReadPassword(int(os.Stdin.Fd()))
56+
pass, err := term.ReadPassword(int(os.Stdin.Fd()))
5757
if err != nil {
5858
return nil, err
5959
}
@@ -125,8 +125,8 @@ func PassPrompt(reader *bufio.Reader, prefix string, confirm bool) ([]byte, erro
125125
var pass []byte
126126
var err error
127127
fd := int(os.Stdin.Fd())
128-
if terminal.IsTerminal(fd) {
129-
pass, err = terminal.ReadPassword(fd)
128+
if term.IsTerminal(fd) {
129+
pass, err = term.ReadPassword(fd)
130130
} else {
131131
pass, err = reader.ReadBytes('\n')
132132
if errors.Is(err, io.EOF) {
@@ -147,7 +147,7 @@ func PassPrompt(reader *bufio.Reader, prefix string, confirm bool) ([]byte, erro
147147
}
148148

149149
fmt.Print("Confirm passphrase: ")
150-
confirm, err := terminal.ReadPassword(int(os.Stdin.Fd()))
150+
confirm, err := term.ReadPassword(int(os.Stdin.Fd()))
151151
if err != nil {
152152
return nil, err
153153
}

0 commit comments

Comments
 (0)