ethsync: optional ipc codegen

This commit is contained in:
Robert Habermeier
2016-12-08 19:52:48 +01:00
parent 2e87e31157
commit efd66f566d
12 changed files with 36 additions and 38 deletions

View File

@@ -58,6 +58,5 @@ dev = ["clippy"]
default = []
benches = []
ipc = []
light = []
ethkey-cli = ["ethkey/cli"]
ethstore-cli = ["ethstore/cli"]

View File

@@ -12,7 +12,7 @@ build = "build.rs"
[dependencies]
log = "0.3"
ethcore = { path = "..", features = ["light"] }
ethcore = { path = ".."}
ethcore-util = { path = "../../util" }
ethcore-network = { path = "../../util/network" }
ethcore-io = { path = "../../util/io" }
@@ -22,4 +22,4 @@ time = "0.1"
[features]
default = []
ipc = ["ethcore/ipc", "ethcore-ipc", "ethcore-ipc-codegen"]
ipc = ["ethcore-ipc", "ethcore-ipc-codegen"]

View File

@@ -1377,7 +1377,6 @@ impl MayPanic for Client {
}
}
#[cfg(feature = "light")]
impl ::client::ProvingBlockChainClient for Client {
fn prove_storage(&self, key1: H256, key2: H256, from_level: u32, id: BlockID) -> Vec<Bytes> {
self.state_at(id)

View File

@@ -29,7 +29,6 @@ pub use self::test_client::{TestBlockChainClient, EachBlockWith};
pub use self::chain_notify::ChainNotify;
pub use self::traits::{BlockChainClient, MiningBlockChainClient};
#[cfg(feature = "light")]
pub use self::traits::ProvingBlockChainClient;
pub use types::ids::*;

View File

@@ -278,7 +278,6 @@ pub trait MiningBlockChainClient: BlockChainClient {
}
/// Extended client interface for providing proofs of the state.
#[cfg(feature = "light")]
pub trait ProvingBlockChainClient: BlockChainClient {
/// Prove account storage at a specific block id.
///

View File

@@ -32,7 +32,6 @@ use state_db::StateDB;
use util::*;
#[cfg(feature = "light")]
use util::trie::recorder::{Recorder, BasicRecorder as TrieRecorder};
mod account;
@@ -764,7 +763,6 @@ impl State {
}
// LES state proof implementations.
#[cfg(feature = "light")]
impl State {
/// Prove an account's existence or nonexistence in the state trie.
/// Returns a merkle proof of the account's trie node with all nodes before `from_level`