move timer.rs to ethcore (#6437)

openethereum · Sep 2, 2017 · 0b5285c · 0b5285c
1 parent 6b8c9ca
commit 0b5285c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -24,7 +24,8 @@ use itertools::Itertools;
 
 // util
 use hash::keccak;
-use util::{Bytes, PerfTimer, Mutex, RwLock, MutexGuard};
+use timer::PerfTimer;
+use util::{Bytes, Mutex, RwLock, MutexGuard};
 use util::{journaldb, DBValue, TrieFactory, Trie};
 use util::{U256, H256, Address, H2048};
 use util::trie::TrieSpec;

diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
@@ -151,6 +151,7 @@ pub mod service;
 pub mod snapshot;
 pub mod spec;
 pub mod state;
+pub mod timer;
 pub mod trace;
 pub mod transaction;
 pub mod verification;

diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
@@ -19,6 +19,7 @@ use std::collections::{BTreeMap, HashSet};
 use std::sync::Arc;
 
 use util::*;
+use timer::PerfTimer;
 use using_queue::{UsingQueue, GetAction};
 use account_provider::{AccountProvider, SignError as AccountError};
 use state::State;

diff --git a/util/src/timer.rs → ethcore/src/timer.rs b/util/src/timer.rs → ethcore/src/timer.rs
diff --git a/util/src/lib.rs b/util/src/lib.rs
@@ -131,7 +131,6 @@ pub mod nibblevec;
 pub mod semantic_version;
 pub mod snappy;
 pub mod cache;
-mod timer;
 
 pub use misc::*;
 pub use hashdb::*;
@@ -142,7 +141,6 @@ pub use triehash::*;
 pub use trie::{Trie, TrieMut, TrieDB, TrieDBMut, TrieFactory, TrieError, SecTrieDB, SecTrieDBMut};
 pub use semantic_version::*;
 pub use kvdb::*;
-pub use timer::*;
 pub use error::*;
 pub use bytes::*;
 pub use vector::*;