Move more types out of ethcore

ethcore/Cargo.toml

@@ -12,7 +12,6 @@ ansi_term = "0.11"
 blooms-db = { path = "../util/blooms-db", optional = true }
 common-types = { path = "types" }
 crossbeam-utils = "0.6"
-derive_more = "0.14.0"
 env_logger = { version = "0.5", optional = true }
 ethabi = "8.0"
 ethabi-contract = "8.0"

ethcore/account-db/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
-description = "DB backend wrapper for Account trie"
 name = "account-db"
-version = "0.1.0"
+description = "DB backend wrapper for Account trie"
 authors = ["Parity Technologies <admin@parity.io>"]
+license = "GPL-3.0"
+version = "0.1.0"
 edition = "2018"
 
 [dependencies]

ethcore/account-state/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
-description = "Ethereum accounts, keeps track of changes to the code and storage"
 name = "account-state"
-version = "0.1.0"
+description = "Ethereum accounts, keeps track of changes to the code and storage"
 authors = ["Parity Technologies <admin@parity.io>"]
+license = "GPL-3.0"
+version = "0.1.0"
 edition = "2018"
 
 [dependencies]

ethcore/account-state/src/account.rs

@@ -29,7 +29,6 @@ use lru_cache::LruCache;
 use parity_bytes::{Bytes, ToPretty};
 use rlp::{DecoderError, encode};
 use trie_db::{Recorder, Trie};
-
 use common_types::basic_account::BasicAccount;
 use ethtrie::{Result as TrieResult, SecTrieDB, TrieDB, TrieFactory};
 use keccak_hasher::KeccakHasher;

ethcore/account-state/src/backend.rs

@@ -29,7 +29,6 @@ use hash_db::{AsHashDB, EMPTY_PREFIX, HashDB, Prefix};
 use kvdb::DBValue;
 use memory_db::{HashKey, MemoryDB};
 use parking_lot::Mutex;
-
 use journaldb::AsKeyedHashDB;
 use keccak_hasher::KeccakHasher;
 
