Clarify No Wallet Found Error Messages (#7609)

* clarify no wallet found error messages

* extract error

* fix tests

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>

validator/accounts/accounts_backup.go

@@ -41,9 +41,7 @@ const (
 // keystore.json files, which are compatible with importing in other eth2 clients.
 func BackupAccountsCli(cliCtx *cli.Context) error {
 	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, errors.New(
-			"no wallet found, nothing to backup. Create a new wallet by running wallet create",
-		)
+		return nil, wallet.ErrNoWalletFound
 	})
 	if err != nil {
 		return errors.Wrap(err, "could not initialize wallet")

validator/accounts/accounts_delete.go

@@ -28,9 +28,7 @@ type DeleteAccountConfig struct {
 // This function uses the CLI to extract necessary values.
 func DeleteAccountCli(cliCtx *cli.Context) error {
 	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, errors.New(
-			"no wallet found, nothing to delete",
-		)
+		return nil, wallet.ErrNoWalletFound
 	})
 	if err != nil {
 		return errors.Wrap(err, "could not open wallet")

validator/accounts/accounts_exit.go

@@ -76,9 +76,7 @@ func ExitAccountsCli(cliCtx *cli.Context, r io.Reader) error {
 
 func prepareWallet(cliCtx *cli.Context) ([][48]byte, keymanager.IKeymanager, error) {
 	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, errors.New(
-			"no wallet found, no accounts to exit",
-		)
+		return nil, wallet.ErrNoWalletFound
 	})
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "could not open wallet")

validator/accounts/accounts_list.go

@@ -21,9 +21,7 @@ import (
 // ListAccountsCli displays all available validator accounts in a Prysm wallet.
 func ListAccountsCli(cliCtx *cli.Context) error {
 	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, errors.New(
-			"no wallet found, no accounts to list",
-		)
+		return nil, wallet.ErrNoWalletFound
 	})
 	if err != nil {
 		return errors.Wrap(err, "could not open wallet")

validator/accounts/wallet/wallet.go

@@ -49,7 +49,9 @@ const (
 var (
 	// ErrNoWalletFound signifies there was no wallet directory found on-disk.
 	ErrNoWalletFound = errors.New(
-		"no wallet found at path, please create a new wallet using `./prysm.sh validator wallet create`",
+		"no wallet found. You can create a new wallet with validator wallet create." +
+			"If you already did, perhaps you created a wallet in a custom directory, which you can specify using " +
+			"--wallet-dir=/path/to/my/wallet",
 	)
 	// KeymanagerKindSelections as friendly text.
 	KeymanagerKindSelections = map[keymanager.Kind]string{

validator/accounts/wallet/wallet_test.go

@@ -140,7 +140,7 @@ func Test_IsValid_RandomFiles(t *testing.T) {
 	require.NoError(t, os.MkdirAll(path, params.BeaconIoConfig().ReadWriteExecutePermissions), "Failed to create directory")
 
 	valid, err = wallet.IsValid(path)
-	require.ErrorContains(t, "no wallet found at path", err)
+	require.ErrorContains(t, "no wallet found", err)
 	require.Equal(t, false, valid)
 
 	walletDir := filepath.Join(path, "direct")

validator/accounts/wallet_edit.go

@@ -16,9 +16,7 @@ import (
 // for HD wallets, and more.
 func EditWalletConfigurationCli(cliCtx *cli.Context) error {
 	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, errors.New(
-			"no wallet found, no configuration to edit",
-		)
+		return nil, wallet.ErrNoWalletFound
 	})
 	if err != nil {
 		return errors.Wrap(err, "could not open wallet")

validator/node/node.go

@@ -170,7 +170,7 @@ func (s *ValidatorClient) initializeFromCLI(cliCtx *cli.Context) error {
 	} else {
 		// Read the wallet from the specified path.
 		w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-			return nil, errors.New("no wallet found, create a new one with validator wallet create")
+			return nil, wallet.ErrNoWalletFound
 		})
 		if err != nil {
 			return errors.Wrap(err, "could not open wallet")

validator/rpc/wallet.go

@@ -23,7 +23,6 @@ import (
 const (
 	checkExistsErrMsg   = "Could not check if wallet exists"
 	checkValidityErrMsg = "Could not check if wallet is valid"
-	noWalletMsg         = "No wallet found at path"
 	invalidWalletMsg    = "Directory does not contain a valid wallet"
 )