aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 23:08:09 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 23:08:09 +0800
commit0646cc8d14bc398b28029bda9aefdc9e87bfdc52 (patch)
tree4e54c6cd4669d1906336bbacf097b616518866ed
parent97d22be318add5c5f9e8cb8906c6786ae7a33623 (diff)
parentc3f5403b643f67df4061cb570f3b19ba95f83ba2 (diff)
downloadgo-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar.gz
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar.bz2
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar.lz
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar.xz
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.tar.zst
go-tangerine-0646cc8d14bc398b28029bda9aefdc9e87bfdc52.zip
Merge pull request #1453 from ethersphere/frozen-accounts
accounts, crypto: fixed file naming for windows
-rw-r--r--accounts/account_manager.go3
-rw-r--r--crypto/key_store_plain.go2
2 files changed, 1 insertions, 4 deletions
diff --git a/accounts/account_manager.go b/accounts/account_manager.go
index c9e06261a..2a9d9b0ae 100644
--- a/accounts/account_manager.go
+++ b/accounts/account_manager.go
@@ -228,8 +228,5 @@ func (am *Manager) ImportPreSaleKey(keyJSON []byte, password string) (acc Accoun
if err != nil {
return
}
- if err = am.keyStore.StoreKey(key, password); err != nil {
- return
- }
return Account{Address: key.Address}, nil
}
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index 428d01e25..8c405ebcd 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -189,7 +189,7 @@ func toISO8601(t time.Time) string {
} else {
tz = fmt.Sprintf("%03d00", offset/3600)
}
- return fmt.Sprintf("%04d-%02d-%02dT%02d:%02d:%02d.%09d%s", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), tz)
+ return fmt.Sprintf("%04d-%02d-%02dT%02d-%02d-%02d.%09d%s", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), tz)
}
func getKeyAddresses(keysDirPath string) (addresses []common.Address, err error) {