Make updater an IPC module.

updater/Cargo.toml

@@ -4,6 +4,10 @@ name = "parity-updater"
 version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
 log = "0.3"
@@ -11,6 +15,8 @@ ethabi = "0.2.2"
 ethcore = { path = "../ethcore" }
 ethcore-util = { path = "../util" }
 parity-hash-fetch = { path = "../hash-fetch" }
+ipc-common-types = { path = "../ipc-common-types" }
+ethcore-ipc = { path = "../ipc/rpc" }
 
 [profile.release]
 debug = true

updater/build.rs

@@ -0,0 +1,22 @@
+// Copyright 2015, 2016 Parity Technologies (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/>.
+
+extern crate ethcore_ipc_codegen;
+
+fn main() {
+	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
+	ethcore_ipc_codegen::derive_ipc_cond("src/service.rs", cfg!(feature="ipc")).unwrap();
+}

updater/src/lib.rs

@@ -18,13 +18,21 @@
 
 #[macro_use] extern crate log;
 extern crate ethcore_util as util;
+extern crate ipc_common_types;
 extern crate parity_hash_fetch as hash_fetch;
 extern crate ethcore;
 extern crate ethabi;
+extern crate ethcore_ipc as ipc;
 
 mod updater;
 mod operations;
-mod service;
+mod types;
 
-pub use service::{Service, ReleaseInfo, OperationsInfo, CapState};
+mod service {
+	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
+	include!(concat!(env!("OUT_DIR"), "/service.rs"));
+}
+
+pub use service::{Service};
+pub use types::all::{ReleaseInfo, OperationsInfo, CapState, VersionInfo, ReleaseTrack};
 pub use updater::{Updater, UpdateFilter, UpdatePolicy};

updater/src/service.rs

@@ -14,54 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{H256};
-use util::misc::{VersionInfo};
-
-/// Information regarding a particular release of Parity
-#[derive(Debug, Clone, PartialEq)]
-pub struct ReleaseInfo {
-	/// Information on the version.
-	pub version: VersionInfo,
-	/// Does this release contain critical security updates? 
-	pub is_critical: bool,
-	/// The latest fork that this release can handle.
-	pub fork: u64,
-	/// Our platform's binary, if known. 
-	pub binary: Option<H256>,
-}
-
-/// Information on our operations environment.
-#[derive(Debug, Clone, PartialEq)]
-pub struct OperationsInfo {
-	/// Our blockchain's latest fork.
-	pub fork: u64,
-
-	/// Last fork our client supports, if known. 
-	pub this_fork: Option<u64>,
-
-	/// Information on our track's latest release. 
-	pub track: ReleaseInfo,
-	/// Information on our minor version's latest release.
-	pub minor: Option<ReleaseInfo>,
-}
-
-/// Information on the current version's consensus capabililty.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum CapState {
-	/// Unknown.
-	Unknown,
-	/// Capable of consensus indefinitely.
-	Capable,
-	/// Capable of consensus up until a definite block. 
-	CapableUntil(u64),
-	/// Incapable of consensus since a particular block. 
-	IncapableSince(u64),
-}
-
-impl Default for CapState {
-	fn default() -> Self { CapState::Unknown }
-}
+use types::all::{CapState, ReleaseInfo, OperationsInfo};
+use ipc_common_types::VersionInfo;
 
+#[ipc(client_ident="RemoteUpdater")]
 pub trait Service: Send + Sync {
 	/// Is the currently running client capable of supporting the current chain?
 	/// We default to true if there's no clear information.

updater/src/types/all.rs

@@ -0,0 +1,65 @@
+// Copyright 2015, 2016 Parity Technologies (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
+
+use util::{H256};
+pub use ipc_common_types::{VersionInfo, ReleaseTrack};
+
+/// Information regarding a particular release of Parity
+#[derive(Debug, Clone, PartialEq, Binary)]
+pub struct ReleaseInfo {
+	/// Information on the version.
+	pub version: VersionInfo,
+	/// Does this release contain critical security updates? 
+	pub is_critical: bool,
+	/// The latest fork that this release can handle.
+	pub fork: u64,
+	/// Our platform's binary, if known. 
+	pub binary: Option<H256>,
+}
+
+/// Information on our operations environment.
+#[derive(Debug, Clone, PartialEq, Binary)]
+pub struct OperationsInfo {
+	/// Our blockchain's latest fork.
+	pub fork: u64,
+
+	/// Last fork our client supports, if known. 
+	pub this_fork: Option<u64>,
+
+	/// Information on our track's latest release. 
+	pub track: ReleaseInfo,
+	/// Information on our minor version's latest release.
+	pub minor: Option<ReleaseInfo>,
+}
+
+/// Information on the current version's consensus capabililty.
+#[derive(Debug, Clone, Copy, PartialEq, Binary)]
+pub enum CapState {
+	/// Unknown.
+	Unknown,
+	/// Capable of consensus indefinitely.
+	Capable,
+	/// Capable of consensus up until a definite block. 
+	CapableUntil(u64),
+	/// Incapable of consensus since a particular block. 
+	IncapableSince(u64),
+}
+
+impl Default for CapState {
+	fn default() -> Self { CapState::Unknown }
+}

updater/src/types/mod.rs

@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Parity Technologies (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
+
+#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
+include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
+

updater/src/types/mod.rs.in

@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Parity Technologies (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/>.
+
+pub mod all;

updater/src/updater.rs

@@ -18,12 +18,14 @@ use std::sync::{Arc, Weak};
 use std::{fs, env};
 use std::io::Write;
 use std::path::{PathBuf};
-use util::misc::{VersionInfo, ReleaseTrack/*, platform*/};
+//use util::misc::platform;
+use ipc_common_types::{VersionInfo, ReleaseTrack};
 use util::{Address, H160, H256, FixedHash, Mutex, Bytes};
 use ethcore::client::{BlockId, BlockChainClient, ChainNotify};
 use hash_fetch::{self as fetch, HashFetch};
 use operations::Operations;
-use service::{Service, ReleaseInfo, OperationsInfo, CapState};
+use service::{Service};
+use types::all::{ReleaseInfo, OperationsInfo, CapState};
 
 /// Filter for releases.
 #[derive(Debug, Eq, PartialEq, Clone)]