Merge pull request #1453 from ethersphere/frozen-accounts

accounts, crypto: fixed file naming for windows
This commit is contained in:
Jeffrey Wilcke 2015-07-09 08:08:09 -07:00
commit 0646cc8d14
2 changed files with 1 additions and 4 deletions

@ -228,8 +228,5 @@ func (am *Manager) ImportPreSaleKey(keyJSON []byte, password string) (acc Accoun
if err != nil { if err != nil {
return return
} }
if err = am.keyStore.StoreKey(key, password); err != nil {
return
}
return Account{Address: key.Address}, nil return Account{Address: key.Address}, nil
} }

@ -189,7 +189,7 @@ func toISO8601(t time.Time) string {
} else { } else {
tz = fmt.Sprintf("%03d00", offset/3600) 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) { func getKeyAddresses(keysDirPath string) (addresses []common.Address, err error) {