Merge pull request #1453 from ethersphere/frozen-accounts

obscuren · obscuren · commit 0646cc8d14bc · 2015-07-09T08:08:09.000-07:00
accounts, crypto: fixed file naming for windows
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,5 @@ func (am *Manager) ImportPreSaleKey(keyJSON []byte, password string) (acc Accoun`
`228`	`228`	`if err != nil {`
`229`	`229`	`return`
`230`	`230`	`}`
`231`		`- if err = am.keyStore.StoreKey(key, password); err != nil {`
`232`		`- return`
`233`		`- }`
`234`	`231`	`return Account{Address: key.Address}, nil`
`235`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ func toISO8601(t time.Time) string {`
`189`	`189`	`} else {`
`190`	`190`	`tz = fmt.Sprintf("%03d00", offset/3600)`
`191`	`191`	`}`
`192`		`- 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)`
	`192`	`+ 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)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`func getKeyAddresses(keysDirPath string) (addresses []common.Address, err error) {`