Refactors references to MemoryLruCache in ethcore (#6693)

openethereum · Oct 15, 2017 · 786ea98 · 786ea98
1 parent ef5ef99
commit 786ea98
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -32,6 +32,7 @@ ethcore-logger = { path = "../logger" }
 ethcore-stratum = { path = "../stratum" }
 ethcore-util = { path = "../util" }
 ethcore-bigint = { path = "../util/bigint" }
+memory_cache = { path = "../util/memory_cache" }
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }

diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
@@ -14,6 +14,7 @@ log = "0.3"
 vm = { path = "../vm" }
 hash = { path = "../../util/hash" }
 parking_lot = "0.4"
+memory_cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"

diff --git a/ethcore/evm/src/interpreter/shared_cache.rs b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -19,7 +19,7 @@ use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
 use bigint::hash::H256;
 use parking_lot::Mutex;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 use bit_set::BitSet;
 use super::super::instructions;
 

diff --git a/ethcore/evm/src/lib.rs b/ethcore/evm/src/lib.rs
@@ -23,6 +23,7 @@ extern crate parking_lot;
 extern crate heapsize;
 extern crate vm;
 extern crate hash;
+extern crate memory_cache;
 
 #[macro_use]
 extern crate lazy_static;

diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -40,6 +40,7 @@ stats = { path = "../../util/stats" }
 hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }
 kvdb = { path = "../../util/kvdb" }
+memory_cache = { path = "../../util/memory_cache" }
 
 [features]
 default = []

diff --git a/ethcore/light/src/cache.rs b/ethcore/light/src/cache.rs
@@ -29,7 +29,7 @@ use time::{SteadyTime, Duration};
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.
 #[derive(Debug, Clone, PartialEq, Eq)]

diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs
@@ -92,6 +92,7 @@ extern crate vm;
 extern crate hash;
 extern crate triehash;
 extern crate kvdb;
+extern crate memory_cache;
 
 #[cfg(feature = "ipc")]
 extern crate ethcore_ipc as ipc;

diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -27,7 +27,7 @@ use parking_lot::{Mutex, RwLock};
 
 use util::*;
 use bytes::Bytes;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 use unexpected::Mismatch;
 use rlp::{UntrustedRlp, RlpStream};
 

diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
@@ -129,6 +129,7 @@ extern crate bloomable;
 extern crate vm;
 extern crate wasm;
 extern crate ethcore_util as util;
+extern crate memory_cache;
 
 #[macro_use]
 extern crate macros;

diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
@@ -17,7 +17,7 @@
 use std::collections::{VecDeque, HashSet};
 use std::sync::Arc;
 use lru_cache::LruCache;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 use util::journaldb::JournalDB;
 use kvdb::{KeyValueDB, DBTransaction};
 use bigint::hash::H256;