From da9d4b7bc712d409658bd0a11c0a66bce9c994ee Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Wed, 10 Jan 2018 13:35:18 +0100 Subject: [PATCH] dissolve util (#7460) * ethereum-types refactor in progress * ethereum-types refactor in progress * ethereum-types refactor in progress * ethereum-types refactor in progress * ethereum-types refactor finished * removed obsolete util/src/lib.rs * removed commented out code --- Cargo.toml | 2 +- src/fatdb.rs | 2 +- src/fatdbmut.rs | 2 +- src/lib.rs | 4 ++-- src/lookup.rs | 2 +- src/recorder.rs | 4 ++-- src/sectriedb.rs | 2 +- src/sectriedbmut.rs | 2 +- src/standardmap.rs | 2 +- src/triedb.rs | 6 +++--- src/triedbmut.rs | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ae0027c..cf8d789 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ elastic-array = "0.9" log = "0.3" rand = "0.3" ethcore-bytes = { version = "0.1.0", path = "../bytes" } -ethcore-bigint = { version = "0.2.1", path = "../bigint" } +ethereum-types = "0.1" keccak-hash = { version = "0.1.0", path = "../hash" } hashdb = { version = "0.1.1", path = "../hashdb" } rlp = { version = "0.2.1", path = "../rlp" } diff --git a/src/fatdb.rs b/src/fatdb.rs index 4602482..d428ff8 100644 --- a/src/fatdb.rs +++ b/src/fatdb.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use bigint::hash::H256; +use ethereum_types::H256; use keccak::keccak; use hashdb::HashDB; use super::{TrieDB, Trie, TrieDBIterator, TrieItem, TrieIterator, Query}; diff --git a/src/fatdbmut.rs b/src/fatdbmut.rs index 8267585..4b7f2de 100644 --- a/src/fatdbmut.rs +++ b/src/fatdbmut.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use bigint::hash::H256; +use ethereum_types::H256; use keccak::keccak; use hashdb::{HashDB, DBValue}; use super::{TrieDBMut, TrieMut}; diff --git a/src/lib.rs b/src/lib.rs index 83ab090..aefa1d5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,7 +16,7 @@ //! Trie interface and implementation. extern crate rand; -extern crate ethcore_bigint as bigint; +extern crate ethereum_types; extern crate keccak_hash as keccak; extern crate rlp; extern crate hashdb; @@ -29,7 +29,7 @@ extern crate ethcore_logger; extern crate log; use std::{fmt, error}; -use bigint::hash::H256; +use ethereum_types::H256; use keccak::KECCAK_NULL_RLP; use hashdb::{HashDB, DBValue}; diff --git a/src/lookup.rs b/src/lookup.rs index 168cd00..75a5b28 100644 --- a/src/lookup.rs +++ b/src/lookup.rs @@ -19,7 +19,7 @@ use hashdb::HashDB; use nibbleslice::NibbleSlice; use rlp::Rlp; -use bigint::hash::H256; +use ethereum_types::H256; use super::{TrieError, Query}; use super::node::Node; diff --git a/src/recorder.rs b/src/recorder.rs index ce52ff7..35a515b 100644 --- a/src/recorder.rs +++ b/src/recorder.rs @@ -17,7 +17,7 @@ //! Trie query recorder. use keccak::keccak; -use bigint::hash::H256; +use ethereum_types::H256; use bytes::Bytes; /// A record of a visited node. @@ -83,7 +83,7 @@ impl Recorder { #[cfg(test)] mod tests { use super::*; - use bigint::hash::H256; + use ethereum_types::H256; #[test] fn basic_recorder() { diff --git a/src/sectriedb.rs b/src/sectriedb.rs index 2bf55dd..a9176d0 100644 --- a/src/sectriedb.rs +++ b/src/sectriedb.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use bigint::hash::H256; +use ethereum_types::H256; use keccak::keccak; use hashdb::HashDB; use super::triedb::TrieDB; diff --git a/src/sectriedbmut.rs b/src/sectriedbmut.rs index b3790f2..b0436b2 100644 --- a/src/sectriedbmut.rs +++ b/src/sectriedbmut.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use bigint::hash::H256; +use ethereum_types::H256; use keccak::keccak; use hashdb::{HashDB, DBValue}; use super::triedbmut::TrieDBMut; diff --git a/src/standardmap.rs b/src/standardmap.rs index 866dc6e..d71f1ee 100644 --- a/src/standardmap.rs +++ b/src/standardmap.rs @@ -17,7 +17,7 @@ //! Key-value datastore with a modified Merkle tree. use keccak::keccak; use bytes::*; -use bigint::hash::*; +use ethereum_types::H256; use rlp::encode; /// Alphabet to use when creating words for insertion into tries. diff --git a/src/triedb.rs b/src/triedb.rs index 39776d1..38f7e2a 100644 --- a/src/triedb.rs +++ b/src/triedb.rs @@ -21,7 +21,7 @@ use rlp::*; use super::node::{Node, OwnedNode}; use super::lookup::Lookup; use super::{Trie, TrieItem, TrieError, TrieIterator, Query}; -use bigint::hash::H256; +use ethereum_types::H256; use bytes::{ToPretty, Bytes}; /// A `Trie` implementation using a generic `HashDB` backing database. @@ -34,12 +34,12 @@ use bytes::{ToPretty, Bytes}; /// extern crate patricia_trie as trie; /// extern crate hashdb; /// extern crate memorydb; -/// extern crate ethcore_bigint as bigint; +/// extern crate ethereum_types; /// /// use trie::*; /// use hashdb::*; /// use memorydb::*; -/// use bigint::hash::*; +/// use ethereum_types::H256; /// /// fn main() { /// let mut memdb = MemoryDB::new(); diff --git a/src/triedbmut.rs b/src/triedbmut.rs index 497fe72..98d6c83 100644 --- a/src/triedbmut.rs +++ b/src/triedbmut.rs @@ -30,7 +30,7 @@ use hashdb::DBValue; use std::collections::{HashSet, VecDeque}; use std::mem; use std::ops::Index; -use bigint::hash::H256; +use ethereum_types::H256; use elastic_array::ElasticArray1024; use keccak::{KECCAK_NULL_RLP}; @@ -265,13 +265,13 @@ impl<'a> Index<&'a StorageHandle> for NodeStorage { /// extern crate keccak_hash; /// extern crate hashdb; /// extern crate memorydb; -/// extern crate ethcore_bigint as bigint; +/// extern crate ethereum_types; /// /// use keccak_hash::KECCAK_NULL_RLP; /// use trie::*; /// use hashdb::*; /// use memorydb::*; -/// use bigint::hash::*; +/// use ethereum_types::H256; /// /// fn main() { /// let mut memdb = MemoryDB::new();