From dcf9754a4b377023e6d6bf3e8a846e9ea8f59d29 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Tue, 24 Sep 2019 09:36:57 -0700 Subject: [PATCH] remove test boolean flag from NewKeybaseKeyring --- client/keys/migrate.go | 2 +- crypto/keys/lazy_keybase_keyring.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/keys/migrate.go b/client/keys/migrate.go index 8e7e0a36d101..238c72f8a341 100644 --- a/client/keys/migrate.go +++ b/client/keys/migrate.go @@ -47,7 +47,7 @@ func runMigrateCmd(cmd *cobra.Command, args []string) error { if viper.GetBool(flags.FlagDryRun) { keyring = keys.NewTestKeybaseKeyring(types.GetConfig().GetKeyringServiceName(), rootDir) } else { - keyring = keys.NewKeybaseKeyring(types.GetConfig().GetKeyringServiceName(), rootDir, buf, false) + keyring = keys.NewKeybaseKeyring(types.GetConfig().GetKeyringServiceName(), rootDir, buf) } for _, key := range oldKeys { diff --git a/crypto/keys/lazy_keybase_keyring.go b/crypto/keys/lazy_keybase_keyring.go index 0bdd4fc00725..7f9224e0250b 100644 --- a/crypto/keys/lazy_keybase_keyring.go +++ b/crypto/keys/lazy_keybase_keyring.go @@ -34,7 +34,7 @@ type lazyKeybaseKeyring struct { // NewKeybaseKeyring creates a new instance of a lazy keybase using a Keyring as // the persistence layer. -func NewKeybaseKeyring(name string, dir string, userInput io.Reader, test bool) Keybase { +func NewKeybaseKeyring(name string, dir string, userInput io.Reader) Keybase { _, err := keyring.Open(keyring.Config{ ServiceName: name, }) @@ -42,10 +42,11 @@ func NewKeybaseKeyring(name string, dir string, userInput io.Reader, test bool) panic(err) } - return lazyKeybaseKeyring{name: name, dir: dir, userInput: userInput, test: test} + return lazyKeybaseKeyring{name: name, dir: dir, userInput: userInput, test: false} } -// New creates a new instance of a lazy keybase. +// NewTestKeybaseKeyring creates a new instance of a keyring keybase +// for testing purposes that does not prompt users for password. func NewTestKeybaseKeyring(name string, dir string) Keybase { if _, err := keyring.Open(keyring.Config{ AllowedBackends: []keyring.BackendType{"file"},