@@ -222,7 +221,7 @@ impl<H: AsHashDB<KeccakHasher, DBValue>> Proving<H> {
 	/// This will store all values ever fetched from that base.
 	pub fn new(base: H) -> Self {
 		Proving {
-			base: base,
+			base,
 			changed: journaldb::new_memory_db(),
 			proof: Mutex::new(HashSet::new()),
 		}

ethcore/account-state/src/lib.rs

@@ -25,11 +25,9 @@
 pub mod account;
 pub mod backend;
 pub mod state;
-pub mod error;
 
 pub use {
 	account::Account,
 	backend::Backend,
-	error::Error,
 	state::{State, CleanupMode},
 };

ethcore/account-state/src/state.rs

@@ -32,6 +32,7 @@ use std::{
 use common_types::{
 	state_diff::StateDiff,
 	basic_account::BasicAccount,
+	errors::EthcoreError as Error,
 };
 use ethereum_types::{Address, H256, U256};
 use ethtrie::{TrieDB, Result as TrieResult};
@@ -46,7 +47,6 @@ use pod::{self, PodAccount, PodState};
 use trie_db::{Trie, TrieError, Recorder};
 
 use crate::{
-	Error,
 	account::Account,
 	backend::Backend,
 };

ethcore/light/Cargo.toml

@@ -35,7 +35,6 @@ itertools = "0.5"
 bincode = "1.1"
 serde = "1.0"
 serde_derive = "1.0"
-account-state = { path = "../account-state" }
 parking_lot = "0.8"
 stats = { path = "../../util/stats" }
 keccak-hash = "0.2.0"

ethcore/light/src/client/header_chain.rs

@@ -30,12 +30,14 @@ use std::sync::Arc;
 
 use cache::Cache;
 use cht;
-use common_types::block_status::BlockStatus;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;
+use common_types::{
+	block_status::BlockStatus,
+	encoded,
+	errors::{EthcoreError as Error, BlockError, EthcoreResult},
+	header::Header,
+	ids::BlockId,
+};
 use ethcore::engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
-use ethcore::error::{Error, EthcoreResult, BlockError};
 use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethereum_types::{H256, H264, U256};
 use parity_util_mem::{MallocSizeOf, MallocSizeOfOps};

ethcore/light/src/client/mod.rs

@@ -20,21 +20,23 @@ use std::sync::{Weak, Arc};
 
 use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
 use ethcore::engines::{epoch, Engine, EpochChange, EpochTransition, Proof};
-use ethcore::error::{Error, EthcoreResult};
 use ethcore::verification::queue::{self, HeaderQueue};
 use ethcore::spec::{Spec, SpecHardcodedSync};
 use io::IoChannel;
 use parking_lot::{Mutex, RwLock};
 use ethereum_types::{H256, U256};
 use futures::{IntoFuture, Future};
-use common_types::BlockNumber;
-use common_types::block_status::BlockStatus;
-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;
-use common_types::verification_queue_info::VerificationQueueInfo as BlockQueueInfo;
-
+use common_types::{
+	BlockNumber,
+	block_status::BlockStatus,
+	blockchain_info::BlockChainInfo,
+	encoded,
+	errors::EthcoreError as Error,
+	errors::EthcoreResult,
+	header::Header,
+	ids::BlockId,
+	verification_queue_info::VerificationQueueInfo as BlockQueueInfo,
+};
 use kvdb::KeyValueDB;
 
 use self::fetch::ChainDataFetcher;
@@ -468,7 +470,7 @@ impl<T: ChainDataFetcher> Client<T> {
 	}
 
 	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof>, T::Error> {
-		use ethcore::machine::{AuxiliaryRequest, AuxiliaryData};
+		use common_types::engines::machine::{AuxiliaryRequest, AuxiliaryData};
 
 		let mut block: Option<Vec<u8>> = None;
 		let mut receipts: Option<Vec<_>> = None;

ethcore/light/src/client/service.rs

@@ -20,10 +20,10 @@
 use std::fmt;
 use std::sync::Arc;
 
+use common_types::errors::EthcoreError as CoreError;
 use ethcore_db as db;
 use ethcore_blockchain::BlockChainDB;
 use ethcore::client::ClientIoMessage;
-use ethcore::error::Error as CoreError;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
 

ethcore/light/src/lib.rs

@@ -89,7 +89,6 @@ extern crate triehash_ethereum as triehash;
 extern crate kvdb;
 extern crate memory_cache;
 extern crate derive_more;
-extern crate account_state;
 
 #[cfg(test)]
 extern crate kvdb_memorydb;

ethcore/light/src/on_demand/request.rs

@@ -26,7 +26,6 @@ use common_types::receipt::Receipt;
 use common_types::transaction::SignedTransaction;
 use ethcore::engines::{Engine, StateDependentProof};
 use ethcore::executive_state::{ProvedExecution, self};
-use account_state;
 use ethereum_types::{H256, U256, Address};
 use ethtrie::{TrieError, TrieDB};
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};

ethcore/pod/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
-description = "State/Account system expressed in Plain Old Data."
 name = "pod"
-version = "0.1.0"
+description = "State/Account system expressed in Plain Old Data."
 authors = ["Parity Technologies <admin@parity.io>"]
+license = "GPL-3.0"
+version = "0.1.0"
 edition = "2018"
 
 [dependencies]

ethcore/private-tx/src/error.rs

@@ -19,8 +19,10 @@ use derive_more::Display;
 use ethereum_types::Address;
 use rlp::DecoderError;
 use ethtrie::TrieError;
-use ethcore::error::{Error as EthcoreError, ExecutionError};
-use types::transaction::Error as TransactionError;
+use types::{
+	errors::{EthcoreError, ExecutionError},
+	transaction::Error as TransactionError,
+};
 use ethkey::Error as KeyError;
 use ethkey::crypto::Error as CryptoError;
 use txpool::VerifiedTransaction;

ethcore/service/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ansi_term = "0.11"
+common-types = { path = "../types" }
 ethcore = { path = ".." }
 ethcore-blockchain = { path = "../blockchain" }
 ethcore-io = { path = "../../util/io" }

ethcore/service/src/lib.rs

@@ -15,6 +15,7 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 extern crate ansi_term;
+extern crate common_types;
 extern crate ethcore;
 extern crate ethcore_blockchain as blockchain;
 extern crate ethcore_io as io;