Merge with master

ethcore/src/trace/executive_tracer.rs

@@ -17,7 +17,7 @@
 //! Simple executive tracer.
 
 use util::{Bytes, Address, U256};
-use evm::action_params::ActionParams;
+use vm::ActionParams;
 use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType};
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
 

ethcore/src/trace/mod.rs

@@ -39,7 +39,7 @@ pub use self::types::filter::{Filter, AddressesFilter};
 
 use util::{Bytes, Address, U256, H256, DBTransaction};
 use self::trace::{Call, Create};
-use evm::action_params::ActionParams;
+use vm::ActionParams;
 use header::BlockNumber;
 
 /// This trait is used by executive to build traces.

ethcore/src/trace/noop_tracer.rs

@@ -17,7 +17,7 @@
 //! Nonoperative tracer.
 
 use util::{Bytes, Address, U256};
-use evm::action_params::ActionParams;
+use vm::ActionParams;
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
 use trace::trace::{Call, Create, VMTrace, RewardType};
 

ethcore/src/trace/types/error.rs

@@ -18,7 +18,7 @@
 
 use std::fmt;
 use rlp::{Encodable, RlpStream, Decodable, DecoderError, UntrustedRlp};
-use evm::Error as EvmError;
+use vm::Error as VmError;
 
 /// Trace evm errors.
 #[derive(Debug, PartialEq, Clone)]
@@ -45,24 +45,24 @@ pub enum Error {
 	Wasm,
 }
 
-impl<'a> From<&'a EvmError> for Error {
-	fn from(e: &'a EvmError) -> Self {
+impl<'a> From<&'a VmError> for Error {
+	fn from(e: &'a VmError) -> Self {
 		match *e {
-			EvmError::OutOfGas => Error::OutOfGas,
-			EvmError::BadJumpDestination { .. } => Error::BadJumpDestination,
-			EvmError::BadInstruction { .. } => Error::BadInstruction,
-			EvmError::StackUnderflow { .. } => Error::StackUnderflow,
-			EvmError::OutOfStack { .. } => Error::OutOfStack,
-			EvmError::BuiltIn { .. } => Error::BuiltIn,
-			EvmError::Wasm { .. } => Error::Wasm,
-			EvmError::Internal(_) => Error::Internal,
-			EvmError::MutableCallInStaticContext => Error::MutableCallInStaticContext,
+			VmError::OutOfGas => Error::OutOfGas,
+			VmError::BadJumpDestination { .. } => Error::BadJumpDestination,
+			VmError::BadInstruction { .. } => Error::BadInstruction,
+			VmError::StackUnderflow { .. } => Error::StackUnderflow,
+			VmError::OutOfStack { .. } => Error::OutOfStack,
+			VmError::BuiltIn { .. } => Error::BuiltIn,
+			VmError::Wasm { .. } => Error::Wasm,
+			VmError::Internal(_) => Error::Internal,
+			VmError::MutableCallInStaticContext => Error::MutableCallInStaticContext,
 		}
 	}
 }
 
-impl From<EvmError> for Error {
-	fn from(e: EvmError) -> Self {
+impl From<VmError> for Error {
+	fn from(e: VmError) -> Self {
 		Error::from(&e)
 	}
 }

ethcore/src/trace/types/filter.rs

@@ -20,7 +20,7 @@ use std::ops::Range;
 use bloomchain::{Filter as BloomFilter, Bloom, Number};
 use util::Address;
 use util::sha3::Hashable;
-use util::bloom::Bloomable;
+use bloomable::Bloomable;
 use basic_types::LogBloom;
 use trace::flat::FlatTrace;
 use super::trace::{Action, Res};
@@ -141,7 +141,7 @@ impl Filter {
 mod tests {
 	use util::Address;
 	use util::sha3::Hashable;
-	use util::bloom::Bloomable;
+	use bloomable::Bloomable;
 	use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward};
 	use trace::flat::FlatTrace;
 	use trace::{Filter, AddressesFilter, TraceError, RewardType};

ethcore/src/trace/types/trace.rs

@@ -18,10 +18,10 @@
 
 use util::{U256, Bytes, Address};
 use util::sha3::Hashable;
-use util::bloom::Bloomable;
+use bloomable::Bloomable;
 use rlp::*;
 
-use evm::action_params::ActionParams;
+use vm::ActionParams;
 use basic_types::LogBloom;
 use evm::CallType;
 use super::error::Error;