Extract verification from ethcore

Cargo.toml

@@ -140,4 +140,7 @@ members = [
 	"util/patricia-trie-ethereum",
 	"util/fastmap",
 	"util/time-utils",
+
+	"ethcore/verification",
+	"ethcore/client-traits",
 ]

ethcore/Cargo.toml

@@ -74,6 +74,9 @@ using_queue = { path = "../miner/using-queue" }
 vm = { path = "vm" }
 rand_xorshift = "0.1.1"
 
+client-traits = { path = "client-traits" }
+verification = { path = "verification" }
+
 [dev-dependencies]
 blooms-db = { path = "../util/blooms-db" }
 criterion = "0.2"

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 <[email protected]>"]
+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 <[email protected]>"]
+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

@@ -26,12 +26,10 @@ pub mod account;
 pub mod backend;
 pub mod substate;
 pub mod state;
-pub mod error;
 
 pub use {
 	account::Account,
 	backend::Backend,
-	error::Error,
 	substate::Substate,
 	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/client-traits/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "client-traits"
+version = "0.1.0"
+edition = "2018"
+
+
+[dependencies]
+call-contract = { package = "ethcore-call-contract", path = "../call-contract" }
+common-types = { path = "../types" }
+derive_more = "0.15.0"
+ethereum-types = "0.6"
+rlp = "0.4.0" # todo: only needed for `DecoderError` – fix

ethcore/client-traits/src/error.rs

@@ -0,0 +1,57 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! State related errors
+
+use derive_more::{Display, From};
+use common_types::{
+	engines::EngineError,
+	block::{BlockError, ImportError},
+	transaction::Error as TransactionError,
+};
+use rlp::DecoderError;
+
+#[derive(Debug, Display, From)]
+pub enum Error {
+	/// todo: what errors do I need?
+	Block(BlockError),
+	Import(ImportError),
+	Engine(EngineError),
+	Decoder(DecoderError),
+	Transaction(TransactionError),
+	State(String), // todo: move account-state errors to `common_types`?
+	Other(String)
+}
+
+impl std::error::Error for Error {}
+
+impl From<&str> for Error {
+	fn from(s: &str) -> Self {
+		Error::Other(s.into())
+	}
+}
+
+impl From<String> for Error {
+	fn from(s: String) -> Self {
+		Error::Other(s)
+	}
+}
+
+impl<E> From<Box<E>> for Error where Error: From<E> {
+	fn from(err: Box<E>) -> Self {
+		Error::from(*err)
+	}
+}