Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Backporting to beta #3525

Merged
merged 17 commits into from
Nov 18, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Wallet names shouldn't include address.
(Actually wallet files shouldn't contain it either, but we'll
leave that for a later PR).
  • Loading branch information
gavofyork authored and arkpar committed Nov 18, 2016

Unverified

The signing certificate or its chain could not be verified.
commit 91d0247188935dd38f531ee6a2a582f42ba3c208
3 changes: 2 additions & 1 deletion ethstore/src/dir/disk.rs
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ use std::collections::HashMap;
use time;
use ethkey::Address;
use {json, SafeAccount, Error};
use json::UUID;
use super::KeyDirectory;

const IGNORED_FILES: &'static [&'static str] = &["thumbs.db", "address_book.json"];
@@ -112,7 +113,7 @@ impl KeyDirectory for DiskDirectory {
// build file path
let filename = account.filename.as_ref().cloned().unwrap_or_else(|| {
let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
format!("UTC--{}Z--{:?}", timestamp, account.address)
format!("UTC--{}Z--{}", timestamp, UUID::from(account.id))
});

// update account filename