aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPaweł Bylica <pawel.bylica@imapp.pl>2015-03-03 01:46:55 +0800
committerPaweł Bylica <pawel.bylica@imapp.pl>2015-03-03 01:46:55 +0800
commit24003c76d12b83602ca93be375a3bc19f4fb3f1b (patch)
tree90e77c349df52806d78693f93704b92786fcb693 /crypto
parent9c6d9dfc5c9fdd9aeb8f4d9926ed98008b849f2e (diff)
parent65cad14f9b27db396d036f47814d4843d947ac43 (diff)
downloaddexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.gz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.bz2
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.lz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.xz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.zst
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.zip
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'crypto')
-rw-r--r--crypto/key_store_plain.go14
-rw-r--r--crypto/key_store_test.go9
2 files changed, 10 insertions, 13 deletions
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index 6b76962a0..338a4a2c3 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -30,7 +30,6 @@ import (
"io"
"io/ioutil"
"os"
- "os/user"
"path"
)
@@ -48,12 +47,6 @@ type keyStorePlain struct {
keysDirPath string
}
-// TODO: copied from cmd/ethereum/flags.go
-func DefaultDataDir() string {
- usr, _ := user.Current()
- return path.Join(usr.HomeDir, ".ethereum")
-}
-
func NewKeyStorePlain(path string) KeyStore2 {
return &keyStorePlain{path}
}
@@ -126,8 +119,11 @@ func GetKeyAddresses(keysDirPath string) (addresses [][]byte, err error) {
}
addresses = make([][]byte, len(fileInfos))
for i, fileInfo := range fileInfos {
- addresses[i] = make([]byte, 40)
- addresses[i] = []byte(fileInfo.Name())
+ address, err := hex.DecodeString(fileInfo.Name())
+ if err != nil {
+ continue
+ }
+ addresses[i] = address
}
return addresses, err
}
diff --git a/crypto/key_store_test.go b/crypto/key_store_test.go
index 485d8f536..11531d460 100644
--- a/crypto/key_store_test.go
+++ b/crypto/key_store_test.go
@@ -2,12 +2,13 @@ package crypto
import (
"github.com/ethereum/go-ethereum/crypto/randentropy"
+ "github.com/ethereum/go-ethereum/ethutil"
"reflect"
"testing"
)
func TestKeyStorePlain(t *testing.T) {
- ks := NewKeyStorePlain(DefaultDataDir())
+ ks := NewKeyStorePlain(ethutil.DefaultDataDir())
pass := "" // not used but required by API
k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil {
@@ -35,7 +36,7 @@ func TestKeyStorePlain(t *testing.T) {
}
func TestKeyStorePassphrase(t *testing.T) {
- ks := NewKeyStorePassphrase(DefaultDataDir())
+ ks := NewKeyStorePassphrase(ethutil.DefaultDataDir())
pass := "foo"
k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil {
@@ -61,7 +62,7 @@ func TestKeyStorePassphrase(t *testing.T) {
}
func TestKeyStorePassphraseDecryptionFail(t *testing.T) {
- ks := NewKeyStorePassphrase(DefaultDataDir())
+ ks := NewKeyStorePassphrase(ethutil.DefaultDataDir())
pass := "foo"
k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil {
@@ -89,7 +90,7 @@ func TestImportPreSaleKey(t *testing.T) {
// python pyethsaletool.py genwallet
// with password "foo"
fileContent := "{\"encseed\": \"26d87f5f2bf9835f9a47eefae571bc09f9107bb13d54ff12a4ec095d01f83897494cf34f7bed2ed34126ecba9db7b62de56c9d7cd136520a0427bfb11b8954ba7ac39b90d4650d3448e31185affcd74226a68f1e94b1108e6e0a4a91cdd83eba\", \"ethaddr\": \"d4584b5f6229b7be90727b0fc8c6b91bb427821f\", \"email\": \"gustav.simonsson@gmail.com\", \"btcaddr\": \"1EVknXyFC68kKNLkh6YnKzW41svSRoaAcx\"}"
- ks := NewKeyStorePassphrase(DefaultDataDir())
+ ks := NewKeyStorePassphrase(ethutil.DefaultDataDir())
pass := "foo"
_, err := ImportPreSaleKey(ks, []byte(fileContent), pass)
if err != nil {