keyring.List() returns no error if there are no keys

cosmos · Sep 17, 2021 · 3aaffce · 3aaffce
1 parent a9a8e41
commit 3aaffce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/client/keys/list_test.go b/client/keys/list_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"errors"
 
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
@@ -49,10 +48,10 @@ func Test_runListCmd(t *testing.T) {
 	testData := []struct {
 		name    string
 		kbDir   string
-		wantErr error
+		wantErr bool
 	}{
-		{"keybase: empty", kbHome1, keyring.ErrNoKeysAvailable},
-		{"keybase: w/key", kbHome2, keyring.ErrNoKeysAvailable},
+		{"keybase: empty", kbHome1, false},
+		{"keybase: w/key", kbHome2, false},
 	}
 	for _, tt := range testData {
 		tt := tt
@@ -63,7 +62,7 @@ func Test_runListCmd(t *testing.T) {
 				fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
 			})
 
-			if err := cmd.ExecuteContext(ctx); err != nil && !errors.Is(err, tt.wantErr) {
+			if err := cmd.ExecuteContext(ctx); (err != nil) != tt.wantErr {
 				t.Errorf("runListCmd() error = %v, wantErr %v", err, tt.wantErr)
 			}
 
@@ -73,7 +72,7 @@ func Test_runListCmd(t *testing.T) {
 				fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
 			})
 
-			if err := cmd.ExecuteContext(ctx); err != nil && !errors.Is(err, tt.wantErr) {
+			if err := cmd.ExecuteContext(ctx); (err != nil) != tt.wantErr {
 				t.Errorf("runListCmd() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

diff --git a/crypto/keyring/keyring.go b/crypto/keyring/keyring.go
@@ -49,7 +49,6 @@ const (
 var (
 	_                          Keyring = &keystore{}
 	maxPassphraseEntryAttempts         = 3
-	ErrNoKeysAvailable                 = errors.New("no keys available for migration")
 )
 
 // Keyring exposes operations over a backend supported by github.com/99designs/keyring.
@@ -854,7 +853,7 @@ func (ks keystore) MigrateAll() (bool, error) {
 	}
 
 	if len(keys) == 0 {
-		return false, ErrNoKeysAvailable
+		return false, nil
 	}
 
 	var migrated bool

diff --git a/crypto/keyring/keyring_test.go b/crypto/keyring/keyring_test.go
@@ -68,7 +68,7 @@ func TestKeyManagementKeyRing(t *testing.T) {
 
 	// Check empty state
 	records, err := kb.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, records)
 
 	_, _, err = kb.NewMnemonic(n1, English, sdk.FullFundraiserPath, DefaultBIP39Passphrase, notSupportedAlgo{})
@@ -478,7 +478,7 @@ func TestInMemoryKeyManagement(t *testing.T) {
 
 	// Check empty state
 	l, err := cstore.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, l)
 
 	_, _, err = cstore.NewMnemonic(n1, English, sdk.FullFundraiserPath, DefaultBIP39Passphrase, notSupportedAlgo{})
@@ -912,7 +912,7 @@ func TestAltKeyring_List(t *testing.T) {
 	require.NoError(t, err)
 
 	list, err := kr.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, list)
 
 	// Fails on creating unsupported pubKeyType
@@ -1012,7 +1012,7 @@ func TestAltKeyring_Delete(t *testing.T) {
 	require.NoError(t, err)
 
 	list, err = kr.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, list)
 }
 
@@ -1035,7 +1035,7 @@ func TestAltKeyring_DeleteByAddress(t *testing.T) {
 	require.NoError(t, err)
 
 	list, err = kr.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, list)
 }
 
@@ -1045,7 +1045,7 @@ func TestAltKeyring_SaveOfflineKey(t *testing.T) {
 	require.NoError(t, err)
 
 	list, err := kr.List()
-	require.EqualError(t, err, ErrNoKeysAvailable.Error())
+	require.NoError(t, err)
 	require.Empty(t, list)
 
 	key := someKey