Removed machine abstraction from ethcore (#10791)

ethcore/src/client/ancient_import.rs

@@ -19,7 +19,6 @@
 use std::sync::Arc;
 
 use engines::{EthEngine, EpochVerifier};
-use machine::EthereumMachine;
 
 use blockchain::BlockChain;
 use parking_lot::RwLock;
@@ -32,7 +31,7 @@ const HEAVY_VERIFY_RATE: f32 = 0.02;
 /// Ancient block verifier: import an ancient sequence of blocks in order from a starting
 /// epoch.
 pub struct AncientVerifier {
-	cur_verifier: RwLock<Option<Box<dyn EpochVerifier<EthereumMachine>>>>,
+	cur_verifier: RwLock<Option<Box<dyn EpochVerifier>>>,
 	engine: Arc<dyn EthEngine>,
 }
 
@@ -87,7 +86,7 @@ impl AncientVerifier {
 	}
 
 	fn initial_verifier(&self, header: &Header, chain: &BlockChain)
-		-> Result<Box<dyn EpochVerifier<EthereumMachine>>, ::error::Error>
+		-> Result<Box<dyn EpochVerifier>, ::error::Error>
 	{
 		trace!(target: "client", "Initializing ancient block restoration.");
 		let current_epoch_data = chain.epoch_transitions()

ethcore/src/client/client.rs

@@ -1248,7 +1248,7 @@ impl Client {
 	}
 
 	fn do_virtual_call(
-		machine: &::machine::EthereumMachine,
+		machine: &::machine::Machine,
 		env_info: &EnvInfo,
 		state: &mut State<StateDB>,
 		t: &SignedTransaction,
@@ -1257,7 +1257,7 @@ impl Client {
 		fn call<V, T>(
 			state: &mut State<StateDB>,
 			env_info: &EnvInfo,
-			machine: &::machine::EthereumMachine,
+			machine: &::machine::Machine,
 			state_diff: bool,
 			transaction: &SignedTransaction,
 			options: TransactOptions<T, V>,
@@ -2561,7 +2561,7 @@ impl SnapshotClient for Client {}
 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
 fn transaction_receipt(
-	machine: &::machine::EthereumMachine,
+	machine: &::machine::Machine,
 	mut tx: LocalizedTransaction,
 	receipt: Receipt,
 	prior_gas_used: U256,