diff options
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/errors.go | 2 | ||||
| -rw-r--r-- | accounts/external/backend.go | 6 | ||||
| -rw-r--r-- | accounts/keystore/keystore.go | 2 | ||||
| -rw-r--r-- | accounts/keystore/plain_test.go | 2 | ||||
| -rw-r--r-- | accounts/keystore/testdata/keystore/README | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/accounts/errors.go b/accounts/errors.go index 40b21ed17..2fed35f9d 100644 --- a/accounts/errors.go +++ b/accounts/errors.go @@ -35,7 +35,7 @@ var ErrNotSupported = errors.New("not supported") // ErrInvalidPassphrase is returned when a decryption operation receives a bad // passphrase. -var ErrInvalidPassphrase = errors.New("invalid passphrase") +var ErrInvalidPassphrase = errors.New("invalid password") // ErrWalletAlreadyOpen is returned if a wallet is attempted to be opened the // second time. diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 371273762..6089ca984 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -204,14 +204,14 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio } func (api *ExternalSigner) SignTextWithPassphrase(account accounts.Account, passphrase string, text []byte) ([]byte, error) { - return []byte{}, fmt.Errorf("passphrase-operations not supported on external signers") + return []byte{}, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) SignTxWithPassphrase(account accounts.Account, passphrase string, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) { - return nil, fmt.Errorf("passphrase-operations not supported on external signers") + return nil, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) SignDataWithPassphrase(account accounts.Account, passphrase, mimeType string, data []byte) ([]byte, error) { - return nil, fmt.Errorf("passphrase-operations not supported on external signers") + return nil, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) listAccounts() ([]common.Address, error) { diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 434e03504..5b55175b1 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -43,7 +43,7 @@ import ( var ( ErrLocked = accounts.NewAuthNeededError("password or unlock") ErrNoMatch = errors.New("no key for given address or file") - ErrDecrypt = errors.New("could not decrypt key with given passphrase") + ErrDecrypt = errors.New("could not decrypt key with given password") ) // KeyStoreType is the reflect type of a keystore backend. diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 32852a0ad..b83192583 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -96,7 +96,7 @@ func TestKeyStorePassphraseDecryptionFail(t *testing.T) { t.Fatal(err) } if _, err = ks.GetKey(k1.Address, account.URL.Path, "bar"); err != ErrDecrypt { - t.Fatalf("wrong error for invalid passphrase\ngot %q\nwant %q", err, ErrDecrypt) + t.Fatalf("wrong error for invalid password\ngot %q\nwant %q", err, ErrDecrypt) } } diff --git a/accounts/keystore/testdata/keystore/README b/accounts/keystore/testdata/keystore/README index a5a86f964..6af9ac3f1 100644 --- a/accounts/keystore/testdata/keystore/README +++ b/accounts/keystore/testdata/keystore/README @@ -1,5 +1,5 @@ This directory contains accounts for testing. -The passphrase that unlocks them is "foobar". +The password that unlocks them is "foobar". The "good" key files which are supposed to be loadable are: |