trace filter moved

ethcore/src/trace/mod.rs

@@ -21,8 +21,7 @@ mod bloom;
 mod config;
 mod db;
 mod executive_tracer;
-mod filter;
+pub mod flat;
-mod flat;
 mod import;
 mod localized;
 mod noop_tracer;
@@ -34,7 +33,7 @@ pub use self::db::TraceDB;
 pub use self::trace::Trace;
 pub use self::noop_tracer::NoopTracer;
 pub use self::executive_tracer::ExecutiveTracer;
-pub use self::filter::{Filter, AddressesFilter};
+pub use types::trace_types::filter::{Filter, AddressesFilter};
 pub use self::import::ImportRequest;
 pub use self::localized::LocalizedTrace;
 use util::{Bytes, Address, U256, H256};

ethcore/src/types/mod.rs

@@ -22,3 +22,4 @@ pub mod receipt;
 pub mod tree_route;
 pub mod blockchain_info;
 pub mod log_entry;
+pub mod trace_types;

ethcore/src/types/trace_types/filter.rs

@@ -19,8 +19,8 @@ use bloomchain::{Filter as BloomFilter, Bloom, Number};
 use util::{Address, FixedHash};
 use util::sha3::Hashable;
 use basic_types::LogBloom;
-use super::flat::FlatTrace;
+use trace::flat::FlatTrace;
-use super::trace::Action;
+use trace::trace::Action;
 
 /// Addresses filter.
 ///

ethcore/src/types/trace_types/mod.rs

@@ -0,0 +1,19 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity 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 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.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Types used in the public api
+
+pub mod filter;