aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2019-06-18 16:24:11 +0800
committerGitHub <noreply@github.com>2019-06-18 16:24:11 +0800
commitcf47ee53393feda3e4e57d5648261643a5009792 (patch)
tree84b7a731a4b9e4a1380ad2917a09ecd31ac99007
parentd6ccfd92f736bdfac1a9ed094d201d2a3256dfb2 (diff)
parent2046d66fe5146911620168caefa17ce73d3b6085 (diff)
downloadgo-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar.gz
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar.bz2
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar.lz
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar.xz
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.tar.zst
go-tangerine-cf47ee53393feda3e4e57d5648261643a5009792.zip
Merge pull request #19731 from holiman/fix_19707
accounts/keystore: fix #19707, avoid keyword as variable name
-rw-r--r--accounts/keystore/keystore_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go
index 6fb0a7808..a691c5062 100644
--- a/accounts/keystore/keystore_test.go
+++ b/accounts/keystore/keystore_test.go
@@ -379,9 +379,9 @@ func tmpKeyStore(t *testing.T, encrypted bool) (string, *KeyStore) {
if err != nil {
t.Fatal(err)
}
- new := NewPlaintextKeyStore
+ newKs := NewPlaintextKeyStore
if encrypted {
- new = func(kd string) *KeyStore { return NewKeyStore(kd, veryLightScryptN, veryLightScryptP) }
+ newKs = func(kd string) *KeyStore { return NewKeyStore(kd, veryLightScryptN, veryLightScryptP) }
}
- return d, new(d)
+ return d, newKs(d)
}