aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/key_store_plain.go
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/key_store_plain.go')
-rw-r--r--crypto/key_store_plain.go14
1 files changed, 5 insertions, 9 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
}