Skip to content

Commit f3b82c5

Browse files
committed
Merge branch 'master' into release/v0.38.0
2 parents 2c26efa + d0ff973 commit f3b82c5

File tree

20 files changed

+45
-48
lines changed

20 files changed

+45
-48
lines changed

client/context/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func GetFromFields(input io.Reader, from string, genOnly bool) (sdk.AccAddress,
274274
return addr, "", nil
275275
}
276276

277-
keybase, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(),
277+
keybase, err := keys.NewKeyring(sdk.KeyringServiceName(),
278278
viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), input)
279279
if err != nil {
280280
return nil, "", err

client/keys/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func getKeybase(transient bool, buf io.Reader) (keys.Keybase, error) {
8686
return keys.NewInMemory(), nil
8787
}
8888

89-
return keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
89+
return keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
9090
}
9191

9292
func runAddCmd(cmd *cobra.Command, args []string) error {

client/keys/add_ledger_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func Test_runAddCmdLedgerWithCustomCoinType(t *testing.T) {
5151
require.NoError(t, runAddCmd(cmd, []string{"keyname1"}))
5252

5353
// Now check that it has been stored properly
54-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
54+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
5555
require.NoError(t, err)
5656
require.NotNil(t, kb)
5757
defer func() {
@@ -98,7 +98,7 @@ func Test_runAddCmdLedger(t *testing.T) {
9898
require.NoError(t, runAddCmd(cmd, []string{"keyname1"}))
9999

100100
// Now check that it has been stored properly
101-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
101+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
102102
require.NoError(t, err)
103103
require.NotNil(t, kb)
104104
defer func() {

client/keys/add_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func Test_runAddCmdBasic(t *testing.T) {
3131
mockIn.Reset("testpass1\ntestpass1\n")
3232
} else {
3333
mockIn.Reset("y\n")
34-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
34+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
3535
require.NoError(t, err)
3636
defer func() {
3737
kb.Delete("keyname1", "", false)

client/keys/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private keys stored in a ledger device cannot be deleted with the CLI.
4343
func runDeleteCmd(cmd *cobra.Command, args []string) error {
4444
buf := bufio.NewReader(cmd.InOrStdin())
4545

46-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
46+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
4747
if err != nil {
4848
return err
4949
}

client/keys/delete_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func Test_runDeleteCmd(t *testing.T) {
2727
fakeKeyName1 := "runDeleteCmd_Key1"
2828
fakeKeyName2 := "runDeleteCmd_Key2"
2929
if !runningUnattended {
30-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
30+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
3131
require.NoError(t, err)
3232
defer func() {
3333
kb.Delete("runDeleteCmd_Key1", "", false)
@@ -41,7 +41,7 @@ func Test_runDeleteCmd(t *testing.T) {
4141
viper.Set(flags.FlagHome, kbHome)
4242

4343
// Now
44-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
44+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), kbHome, mockIn)
4545
require.NoError(t, err)
4646
if runningUnattended {
4747
mockIn.Reset("testpass1\ntestpass1\n")

client/keys/export.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func ExportKeyCommand() *cobra.Command {
2525

2626
func runExportCmd(cmd *cobra.Command, args []string) error {
2727
buf := bufio.NewReader(cmd.InOrStdin())
28-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
28+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
2929
if err != nil {
3030
return err
3131
}

client/keys/export_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func Test_runExportCmd(t *testing.T) {
2323
viper.Set(flags.FlagHome, kbHome)
2424

2525
// create a key
26-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
26+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
2727
require.NoError(t, err)
2828
if !runningUnattended {
2929
defer func() {

client/keys/import.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func ImportKeyCommand() *cobra.Command {
2626

2727
func runImportCmd(cmd *cobra.Command, args []string) error {
2828
buf := bufio.NewReader(cmd.InOrStdin())
29-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
29+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), buf)
3030
if err != nil {
3131
return err
3232
}

client/keys/import_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func Test_runImportCmd(t *testing.T) {
2525
viper.Set(flags.FlagHome, kbHome)
2626

2727
if !runningUnattended {
28-
kb, err := keys.NewKeyring(sdk.GetConfig().GetKeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
28+
kb, err := keys.NewKeyring(sdk.KeyringServiceName(), viper.GetString(flags.FlagKeyringBackend), viper.GetString(flags.FlagHome), mockIn)
2929
require.NoError(t, err)
3030
defer func() {
3131
kb.Delete("keyname1", "", false)

0 commit comments

Comments
 (0)