Merge with master

2017-08-02 17:24:34 +02:00
parent 2e840bc89c 0c7c34e609
commit 01ea968d4f
158 changed files with 14603 additions and 959 deletions
--- a/ethcore/src/trace/mod.rs
+++ b/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.