aboutsummaryrefslogtreecommitdiffstats
path: root/accounts/keystore
diff options
context:
space:
mode:
authorSjonHortensius <SjonHortensius@users.noreply.github.com>2019-08-12 17:00:38 +0800
committerPéter Szilágyi <peterke@gmail.com>2019-08-12 17:00:38 +0800
commit36994e4e0b2be1362f99048d08b907628088e2bb (patch)
tree2499ca40e033b681e05dc9de19420cddd6adf204 /accounts/keystore
parentc9cdf144d55f6bbd75314e812eeefc18d7e8c40e (diff)
downloadgo-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar.gz
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar.bz2
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar.lz
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar.xz
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.tar.zst
go-tangerine-36994e4e0b2be1362f99048d08b907628088e2bb.zip
all: replace passPHRASE with passWORD in user interactions (#19932)
* Ref #19906 - replace passPHRASE with passWORD in any user interactions this skips doccomments and variablenames to minimize impact. It does however include a rename of the `ethkey` `changepassphrase` parameter * console: fix JavaScript error capitalization
Diffstat (limited to 'accounts/keystore')
-rw-r--r--accounts/keystore/keystore.go2
-rw-r--r--accounts/keystore/plain_test.go2
-rw-r--r--accounts/keystore/testdata/keystore/README2
3 files changed, 3 insertions, 3 deletions
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: