From c83e9d0f1bdb5a96d0501ec8934448e1573fb9fb Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 16 Oct 2017 17:12:02 +0200 Subject: [PATCH] remove ipc codegen from secretstore --- Cargo.lock | 3 --- secret_store/Cargo.toml | 6 ------ secret_store/build.rs | 22 ---------------------- secret_store/src/lib.rs | 7 +------ secret_store/src/traits.rs | 1 - secret_store/src/types/all.rs | 7 +------ secret_store/src/types/mod.rs | 3 +-- secret_store/src/types/mod.rs.in | 17 ----------------- 8 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 secret_store/build.rs delete mode 100644 secret_store/src/types/mod.rs.in diff --git a/Cargo.lock b/Cargo.lock index e01f4f1cc..17d8d9a8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -779,9 +779,6 @@ dependencies = [ "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", "ethcore-logger 1.9.0", "ethcore-util 1.9.0", "ethcrypto 0.1.0", diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml index efb64a762..8357b530b 100644 --- a/secret_store/Cargo.toml +++ b/secret_store/Cargo.toml @@ -4,10 +4,6 @@ name = "ethcore-secretstore" version = "1.0.0" license = "GPL-3.0" authors = ["Parity Technologies "] -build = "build.rs" - -[build-dependencies] -ethcore-ipc-codegen = { path = "../ipc/codegen" } [dependencies] byteorder = "1.0" @@ -34,8 +30,6 @@ ethcore-bigint = { path = "../util/bigint" } kvdb = { path = "../util/kvdb" } kvdb-rocksdb = { path = "../util/kvdb-rocksdb" } hash = { path = "../util/hash" } -ethcore-ipc = { path = "../ipc/rpc" } -ethcore-ipc-nano = { path = "../ipc/nano" } ethcore-logger = { path = "../logger" } ethcrypto = { path = "../ethcrypto" } ethkey = { path = "../ethkey" } diff --git a/secret_store/build.rs b/secret_store/build.rs deleted file mode 100644 index b2b27ea1e..000000000 --- a/secret_store/build.rs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2015-2017 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 . - -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/traits.rs", cfg!(feature="ipc")).unwrap(); -} diff --git a/secret_store/src/lib.rs b/secret_store/src/lib.rs index e13063faa..5951be508 100644 --- a/secret_store/src/lib.rs +++ b/secret_store/src/lib.rs @@ -41,7 +41,6 @@ extern crate ethcore_devtools as devtools; extern crate ethcore_bytes as bytes; extern crate ethcore_util as util; extern crate ethcore_bigint as bigint; -extern crate ethcore_ipc as ipc; extern crate ethcore_logger as logger; extern crate ethcrypto; extern crate ethkey; @@ -53,11 +52,7 @@ extern crate kvdb_rocksdb; mod key_server_cluster; mod types; -mod traits { - #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues - include!(concat!(env!("OUT_DIR"), "/traits.rs")); -} - +mod traits; mod acl_storage; mod http_listener; mod key_server; diff --git a/secret_store/src/traits.rs b/secret_store/src/traits.rs index 1e00f1e05..7ee4c5cc1 100644 --- a/secret_store/src/traits.rs +++ b/secret_store/src/traits.rs @@ -83,6 +83,5 @@ pub trait MessageSigner: ServerKeyGenerator { /// Key server. -#[ipc(client_ident="RemoteKeyServer")] pub trait KeyServer: DocumentKeyServer + MessageSigner + Send + Sync { } diff --git a/secret_store/src/types/all.rs b/secret_store/src/types/all.rs index ca1f9eb35..ab7286b96 100644 --- a/secret_store/src/types/all.rs +++ b/secret_store/src/types/all.rs @@ -39,8 +39,7 @@ pub type RequestSignature = ethkey::Signature; pub use ethkey::Public; /// Secret store error -#[derive(Debug, Clone, PartialEq)] -#[binary] +#[derive(Debug, PartialEq)] pub enum Error { /// Bad signature is passed BadSignature, @@ -58,7 +57,6 @@ pub enum Error { /// Secret store configuration #[derive(Debug, Clone)] -#[binary] pub struct NodeAddress { /// IP address. pub address: String, @@ -68,7 +66,6 @@ pub struct NodeAddress { /// Secret store configuration #[derive(Debug)] -#[binary] pub struct ServiceConfiguration { /// HTTP listener address. If None, HTTP API is disabled. pub listener_address: Option, @@ -82,7 +79,6 @@ pub struct ServiceConfiguration { /// Key server cluster configuration #[derive(Debug)] -#[binary] pub struct ClusterConfiguration { /// Number of threads reserved by cluster. pub threads: usize, @@ -99,7 +95,6 @@ pub struct ClusterConfiguration { /// Shadow decryption result. #[derive(Clone, Debug, PartialEq)] -#[binary] pub struct EncryptedDocumentKeyShadow { /// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested. pub decrypted_secret: ethkey::Public, diff --git a/secret_store/src/types/mod.rs b/secret_store/src/types/mod.rs index 584e78f30..dc5bd3d8a 100644 --- a/secret_store/src/types/mod.rs +++ b/secret_store/src/types/mod.rs @@ -16,5 +16,4 @@ //! Types used in the public api -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues -include!(concat!(env!("OUT_DIR"), "/mod.rs.in")); +pub mod all; diff --git a/secret_store/src/types/mod.rs.in b/secret_store/src/types/mod.rs.in deleted file mode 100644 index 0681e2884..000000000 --- a/secret_store/src/types/mod.rs.in +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2015-2017 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 . - -pub mod all;