grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dissolve util (#7460)

Browse Source 
* 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
This commit is contained in:
Marek Kotewicz
2018-01-10 13:35:18 +01:00
committed by Svyatoslav Nikolsky
parent 4a4d64be56
commit e95b093483
395 changed files with 744 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ethcore/src/state/account.rs
View File

@@ -20,9 +20,9 @@ use std::fmt;
use std::sync::Arc;
use std::collections::HashMap;
use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP, keccak};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, Address};
use hashdb::HashDB;
use kvdb::DBValue;
use bytes::{Bytes, ToPretty};
use trie;
use trie::{SecTrieDB, Trie, TrieFactory, TrieError};
@@ -486,7 +486,8 @@ impl fmt::Debug for Account {
#[cfg(test)]
mod tests {
use rlp::{UntrustedRlp, RlpType, Compressible};
use util::*;
use ethereum_types::{H256, U256, Address};
use memorydb::MemoryDB;
use bytes::Bytes;
use super::*;
use account_db::*;

4
ethcore/src/state/backend.rs
View File

@@ -25,9 +25,9 @@ use std::collections::{HashSet, HashMap};
use std::sync::Arc;
use state::Account;
use bigint::hash::H256;
use parking_lot::Mutex;
use util::{Address, MemoryDB};
use ethereum_types::{Address, H256};
use memorydb::MemoryDB;
use hashdb::{AsHashDB, HashDB, DBValue};
/// State backend. See module docs for more details.

12
ethcore/src/state/mod.rs
View File

@@ -42,9 +42,9 @@ use transaction::SignedTransaction;
use state_db::StateDB;
use evm::{Factory as EvmFactory};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, Address};
use hashdb::{HashDB, AsHashDB};
use kvdb::DBValue;
use bytes::Bytes;
use trie;
@@ -193,7 +193,7 @@ impl AccountEntry {
/// `Err(ExecutionError::Internal)` indicates failure, everything else indicates
/// a successful proof (as the transaction itself may be poorly chosen).
pub fn check_proof(
proof: &[::util::DBValue],
proof: &[DBValue],
root: H256,
transaction: &SignedTransaction,
machine: &Machine,
@@ -1065,9 +1065,7 @@ mod tests {
use hash::keccak;
use super::*;
use ethkey::Secret;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use tests::helpers::*;
use machine::EthereumMachine;
use vm::EnvInfo;

3
ethcore/src/state/substate.rs
View File

@@ -16,8 +16,7 @@
//! Execution environment substate.
use std::collections::HashSet;
use bigint::prelude::U256;
use util::Address;
use ethereum_types::{U256, Address};
use log_entry::LogEntry;
use evm::{Schedule, CleanDustMode};
use super::CleanupMode;