finished removing ipc

openethereum · Oct 16, 2017 · 16d84f8 · 16d84f8
1 parent fa019bd
commit 16d84f8
Show file tree

Hide file tree

Showing 54 changed files with 6 additions and 5,600 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,9 +39,6 @@ ethcore-bytes = { path = "util/bytes" }
 ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }
-ethcore-ipc = { path = "ipc/rpc" }
-ethcore-ipc-nano = { path = "ipc/nano" }
-ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
 ethcore-stratum = { path = "stratum" }
@@ -73,7 +70,6 @@ ethcore-secretstore = { path = "secret_store", optional = true }
 rustc_version = "0.2"
 
 [dev-dependencies]
-ethcore-ipc-tests = { path = "ipc/tests" }
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 
@@ -95,7 +91,6 @@ ui-precompiled = [
 ]
 ui-enabled = ["dapps"]
 dapps = ["parity-dapps"]
-ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
 dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
 json-tests = ["ethcore/json-tests"]

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -85,4 +85,3 @@ test-heavy = []
 dev = ["clippy"]
 default = []
 benches = []
-ipc = []
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -5,10 +5,6 @@ license = "GPL-3.0"
 name = "ethcore-light"
 version = "1.9.0"
 authors = ["Parity Technologies <[email protected]>"]
-build = "build.rs"
-
-[build-dependencies]
-"ethcore-ipc-codegen" = { path = "../../ipc/codegen", optional = true }
 
 [dependencies]
 log = "0.3"
@@ -20,7 +16,6 @@ memorydb = { path = "../../util/memorydb" }
 patricia_trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-ethcore-ipc = { path = "../../ipc/rpc", optional = true }
 ethcore-devtools = { path = "../../devtools" }
 evm = { path = "../evm" }
 heapsize = "0.4"
@@ -46,4 +41,3 @@ memory-cache = { path = "../../util/memory_cache" }
 
 [features]
 default = []
-ipc = ["ethcore-ipc", "ethcore-ipc-codegen"]
diff --git a/ethcore/light/build.rs b/ethcore/light/build.rs
diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs
@@ -38,21 +38,8 @@ pub mod net;
 pub mod on_demand;
 pub mod transaction_queue;
 pub mod cache;
-
-#[cfg(not(feature = "ipc"))]
 pub mod provider;
 
-#[cfg(feature = "ipc")]
-pub mod provider {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/provider.rs"));
-}
-
-#[cfg(feature = "ipc")]
-pub mod remote {
-	pub use provider::LightProviderClient;
-}
-
 mod types;
 
 pub use self::cache::Cache;
@@ -96,8 +83,5 @@ extern crate kvdb_memorydb;
 extern crate kvdb_rocksdb;
 extern crate memory_cache;
 
-#[cfg(feature = "ipc")]
-extern crate ethcore_ipc as ipc;
-
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs
@@ -34,7 +34,6 @@ use transaction_queue::TransactionQueue;
 use request;
 
 /// Defines the operations that a provider for the light subprotocol must fulfill.
-#[cfg_attr(feature = "ipc", ipc(client_ident="LightProviderClient"))]
 pub trait Provider: Send + Sync {
 	/// Provide current blockchain info.
 	fn chain_info(&self) -> BlockChainInfo;
@@ -328,7 +327,7 @@ impl<L: AsLightClient + Send + Sync> Provider for LightProvider<L> {
 	}
 
 	fn transaction_index(&self, _req: request::CompleteTransactionIndexRequest)
-		-> Option<request::TransactionIndexResponse> 
+		-> Option<request::TransactionIndexResponse>
 	{
 		None
 	}

diff --git a/ethcore/light/src/types/mod.rs b/ethcore/light/src/types/mod.rs
@@ -14,11 +14,4 @@
 // 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 (IPC) api which require custom code generation.
-#![cfg_attr(feature = "ipc", allow(dead_code, unused_assignments, unused_variables))] // codegen issues
-
-#[cfg(feature = "ipc")]
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
-
-#[cfg(not(feature = "ipc"))]
-include!("mod.rs.in");
+pub mod request;
diff --git a/ethcore/light/src/types/mod.rs.in b/ethcore/light/src/types/mod.rs.in
diff --git a/ethcore/light/src/types/request/mod.rs b/ethcore/light/src/types/request/mod.rs
@@ -204,7 +204,6 @@ pub enum OutputKind {
 
 /// Either a hash or a number.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub enum HashOrNumber {
 	/// Block hash variant.
 	Hash(H256),

diff --git a/ethcore/src/encoded.rs b/ethcore/src/encoded.rs
@@ -37,7 +37,6 @@ use rlp::Rlp;
 
 /// Owning header view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Header(Vec<u8>);
 
 impl HeapSizeOf for Header {
@@ -115,7 +114,6 @@ impl Header {
 
 /// Owning block body view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Body(Vec<u8>);
 
 impl HeapSizeOf for Body {
@@ -175,7 +173,6 @@ impl Body {
 
 /// Owning block view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Block(Vec<u8>);
 
 impl HeapSizeOf for Block {