separate trie from util and make its dependencies into libs:

* bytes
* hashdb
* memorydb
* nibbleslice
* nibblevec
This commit is contained in:
Hawstein
2017-09-07 02:47:45 +08:00
parent 79659bdc76
commit ade37be25b
182 changed files with 497 additions and 251 deletions

View File

@@ -40,6 +40,7 @@ ethcore-io = { path = "../util/io" }
ethcore-ipc = { path = "../ipc/rpc" }
ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" }
ethcore-bytes = { path = "../util/bytes" }
ethcore = { path = "../ethcore" }
ethcrypto = { path = "../ethcrypto" }
ethkey = { path = "../ethkey" }

View File

@@ -47,6 +47,7 @@ extern crate jsonrpc_pubsub;
extern crate ethash;
extern crate ethcore;
extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore_devtools as devtools;
extern crate ethcore_io as io;
extern crate ethcore_ipc;

View File

@@ -29,7 +29,8 @@ use rlp;
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::{H256, H520};
use util::{Address, Bytes};
use util::Address;
use bytes::Bytes;
use parking_lot::{Mutex, RwLock};
use stats::Corpus;

View File

@@ -15,7 +15,8 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use util::{Address, Bytes};
use util::Address;
use bytes::Bytes;
use v1::types::{Origin, TransactionCondition};
/// Transaction request coming from RPC

View File

@@ -18,7 +18,7 @@ use std::iter::repeat;
use rand::{Rng, OsRng};
use ethkey::{Public, Secret, math};
use crypto;
use util::Bytes;
use bytes::Bytes;
use jsonrpc_core::Error;
use v1::helpers::errors;
@@ -98,7 +98,7 @@ fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common_sha
#[cfg(test)]
mod tests {
use util::Bytes;
use bytes::Bytes;
use rustc_hex::FromHex;
use super::{encrypt_document, decrypt_document, decrypt_document_with_shadow};

View File

@@ -40,7 +40,7 @@ use light::on_demand::OnDemand;
use light::client::{LightChainClient, LightChainNotify};
use parity_reactor::Remote;
use bigint::hash::H256;
use util::Bytes;
use bytes::Bytes;
use parking_lot::{RwLock, Mutex};
type Client = Sink<pubsub::Result>;

View File

@@ -21,7 +21,8 @@ use ethcore::account_provider::AccountProvider;
use ethcore::transaction::PendingTransaction;
use bigint::prelude::U128;
use util::{Address, ToPretty};
use util::Address;
use bytes::ToPretty;
use futures::{future, Future, BoxFuture};
use jsonrpc_core::Error;

View File

@@ -20,7 +20,8 @@ use std::collections::{BTreeMap, HashMap};
use std::collections::hash_map::Entry;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::{Address, Bytes};
use util::Address;
use bytes::Bytes;
use parking_lot::{RwLock, Mutex};
use ethcore::error::Error;
use ethcore::client::MiningBlockChainClient;

View File

@@ -16,7 +16,7 @@
use ethcore::snapshot::{ManifestData, RestorationStatus, SnapshotService};
use util::Bytes;
use bytes::Bytes;
use bigint::hash::H256;
use parking_lot::Mutex;

View File

@@ -223,7 +223,7 @@ fn rpc_parity_extra_data() {
#[test]
fn rpc_parity_default_extra_data() {
use util::misc;
use util::ToPretty;
use bytes::ToPretty;
let deps = Dependencies::new();
let io = deps.default_client();

View File

@@ -17,7 +17,8 @@
use std::sync::Arc;
use std::str::FromStr;
use bigint::prelude::U256;
use util::{Address, ToPretty};
use util::Address;
use bytes::ToPretty;
use ethcore::account_provider::AccountProvider;
use ethcore::client::TestBlockChainClient;

View File

@@ -29,7 +29,8 @@ use v1::tests::helpers::TestMinerService;
use v1::tests::mocked::parity;
use bigint::prelude::U256;
use util::{Address, ToPretty};
use util::Address;
use bytes::ToPretty;
use ethkey::Secret;
use ethcore::account_provider::AccountProvider;
use ethcore::client::TestBlockChainClient;

View File

@@ -19,7 +19,7 @@
use std::fmt;
use serde::{Serialize, Serializer};
use ansi_term::Colour;
use util::bytes::ToPretty;
use bytes::ToPretty;
use v1::types::{U256, TransactionRequest, RichRawTransaction, H160, H256, H520, Bytes, TransactionCondition, Origin};
use v1::helpers;